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

r336 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/js
by bleny＠users.forge.codelutin.com July 25, 2013

July 25, 2013

Author: bleny Date: 2013-07-25 13:25:55 +0200 (Thu, 25 Jul 2013) New Revision: 336 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2942 trying to prevent bad confirmation calculation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-25 10:02:34 UTC (rev 335) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-25 11:25:55 UTC (rev 336) @@ -184,6 +184,16 @@ @Override public String execute() { + if (confirmation.getStorageMovementIds().contains(null)) { + + if (log.isErrorEnabled()) { + log.error("confirmation " + confirmation + " is malformed. session = " + session); + } + + throw new MagalieTechnicalException("confirmation " + confirmation + " is malformed"); + + } + MagalieUser magalieUser = session.getMagalieUser(); articleStorageService.confirmStorageMovement(confirmation, magalieUser); 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-25 10:02:34 UTC (rev 335) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-25 11:25:55 UTC (rev 336) @@ -220,29 +220,35 @@ }, - onNext : function(reportError) { + next : function(reportError) { - try { + var barcode = $('#withdraw-item_locationBarcode').val(); + var quantity = parseFloat($('#withdraw-item_quantity').val()); - var barcode = $('#withdraw-item_locationBarcode').val(); - var quantity = parseFloat($('#withdraw-item_quantity').val()); + model.withdraw(barcode, quantity); - model.withdraw(barcode, quantity); + if (reportError === true) { + model.reportError(barcode); + } - if (reportError === true) { - model.reportError(barcode); - } + view.refresh(); - view.refresh(); + var proposeAnotherLocation = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où + || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte + if (proposeAnotherLocation) { + model.newEmptyStorageMovementForNextLocation(); + } - var proposeAnotherLocation = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où - || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte - if (proposeAnotherLocation) { - model.newEmptyStorageMovementForNextLocation(); - } + view.refresh(); - view.refresh(); + }, + onNext : function() { + + try { + + controller.next(false); + } catch (ex) { if (ex instanceof ValidationError) { @@ -256,33 +262,62 @@ onReportError : function() { - controller.onNext(true); + try { + controller.next(true); + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; + } + } + }, onConfirm : function() { - var barcode = $('#withdraw-item_locationBarcode').val(); + try { - if (barcode.length > 0) { + var barcode = $('#withdraw-item_locationBarcode').val(); - controller.onNext(); + if (barcode.length > 0) { - } + controller.next(false); - var confirmation = model.getConfirmation(); + } - var confirmMessage = 'Confirmer ' + confirmation.storageMovementIds.length + ' mouvements ?'; + var confirmation = model.getConfirmation(); - if (confirm(confirmMessage)) { + var storageMovementCount = confirmation.storageMovementIds.length; - // push model as Json in a hidden field - $('#withdraw-item_confirmation').val(JSON.stringify(confirmation)); + if (storageMovementCount > 0) { - model.forceConfirm = true; + var confirmMessage = 'Confirmer ' + storageMovementCount + ' mouvements ?'; - $('#withdraw-item').submit(); + if (confirm(confirmMessage)) { + // push model as Json in a hidden field + $('#withdraw-item_confirmation').val(JSON.stringify(confirmation)); + + model.forceConfirm = true; + + $('#withdraw-item').submit(); + + } + + } + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; + } + } },

1 0

r335 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com July 25, 2013

July 25, 2013

Author: bleny Date: 2013-07-25 12:02:34 +0200 (Thu, 25 Jul 2013) New Revision: 335 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2937 bind 'F1' key to confirmation 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 17:20:13 UTC (rev 334) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-25 10:02:34 UTC (rev 335) @@ -333,6 +333,7 @@ $('#confirm').click(controller.onConfirm); $('#cancelLink').click(controller.onCancel); + bindKey('F1', controller.onConfirm); bindKey('F4', controller.onConfirm); bindKey('F5', controller.onReportError); bindKey('Esc', controller.onCancel);

1 0

r334 - in trunk/magalie-persistence/src: main/java/com/franciaflex/magalie/persistence main/java/com/franciaflex/magalie/persistence/dao test/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com July 23, 2013

July 23, 2013

Author: bleny Date: 2013-07-23 19:20:13 +0200 (Tue, 23 Jul 2013) New Revision: 334 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-07-23 17:20:13 UTC (rev 334) @@ -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 com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; import com.google.common.collect.Ordering; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-23 17:20:13 UTC (rev 334) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao; +/* + * #%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 com.franciaflex.magalie.persistence.entity.Company; import javax.persistence.EntityManager; Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-07-23 17:20:13 UTC (rev 334) @@ -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 com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; import com.google.common.collect.ImmutableList;

1 0

r333 - in trunk: magalie-persistence magalie-persistence/license magalie-services magalie-services/license magalie-web magalie-web/license
by bleny＠users.forge.codelutin.com July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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 July 23, 2013

July 23, 2013

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