Franciaflex-magalie-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- 438 discussions
r125 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/js
by bleny@users.forge.codelutin.com 24 Apr '13
by bleny@users.forge.codelutin.com 24 Apr '13
24 Apr '13
Author: bleny
Date: 2013-04-24 15:55:31 +0200 (Wed, 24 Apr 2013)
New Revision: 125
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2165 start implement confirmation for reception
Added:
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java
Modified:
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java
trunk/magalie-web/src/main/webapp/js/receive-article-input.js
Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java 2013-04-24 13:55:31 UTC (rev 125)
@@ -0,0 +1,26 @@
+package com.franciaflex.magalie.services.service;
+
+import java.util.Map;
+
+public class ReceptionConfirmation {
+
+ protected String storedArticleId;
+
+ protected Map<String, Double> locationIdToStoredQuantities;
+
+ public String getStoredArticleId() {
+ return storedArticleId;
+ }
+
+ public void setStoredArticleId(String storedArticleId) {
+ this.storedArticleId = storedArticleId;
+ }
+
+ public Map<String, Double> getLocationIdToStoredQuantities() {
+ return locationIdToStoredQuantities;
+ }
+
+ public void setLocationIdToStoredQuantities(Map<String, Double> locationIdToStoredQuantities) {
+ this.locationIdToStoredQuantities = locationIdToStoredQuantities;
+ }
+}
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-04-24 13:06:30 UTC (rev 124)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-04-24 13:55:31 UTC (rev 125)
@@ -1,18 +1,24 @@
package com.franciaflex.magalie.services.service;
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
+import com.franciaflex.magalie.persistence.dao.LocationDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
import com.franciaflex.magalie.persistence.dao.SupplierDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
import com.franciaflex.magalie.persistence.entity.Supplier;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
import com.google.common.collect.Lists;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
public class ReceptionService implements MagalieService {
@@ -101,4 +107,51 @@
}
+ public void confirmReception(MagalieUser magalieUser, ReceptionConfirmation receptionConfirmation) {
+
+ String storedArticleId = receptionConfirmation.getStoredArticleId();
+
+ MagaliePersistenceContext persistenceContext =
+ serviceContext.getPersistenceContext();
+
+ StoredArticleDao storedArticleDao =
+ persistenceContext.getStoredArticleDao();
+
+ StoredArticle storedArticle =
+ storedArticleDao.findById(storedArticleId);
+
+ LocationDao locationDao = persistenceContext.getLocationDao();
+
+ StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao();
+
+ Date now = serviceContext.getNow();
+
+ for (Map.Entry<String, Double> locationToStoredQuantity : receptionConfirmation.getLocationIdToStoredQuantities().entrySet()) {
+
+ StorageMovement storageMovement = new StorageMovement();
+
+ Location originLocation = storedArticle.getLocation();
+
+ storageMovement.setOriginLocation(originLocation);
+
+ Location destinationLocation = locationDao.findById(locationToStoredQuantity.getKey());
+
+ storageMovement.setDestinationLocation(destinationLocation);
+
+ storageMovement.setMagalieUser(magalieUser);
+
+ storageMovement.setArticle(storedArticle.getArticle());
+
+ storageMovement.setActualQuantity(locationToStoredQuantity.getValue());
+
+ storageMovement.setConfirmDate(now);
+
+ storageMovementDao.persist(storageMovement);
+
+ }
+
+ persistenceContext.commit();
+
+ }
+
}
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-04-24 13:06:30 UTC (rev 124)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-04-24 13:55:31 UTC (rev 125)
@@ -1,12 +1,15 @@
package com.franciaflex.magalie.services.service;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
import com.franciaflex.magalie.persistence.entity.Supplier;
import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -95,4 +98,32 @@
Assert.assertTrue(receptionTask.getLocations().contains(fixedLocation));
}
+
+ @Test
+ public void testConfirmReception() {
+
+ List<StoredArticle> receivedArticles =
+ service.getReceivedArticles(building, supplier.getId());
+
+ StoredArticle storedArticle =
+ Iterables.getOnlyElement(receivedArticles);
+
+ Location fixedLocation = Iterables.getOnlyElement(article.getFixedLocations());
+
+ ReceptionConfirmation receptionConfirmation = new ReceptionConfirmation();
+
+ receptionConfirmation.setStoredArticleId(storedArticle.getId());
+
+ receptionConfirmation.setLocationIdToStoredQuantities(
+ ImmutableMap.of(fixedLocation.getId(), storedArticle.getQuantity()));
+
+ service.confirmReception(magalieUser, receptionConfirmation);
+
+ StorageMovementDao storageMovementDao = serviceContext.getPersistenceContext().getStorageMovementDao();
+
+ List<StorageMovement> storageMovements = storageMovementDao.findAll();
+
+ Assert.assertEquals(1, storageMovements.size());
+
+ }
}
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-04-24 13:06:30 UTC (rev 124)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-04-24 13:55:31 UTC (rev 125)
@@ -1,24 +1,43 @@
package com.franciaflex.magalie.web.action;
+import com.franciaflex.magalie.MagalieTechnicalException;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.service.ReceptionConfirmation;
import com.franciaflex.magalie.services.service.ReceptionService;
import com.franciaflex.magalie.services.service.ReceptionTask;
import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.franciaflex.magalie.web.MagalieSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
import org.apache.struts2.json.JSONException;
+import org.apache.struts2.json.JSONPopulator;
import org.apache.struts2.json.JSONUtil;
+import java.util.Map;
+
@Results({
@Result(name="success", type="redirectAction", params = { "actionName", "prepare-article-reception!input" })
})
public class ReceiveArticleAction extends MagalieActionSupport {
+ private static final Log log = LogFactory.getLog(ReceiveArticleAction.class);
+
+ protected MagalieSession session;
+
protected ReceptionService service;
protected String storedArticleId;
protected ReceptionTask receptionTask;
+ protected ReceptionConfirmation confirmation;
+
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
public void setService(ReceptionService service) {
this.service = service;
}
@@ -48,9 +67,27 @@
}
+ public void setConfirmation(String confirmationJson) {
+ try {
+ Map deserialize = (Map) JSONUtil.deserialize(confirmationJson);
+ JSONPopulator jsonPopulator = new JSONPopulator();
+ confirmation = new ReceptionConfirmation();
+ jsonPopulator.populateObject(confirmation, deserialize);
+ } catch (Throwable e) {
+ if (log.isErrorEnabled()) {
+ log.error("unable to parse confirmation, json =\n" + confirmationJson, e);
+ }
+ throw new MagalieTechnicalException(e);
+ }
+ }
+
@Override
public String execute() {
+ MagalieUser magalieUser = session.getMagalieUser();
+
+ service.confirmReception(magalieUser, confirmation);
+
return SUCCESS;
}
Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js
===================================================================
--- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-04-24 13:06:30 UTC (rev 124)
+++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-04-24 13:55:31 UTC (rev 125)
@@ -55,20 +55,18 @@
}
model.getConfirmation = function() {
- var locationsIdsToActualQuantities = {};
- var locationInErrorIds = [];
- $.each(model.storageMovements, function(key, storageMovement) {
- if (storageMovement.used) {
- locationsIdsToActualQuantities[storageMovement.originLocation.id] = storageMovement.withdrawn;
- if (storageMovement.defect) {
- locationInErrorIds.push(storageMovement.originLocation.id);
- }
+ if (this.remainingQuantity() > 0.) {
+ throw new Error("Tout n'a pas été stocké");
+ }
+ var locationIdToStoredQuantities = {};
+ $.each(model.locations, function(key, location) {
+ if (location.used) {
+ locationIdToStoredQuantities[location.id] = location.stored;
}
});
var confirmation = {
- storageMovementOrderId: this.storageMovementOrderId,
- locationsIdsToActualQuantities: locationsIdsToActualQuantities,
- locationInErrorIds: locationInErrorIds
+ storedArticleId: this.storedArticle.id,
+ locationIdToStoredQuantities: locationIdToStoredQuantities
};
return confirmation;
}
1
0
24 Apr '13
Author: bleny
Date: 2013-04-24 15:06:30 +0200 (Wed, 24 Apr 2013)
New Revision: 124
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2165 add case to work for all suppliers
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java
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
trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-24 13:06:30 UTC (rev 124)
@@ -33,6 +33,7 @@
List<StoredArticle> findAllForArticleInBuilding(Article article, Building building);
- List<StoredArticle> findAllReceivedForSupplier(String supplierId);
+ List<StoredArticle> findAllReceivedForAllSupplier(Building building);
+ List<StoredArticle> findAllReceivedForSupplier(Building building, String supplierId);
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-24 13:06:30 UTC (rev 124)
@@ -58,8 +58,17 @@
}
@Override
- public List<StoredArticle> findAllReceivedForSupplier(String supplierId) {
- TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location.code = :code and sa.article.supplier.id = :supplierId");
+ public List<StoredArticle> findAllReceivedForAllSupplier(Building building) {
+ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location.warehouse.building = :building and sa.location.code = :code");
+ query.setParameter("building", building);
+ query.setParameter("code", Locations.codeForReceptionLocations());
+ return findAll(query);
+ }
+
+ @Override
+ public List<StoredArticle> findAllReceivedForSupplier(Building building, String supplierId) {
+ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location.warehouse.building = :building and sa.location.code = :code and sa.article.supplier.id = :supplierId");
+ query.setParameter("building", building);
query.setParameter("supplierId", supplierId);
query.setParameter("code", Locations.codeForReceptionLocations());
return findAll(query);
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-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-04-24 13:06:30 UTC (rev 124)
@@ -37,7 +37,7 @@
}
- public List<StoredArticle> getReceivedArticles(String supplierId) {
+ public List<StoredArticle> getReceivedArticles(Building building, String supplierId) {
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
@@ -45,9 +45,18 @@
StoredArticleDao dao =
persistenceContext.getStoredArticleDao();
- List<StoredArticle> receivedArticles =
- dao.findAllReceivedForSupplier(supplierId);
+ List<StoredArticle> receivedArticles;
+ if (supplierId == null) {
+
+ receivedArticles = dao.findAllReceivedForAllSupplier(building);
+
+ } else {
+
+ receivedArticles = dao.findAllReceivedForSupplier(building, supplierId);
+
+ }
+
return receivedArticles;
}
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-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-04-24 13:06:30 UTC (rev 124)
@@ -66,19 +66,23 @@
public void testGetArticlesForSupplier() {
List<StoredArticle> receivedArticles =
- service.getReceivedArticles(supplier.getId());
+ service.getReceivedArticles(building, supplier.getId());
Assert.assertEquals(1, receivedArticles.size());
Assert.assertEquals(article, receivedArticles.get(0).getArticle());
+ receivedArticles = service.getReceivedArticles(building, null); // null = all suppliers
+
+ Assert.assertEquals(2, receivedArticles.size());
+
}
@Test
public void testGetReceptionTask() {
List<StoredArticle> receivedArticles =
- service.getReceivedArticles(supplier.getId());
+ service.getReceivedArticles(building, supplier.getId());
StoredArticle onlyElement =
Iterables.getOnlyElement(receivedArticles);
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-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-04-24 13:06:30 UTC (rev 124)
@@ -51,8 +51,10 @@
@Override
public String execute() {
- receivedArticles = service.getReceivedArticles(supplierId);
+ Building building = session.getBuilding();
+ receivedArticles = service.getReceivedArticles(building, supplierId);
+
return SUCCESS;
}
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-04-24 12:48:43 UTC (rev 123)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-04-24 13:06:30 UTC (rev 124)
@@ -10,6 +10,12 @@
<s:a href="%{prepareArticleReceptionUrl}"><s:property value="name" /></s:a>
</li>
</s:iterator>
+ <li>
+ <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" />
+ <s:a href="%{prepareArticleReceptionUrl}">
+ Tous les fournisseurs
+ </s:a>
+ </li>
</ul>
<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/>
1
0
r123 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/WEB-INF/content webapp/css webapp/js
by bleny@users.forge.codelutin.com 24 Apr '13
by bleny@users.forge.codelutin.com 24 Apr '13
24 Apr '13
Author: bleny
Date: 2013-04-24 14:48:43 +0200 (Wed, 24 Apr 2013)
New Revision: 123
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2165 introduce UI for reception
Added:
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp
trunk/magalie-web/src/main/webapp/js/magalie.js
trunk/magalie-web/src/main/webapp/js/receive-article-input.js
Modified:
trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp
trunk/magalie-web/src/main/webapp/css/magalie.css
trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js
Added: 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 (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,64 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Supplier;
+import com.franciaflex.magalie.services.service.ReceptionService;
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.franciaflex.magalie.web.MagalieSession;
+
+import java.util.List;
+
+public class PrepareArticleReceptionAction extends MagalieActionSupport {
+
+ protected String supplierId;
+
+ protected ReceptionService service;
+
+ protected MagalieSession session;
+
+ protected List<Supplier> receivedSuppliers;
+
+ protected List<StoredArticle> receivedArticles;
+
+ public void setSupplierId(String supplierId) {
+ this.supplierId = supplierId;
+ }
+
+ public void setService(ReceptionService service) {
+ this.service = service;
+ }
+
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
+ @Override
+ public String input() {
+
+ Building building = session.getBuilding();
+
+ receivedSuppliers = service.getReceivedSuppliers(building);
+
+ return INPUT;
+
+ }
+
+ public List<Supplier> getReceivedSuppliers() {
+ return receivedSuppliers;
+ }
+
+ @Override
+ public String execute() {
+
+ receivedArticles = service.getReceivedArticles(supplierId);
+
+ return SUCCESS;
+
+ }
+
+ public List<StoredArticle> getReceivedArticles() {
+ return receivedArticles;
+ }
+
+}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,58 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.services.service.ReceptionService;
+import com.franciaflex.magalie.services.service.ReceptionTask;
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+import org.apache.struts2.json.JSONException;
+import org.apache.struts2.json.JSONUtil;
+
+@Results({
+ @Result(name="success", type="redirectAction", params = { "actionName", "prepare-article-reception!input" })
+})
+public class ReceiveArticleAction extends MagalieActionSupport {
+
+ protected ReceptionService service;
+
+ protected String storedArticleId;
+
+ protected ReceptionTask receptionTask;
+
+ public void setService(ReceptionService service) {
+ this.service = service;
+ }
+
+ public void setStoredArticleId(String storedArticleId) {
+ this.storedArticleId = storedArticleId;
+ }
+
+ @Override
+ public String input() {
+
+ receptionTask = service.getReceptionTask(storedArticleId);
+
+ return INPUT;
+
+ }
+
+ public ReceptionTask getReceptionTask() {
+ return receptionTask;
+ }
+
+ public String getModelAsJson() throws JSONException {
+
+ String json = JSONUtil.serialize(getReceptionTask());
+
+ return json;
+
+ }
+
+ @Override
+ public String execute() {
+
+ return SUCCESS;
+
+ }
+
+}
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-04-24 09:45:30 UTC (rev 122)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-04-24 12:48:43 UTC (rev 123)
@@ -28,6 +28,7 @@
<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/>
<s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/>
+<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/>
<s:url namespace="/" action="logout" id="logoutUrl"/>
<header>
@@ -41,5 +42,5 @@
<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a>
<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a>
-<s:a href="%{}" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a>
+<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a>
<s:a href="%{logoutUrl}" cssClass="btn btn-block">Déconnexion</s:a>
Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<ul>
+ <s:iterator value="receivedSuppliers">
+ <li>
+ <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl">
+ <s:param name="supplierId" value="%{id}" />
+ </s:url>
+ <s:a href="%{prepareArticleReceptionUrl}"><s:property value="name" /></s:a>
+ </li>
+ </s:iterator>
+</ul>
+
+<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/>
+<s:a href="%{chooseActivityUrl}" cssClass="btn">Changer d'activité</s:a>
Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,17 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<ul>
+ <s:iterator value="receivedArticles">
+ <li>
+ <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl">
+ <s:param name="storedArticleId" value="%{id}" />
+ </s:url>
+ <s:a href="%{receiveArticleUrl}">
+ <s:property value="quantity" />
+ <s:property value="article.unit" />
+ <s:property value="article.description" />
+ </s:a>
+ </li>
+ </s:iterator>
+</ul>
Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,42 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <script src="<s:url value='/js/magalie.js' />"></script>
+ <script>
+ var model = <s:property value="modelAsJson" escapeHtml="false" />;
+ </script>
+ <script src="<s:url value='/js/receive-article-input.js' />"></script>
+ <title>Réception d'un article</title>
+</head>
+
+<header>
+ <dl class="dl-horizontal">
+ <dt>Réf.</dt>
+ <dd><s:property value="receptionTask.storedArticle.article.code" /></dd>
+ <dt>Desc.</dt>
+ <dd><s:property value="receptionTask.storedArticle.article.description" /></dd>
+ <dt>Stocké</dt>
+ <dd><span id="stored">0</span> / <s:property value="receptionTask.storedArticle.quantity" /> <s:property value="receptionTask.storedArticle.article.unit" /></dd>
+ </dl>
+</header>
+<section id="locations">
+</section>
+<s:form cssClass="form-horizontal">
+ <s:textfield name="locationBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" />
+ <s:textfield name="quantity" label="Qté" inputAppend="%{receptionTask.storedArticle.article.unit}" cssClass="input-mini" />
+ <s:hidden name="confirmation" />
+
+ <div class="btn-group">
+ <s:submit name="full" value="Plein" cssClass="btn btn-danger btn-small" />
+ <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" />
+ </div>
+</s:form>
+<div id="locationTemplate" class="template">
+ <dl class="dl-horizontal">
+ <dt>Empl.</dt>
+ <dd><span data="warehouse.code"></span> <span data="code"></span></dd>
+ <dt>Prélev.</dt>
+ <dd><span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /></dd>
+ </dl>
+</div>
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-24 09:45:30 UTC (rev 122)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-24 12:48:43 UTC (rev 123)
@@ -24,6 +24,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<head>
+ <script src="<s:url value='/js/magalie.js' />"></script>
<script>
var model = <s:property value="modelAsJson" escapeHtml="false" />;
</script>
Modified: trunk/magalie-web/src/main/webapp/css/magalie.css
===================================================================
--- trunk/magalie-web/src/main/webapp/css/magalie.css 2013-04-24 09:45:30 UTC (rev 122)
+++ trunk/magalie-web/src/main/webapp/css/magalie.css 2013-04-24 12:48:43 UTC (rev 123)
@@ -30,15 +30,15 @@
left: 180px;
}
-#storageMovements .success {
+#storageMovements .success, #locations .success {
background-color: #77ee77;
}
-#storageMovements .pending {
+#storageMovements .pending, #locations .pending {
background-color: #ffff99;
}
-#storageMovements .defect {
+#storageMovements .defect, #locations .defect {
background-color: #ff9999;
}
Added: trunk/magalie-web/src/main/webapp/js/magalie.js
===================================================================
--- trunk/magalie-web/src/main/webapp/js/magalie.js (rev 0)
+++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,24 @@
+function processTemplate(templateId, model) {
+ var processing = $('#' + templateId).clone().children();
+ var elementsWithData = $(processing).find('*[data]');
+ for (var i = 0; i < elementsWithData.length; i++) {
+ var elementWithData = elementsWithData[i];
+ var data = $(elementWithData).attr('data');
+ // XXX brendan 27/03/13 eval, seriously ?
+ var text = eval("model." + data);
+ $(elementWithData).text(text).removeAttr('data');
+ }
+ return processing;
+}
+
+function ValidationError(message) {
+ this.message = message;
+}
+
+ValidationError.prototype = new Error();
+ValidationError.prototype.constructor = ValidationError;
+
+function handleValidationError(validationError) {
+ alert(validationError.message);
+ console.debug(validationError);
+}
Added: trunk/magalie-web/src/main/webapp/js/receive-article-input.js
===================================================================
--- trunk/magalie-web/src/main/webapp/js/receive-article-input.js (rev 0)
+++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-04-24 12:48:43 UTC (rev 123)
@@ -0,0 +1,226 @@
+
+model.locationsIndex = 0;
+model.allowSubmit = false;
+
+model.stored = function() {
+ var stored = 0;
+ for (var i = 0; i < this.locations.length; i++) {
+ stored += this.locations[i].stored || 0;
+ }
+ return stored;
+};
+
+model.isFulfilled = function() {
+ var isFull = this.stored() === this.storedArticle.quantity;
+ return isFull;
+};
+
+model.canTerminate = function() {
+ var canTerminate = this.isFulfilled();
+ return canTerminate;
+};
+
+model.getLocation = function(barcode) {
+ var location;
+ for (var i = 0; i < this.locations.length; i++) {
+ if (barcode == this.locations[i].barcode) {
+ location = this.locations[i];
+ }
+ }
+ if (location == null) {
+ throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide");
+ }
+ return location;
+};
+
+model.store = function(barcode, quantity) {
+ if ( ! isFinite(quantity) || quantity < 0) {
+ throw new ValidationError('Il faut entrer une quantité strictement supérieure à 0');
+ }
+ var location = this.getLocation(barcode);
+ location.used = true;
+ location.stored = quantity;
+};
+
+model.nextLocation = function() {
+ this.locationsIndex += 1;
+ if (this.locationsIndex >= this.locations.length) {
+ this.locationsIndex = null;
+ }
+};
+
+model.remainingQuantity = function() {
+ var remainingQuantity = this.storedArticle.quantity - this.stored();
+ return remainingQuantity;
+}
+
+model.getConfirmation = function() {
+ var locationsIdsToActualQuantities = {};
+ var locationInErrorIds = [];
+ $.each(model.storageMovements, function(key, storageMovement) {
+ if (storageMovement.used) {
+ locationsIdsToActualQuantities[storageMovement.originLocation.id] = storageMovement.withdrawn;
+ if (storageMovement.defect) {
+ locationInErrorIds.push(storageMovement.originLocation.id);
+ }
+ }
+ });
+ var confirmation = {
+ storageMovementOrderId: this.storageMovementOrderId,
+ locationsIdsToActualQuantities: locationsIdsToActualQuantities,
+ locationInErrorIds: locationInErrorIds
+ };
+ return confirmation;
+}
+
+var view = {
+
+ refreshSummary : function() {
+ $('#stored').text(model.stored());
+ if (model.stored() === model.storedArticle.quantity) {
+ $('#stored').addClass('success');
+ } else if (model.stored() > model.storedArticle.quantity) {
+ $('#stored').addClass('warning');
+ }
+ },
+
+ refreshLocations : function() {
+
+ var locationsElement = $('#locations');
+
+ // reset the view
+ locationsElement.children().remove();
+
+ // add each storage movement in the model
+ $.each(model.locations, function(key, location) {
+ var locationElement = processTemplate('locationTemplate', location);
+ $(locationElement).attr('id', 'location-' + key);
+ locationsElement.append(locationElement);
+ if (location.used) {
+ if (location.defect) {
+ $(locationElement).addClass('defect');
+ } else {
+ $(locationElement).addClass('success');
+ }
+ } else if (location.id === model.locations[model.locationsIndex].id && ! model.canTerminate()) {
+ $(locationElement).addClass('pending');
+ locationsElement.scrollTop(locationElement[0].offsetTop);
+ } else {
+ $(locationElement).hide();
+ }
+ });
+
+ },
+
+ refreshForm : function() {
+ // reset field to prevent reuse of the value by mistake
+ $('#receive-article_locationBarcode').val('');
+ // set default value of quantity to what should be store on the current location
+ if (model.locationsIndex != null) {
+ $('#receive-article_quantity').val(model.remainingQuantity());
+ }
+ },
+
+ refreshButtons : function() {
+ if (model.allowSubmit) {
+ $('#receive-article_next').val('Terminer').removeClass('btn-primary').addClass('btn-success');
+ } else {
+ $('#receive-article_next').val('Suivant').removeClass('btn-success').addClass('btn-primary');
+ }
+ },
+
+ refresh : function() {
+ this.refreshSummary();
+ this.refreshLocations();
+ this.refreshForm();
+ this.refreshButtons();
+ }
+
+};
+
+var controller = {
+
+ onNext : function() {
+
+ try {
+
+ if (model.allowSubmit) {
+
+ } else {
+
+ var barcode = $('#receive-article_locationBarcode').val();
+ var quantity = parseFloat($('#receive-article_quantity').val());
+
+ model.store(barcode, quantity);
+
+ // if used location focused as current, highlight next location to go
+ if (barcode == model.locations[model.locationsIndex].barcode) {
+ model.nextLocation();
+ }
+
+ }
+
+ } catch (ex) {
+
+ if (ex instanceof ValidationError) {
+ handleValidationError(ex);
+ } else {
+ throw ex;
+ }
+ }
+ },
+
+ onReportError : function() {
+
+ try {
+
+ if (model.allowSubmit) {
+
+ } else {
+
+ var barcode = $('#receive-article_locationBarcode').val();
+
+ model.store(barcode, 0.);
+
+ // if used location focused as current, highlight next location to go
+ if (barcode == model.locations[model.locationsIndex].barcode) {
+ model.nextLocation();
+ }
+
+ }
+
+ } catch (ex) {
+
+ if (ex instanceof ValidationError) {
+ handleValidationError(ex);
+ } else {
+ throw ex;
+ }
+ }
+ },
+
+ onSubmit : function(e) {
+ if (model.allowSubmit) {
+ // push model as Json in a hidden field
+ $('#receive-article_confirmation').val(JSON.stringify(model.getConfirmation()));
+ } else {
+ e.preventDefault();
+
+ if (model.canTerminate()) {
+ model.allowSubmit = true;
+ }
+
+ view.refresh();
+ }
+ }
+
+};
+
+// bindings
+$(document).ready(function() {
+ $('#receive-article').submit(controller.onSubmit);
+ $('#receive-article_full').click(controller.onReportError);
+ $('#receive-article_next').click(controller.onNext);
+
+ view.refresh();
+});
Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js
===================================================================
--- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-04-24 09:45:30 UTC (rev 122)
+++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-04-24 12:48:43 UTC (rev 123)
@@ -20,33 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-function processTemplate(templateId, model) {
- var processing = $('#' + templateId).clone().children();
- var elementsWithData = $(processing).find('*[data]');
- for (var i = 0; i < elementsWithData.length; i++) {
- var elementWithData = elementsWithData[i];
- var data = $(elementWithData).attr('data');
- // XXX brendan 27/03/13 eval, seriously ?
- var text = eval("model." + data);
- $(elementWithData).text(text).removeAttr('data');
- }
- return processing;
-}
-function ValidationError(message) {
- this.message = message;
-}
-
-ValidationError.prototype = new Error();
-ValidationError.prototype.constructor = ValidationError;
-
-function handleValidationError(validationError) {
- alert(validationError.message);
- console.debug(validationError);
-}
-
-"use strict";
-
model.storageMovementsIndex = 0;
model.allowSubmit = false;
1
0
24 Apr '13
Author: bleny
Date: 2013-04-24 11:45:30 +0200 (Wed, 24 Apr 2013)
New Revision: 122
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
fix build'
Modified:
trunk/magalie-services/src/main/resources/fixtures2.yaml
Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml
===================================================================
--- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-24 09:42:41 UTC (rev 121)
+++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-24 09:45:30 UTC (rev 122)
@@ -126,6 +126,20 @@
- *location4
- *location5
+supplier1:
+ &supplier1 !supplier
+ id: supplier1
+ name: Somfy
+
+supplier2:
+ &supplier2 !supplier
+ id: supplier2
+ name: Soliris
+
+suppliers:
+ - *supplier1
+ - *supplier2
+
article1:
&article1 !article
id: article1
1
0
24 Apr '13
Author: bleny
Date: 2013-04-24 11:42:41 +0200 (Wed, 24 Apr 2013)
New Revision: 121
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2165 introduce ReceptionService
Added:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
trunk/magalie-services/src/main/resources/fixtures.yaml
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -35,6 +35,7 @@
import com.franciaflex.magalie.persistence.dao.RequestedListDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.dao.SupplierDao;
import com.franciaflex.magalie.persistence.dao.WarehouseDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao;
@@ -49,6 +50,7 @@
import com.franciaflex.magalie.persistence.dao.jpa.RequestedListJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.SupplierJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao;
@@ -159,4 +161,9 @@
public KanbanDao getKanbanDao() {
return new KanbanJpaDao(entityManager);
}
+
+ @Override
+ public SupplierDao getSupplierDao() {
+ return new SupplierJpaDao(entityManager);
+ }
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -98,4 +98,7 @@
return "SANS";
}
+ public static String codeForReceptionLocations() {
+ return "REC";
+ }
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -36,6 +36,7 @@
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.SupplierDao;
import com.franciaflex.magalie.persistence.dao.WarehouseDao;
/**
@@ -77,4 +78,6 @@
KanbanDao getKanbanDao();
+ SupplierDao getSupplierDao();
+
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -33,4 +33,6 @@
List<StoredArticle> findAllForArticleInBuilding(Article article, Building building);
+ List<StoredArticle> findAllReceivedForSupplier(String supplierId);
+
}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -0,0 +1,15 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Supplier;
+
+import java.util.List;
+
+/**
+ * @author bleny
+ */
+public interface SupplierDao extends Dao<Supplier> {
+
+ List<Supplier> findAllWithReceivedArticles(Building building);
+
+}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -25,10 +25,9 @@
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
-import com.google.common.collect.Iterables;
import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
public class ArticleJpaDao extends AbstractJpaDao<Article> implements ArticleDao {
@@ -43,13 +42,8 @@
@Override
public Article findByCode(String articleCode) {
- Query query = entityManager.createQuery("from Article a where a.code = :code");
+ TypedQuery<Article> query = createQuery("from Article a where a.code = :code");
query.setParameter("code", articleCode);
- Article article = (Article)
- Iterables.getOnlyElement(
- query.getResultList(),
- null
- );
- return article;
+ return findUniqueOrNull(query);
}
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -23,6 +23,7 @@
* #L%
*/
+import com.franciaflex.magalie.persistence.Locations;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
@@ -30,6 +31,7 @@
import javax.persistence.EntityManager;
import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import java.util.List;
public class StoredArticleJpaDao extends AbstractJpaDao<StoredArticle> implements StoredArticleDao {
@@ -54,4 +56,12 @@
}
return resultList;
}
+
+ @Override
+ public List<StoredArticle> findAllReceivedForSupplier(String supplierId) {
+ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location.code = :code and sa.article.supplier.id = :supplierId");
+ query.setParameter("supplierId", supplierId);
+ query.setParameter("code", Locations.codeForReceptionLocations());
+ return findAll(query);
+ }
}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -0,0 +1,31 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.Locations;
+import com.franciaflex.magalie.persistence.dao.SupplierDao;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Supplier;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class SupplierJpaDao extends AbstractJpaDao<Supplier> implements SupplierDao {
+
+ public SupplierJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<Supplier> getEntityClass() {
+ return Supplier.class;
+ }
+
+ @Override
+ public List<Supplier> findAllWithReceivedArticles(Building building) {
+ TypedQuery<Supplier> query = createQuery("select sa.article.supplier from StoredArticle sa where sa.location.code = :code and sa.location.warehouse.building = :building");
+ query.setParameter("building", building);
+ query.setParameter("code", Locations.codeForReceptionLocations());
+ return findAll(query);
+ }
+
+}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -29,12 +29,13 @@
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Kanban;
+import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedArticle;
-import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.RequestedList;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Supplier;
import com.franciaflex.magalie.persistence.entity.Warehouse;
-import com.franciaflex.magalie.persistence.entity.StoredArticle;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
@@ -58,6 +59,7 @@
YamlReader reader = new YamlReader(yaml);
reader.getConfig().setClassTag("building", Building.class);
reader.getConfig().setClassTag("warehouse", Warehouse.class);
+ reader.getConfig().setClassTag("supplier", Supplier.class);
reader.getConfig().setClassTag("article", Article.class);
reader.getConfig().setClassTag("kanban", Kanban.class);
reader.getConfig().setClassTag("stored-article", StoredArticle.class);
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -32,6 +32,7 @@
import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
import com.franciaflex.magalie.persistence.dao.RequestedListDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.SupplierDao;
import com.franciaflex.magalie.persistence.dao.WarehouseDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
@@ -41,6 +42,7 @@
import com.franciaflex.magalie.persistence.entity.RequestedArticle;
import com.franciaflex.magalie.persistence.entity.RequestedList;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Supplier;
import com.franciaflex.magalie.persistence.entity.Warehouse;
import com.franciaflex.magalie.services.MagalieFixtures;
import com.franciaflex.magalie.services.MagalieService;
@@ -148,6 +150,18 @@
persistenceContext.commit();
+ SupplierDao supplierDao = persistenceContext.getSupplierDao();
+
+ Collection<Supplier> suppliers = fixtures.fixture("suppliers");
+
+ for (Supplier supplier : suppliers) {
+
+ supplierDao.persist(supplier);
+
+ }
+
+ persistenceContext.commit();
+
ArticleDao articleDao = persistenceContext.getArticleDao();
Collection<Article> articles = fixtures.fixture("articles");
Added: 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 (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -0,0 +1,95 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.SupplierDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Location;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Supplier;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+public class ReceptionService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public List<Supplier> getReceivedSuppliers(Building building) {
+
+ MagaliePersistenceContext persistenceContext =
+ serviceContext.getPersistenceContext();
+
+ SupplierDao supplierDao = persistenceContext.getSupplierDao();
+
+ List<Supplier> suppliers =
+ supplierDao.findAllWithReceivedArticles(building);
+
+ return suppliers;
+
+ }
+
+ public List<StoredArticle> getReceivedArticles(String supplierId) {
+
+ MagaliePersistenceContext persistenceContext =
+ serviceContext.getPersistenceContext();
+
+ StoredArticleDao dao =
+ persistenceContext.getStoredArticleDao();
+
+ List<StoredArticle> receivedArticles =
+ dao.findAllReceivedForSupplier(supplierId);
+
+ return receivedArticles;
+
+ }
+
+ public ReceptionTask getReceptionTask(String storedArticleId) {
+
+ MagaliePersistenceContext persistenceContext =
+ serviceContext.getPersistenceContext();
+
+ StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao();
+
+ StoredArticle storedArticle =
+ storedArticleDao.findById(storedArticleId);
+
+ Article article = storedArticle.getArticle();
+
+ Building building = storedArticle.getLocation().getWarehouse().getBuilding();
+
+ List<Location> locations = findLocationsToReceiveArticle(article, building);
+
+ ReceptionTask receptionTask = new ReceptionTask(storedArticle, locations);
+
+ return receptionTask;
+
+ }
+
+ protected List<Location> findLocationsToReceiveArticle(Article article, Building building) {
+
+ List<Location> locations = Lists.newLinkedList();
+
+ if (article.getFixedLocations() != null) {
+
+ locations.addAll(article.getFixedLocations());
+
+ }
+
+ // TODO brendan 24/04/13 add already stored locations
+
+ // TODO brendan 24/04/13 add other suggested location
+
+ return locations;
+
+ }
+
+}
Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -0,0 +1,26 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.entity.Location;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+
+import java.util.List;
+
+public class ReceptionTask {
+
+ protected StoredArticle storedArticle;
+
+ protected List<Location> locations;
+
+ public ReceptionTask(StoredArticle storedArticle, List<Location> locations) {
+ this.storedArticle = storedArticle;
+ this.locations = locations;
+ }
+
+ public StoredArticle getStoredArticle() {
+ return storedArticle;
+ }
+
+ public List<Location> getLocations() {
+ return locations;
+ }
+}
Modified: trunk/magalie-services/src/main/resources/fixtures.yaml
===================================================================
--- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-23 16:17:29 UTC (rev 120)
+++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-24 09:42:41 UTC (rev 121)
@@ -188,6 +188,48 @@
code: SANS
requiredAccreditationLevel: 0
+locationRecU01:
+ &locationRecU01 !location
+ id: locationRecU01
+ warehouse: *U01
+ code: REC
+ requiredAccreditationLevel: 0
+
+locationRecU02:
+ &locationRecU02 !location
+ id: locationRecU02
+ warehouse: *U02
+ code: REC
+ requiredAccreditationLevel: 0
+
+locationRecU03:
+ &locationRecU03 !location
+ id: locationRecU03
+ warehouse: *U03
+ code: REC
+ requiredAccreditationLevel: 0
+
+locationRecU04:
+ &locationRecU04 !location
+ id: locationRecU04
+ warehouse: *U04
+ code: REC
+ requiredAccreditationLevel: 0
+
+locationRecSOM:
+ &locationRecSOM !location
+ id: locationRecSOM
+ warehouse: *SOM
+ code: REC
+ requiredAccreditationLevel: 0
+
+locationRecB01:
+ &locationRecB01 !location
+ id: locationRecB01
+ warehouse: *B01
+ code: REC
+ requiredAccreditationLevel: 0
+
locations:
- *location1
- *location2
@@ -203,7 +245,27 @@
- *location12
- *location13
- *location14
+ - *locationRecU01
+ - *locationRecU02
+ - *locationRecU03
+ - *locationRecU04
+ - *locationRecSOM
+ - *locationRecB01
+supplier1:
+ &supplier1 !supplier
+ id: supplier1
+ name: Somfy
+
+supplier2:
+ &supplier2 !supplier
+ id: supplier2
+ name: Soliris
+
+suppliers:
+ - *supplier1
+ - *supplier2
+
article1:
&article1 !article
id: article1
@@ -262,6 +324,7 @@
unit: PCE
description: Ensemble SOLIRIS UNO
fixedLocationsFirst: false
+ supplier: *supplier2
articles:
- *article1
@@ -406,6 +469,13 @@
location: *location3
quantity: 70
+storedArticleRec1:
+ &storedArticleRec1 !stored-article
+ id: storedArticleRec1
+ article: *article6
+ location: *locationRecU01
+ quantity: 10
+
storedArticles:
- *storedArticle1
- *storedArticle2
@@ -420,6 +490,7 @@
- *storedArticle11
- *storedArticle12
- *storedArticle13
+ - *storedArticleRec1
storedArticlesForArticle1:
- *storedArticle1
Added: 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 (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-04-24 09:42:41 UTC (rev 121)
@@ -0,0 +1,94 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Location;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Supplier;
+import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
+import com.google.common.collect.Iterables;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+public class ReceptionServiceTest extends AbstractMagalieServiceTest {
+
+ private static final Log log = LogFactory.getLog(ReceptionServiceTest.class);
+
+ protected ReceptionService service;
+
+ protected MagalieUser magalieUser;
+
+ protected Building building;
+
+ protected Supplier supplier;
+
+ protected Article article;
+
+ @Before
+ public void setUp() throws ParseException {
+
+ loadFixtures("fixtures");
+
+ service = newService(ReceptionService.class);
+
+ serviceContext.setDate(new Date(1363948427576l));
+
+ magalieUser = fixture("bruno");
+
+ building = fixture("B1");
+
+ supplier = fixture("supplier2");
+
+ article = fixture("article6");
+
+ }
+
+ @Test
+ public void testGetSuppliers() {
+
+ List<Supplier> suppliers = service.getReceivedSuppliers(building);
+
+ Assert.assertEquals(1, suppliers.size());
+
+ Assert.assertEquals(supplier, suppliers.get(0));
+
+ }
+
+ @Test
+ public void testGetArticlesForSupplier() {
+
+ List<StoredArticle> receivedArticles =
+ service.getReceivedArticles(supplier.getId());
+
+ Assert.assertEquals(1, receivedArticles.size());
+
+ Assert.assertEquals(article, receivedArticles.get(0).getArticle());
+
+ }
+
+ @Test
+ public void testGetReceptionTask() {
+
+ List<StoredArticle> receivedArticles =
+ service.getReceivedArticles(supplier.getId());
+
+ StoredArticle onlyElement =
+ Iterables.getOnlyElement(receivedArticles);
+
+ ReceptionTask receptionTask =
+ service.getReceptionTask(onlyElement.getId());
+
+ Location fixedLocation = Iterables.getOnlyElement(article.getFixedLocations());
+
+ Assert.assertTrue(receptionTask.getLocations().contains(fixedLocation));
+
+ }
+}
1
0
r120 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny@users.forge.codelutin.com 23 Apr '13
by bleny@users.forge.codelutin.com 23 Apr '13
23 Apr '13
Author: bleny
Date: 2013-04-23 18:17:29 +0200 (Tue, 23 Apr 2013)
New Revision: 120
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
clean poms after analyze-dependencies
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-04-22 09:26:10 UTC (rev 119)
+++ trunk/magalie-persistence/pom.xml 2013-04-23 16:17:29 UTC (rev 120)
@@ -45,11 +45,6 @@
<dependency>
<groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton</groupId>
<artifactId>nuiton-config</artifactId>
</dependency>
@@ -74,11 +69,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</dependency>
Modified: trunk/magalie-services/pom.xml
===================================================================
--- trunk/magalie-services/pom.xml 2013-04-22 09:26:10 UTC (rev 119)
+++ trunk/magalie-services/pom.xml 2013-04-23 16:17:29 UTC (rev 120)
@@ -21,6 +21,11 @@
<dependencies>
<dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.esotericsoftware.yamlbeans</groupId>
<artifactId>yamlbeans</artifactId>
</dependency>
@@ -42,11 +47,6 @@
</dependency>
<dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
Modified: trunk/magalie-web/pom.xml
===================================================================
--- trunk/magalie-web/pom.xml 2013-04-22 09:26:10 UTC (rev 119)
+++ trunk/magalie-web/pom.xml 2013-04-23 16:17:29 UTC (rev 120)
@@ -43,13 +43,13 @@
</dependency>
<dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
</dependency>
<dependency>
@@ -88,11 +88,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-04-22 09:26:10 UTC (rev 119)
+++ trunk/pom.xml 2013-04-23 16:17:29 UTC (rev 120)
@@ -163,6 +163,7 @@
<groupId>org.nuiton.web</groupId>
<artifactId>nuiton-struts2</artifactId>
<version>${nuitonWebVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -209,7 +210,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
<version>${struts2Version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
1
0
22 Apr '13
Author: bleny
Date: 2013-04-22 11:26:10 +0200 (Mon, 22 Apr 2013)
New Revision: 119
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
add file headers
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/BuildingJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedListJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/WarehouseJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java
trunk/magalie-persistence/src/main/resources/META-INF/persistence.xml
trunk/magalie-persistence/src/main/resources/magalie.properties
trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InvalidMagalieBarcodeException.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/MagalieException.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleRequest.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java
trunk/magalie-services/src/test/resources/log4j.properties
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java
trunk/magalie-web/src/main/resources/magalie.properties
trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie;
+/*
+ * #%L
+ * MagaLiE :: Persistence
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie;
+/*
+ * #%L
+ * MagaLiE :: Persistence
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.nuiton.util.config.ConfigOptionDef;
/**
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie;
+/*
+ * #%L
+ * MagaLiE :: Persistence
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
public class MagalieTechnicalException extends RuntimeException {
public MagalieTechnicalException() {
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.DeliveredRequestedArticle;
import com.google.common.base.Predicate;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.AbstractEntity;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.dao.ArticleDao;
import com.franciaflex.magalie.persistence.dao.BuildingDao;
import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.apache.commons.lang3.SystemUtils;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.MagalieUser;
import com.franciaflex.magalie.persistence.entity.Location;
import com.google.common.base.Predicate;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.dao.ArticleDao;
import com.franciaflex.magalie.persistence.dao.BuildingDao;
import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.RequestedArticle;
import com.franciaflex.magalie.persistence.entity.RequestedList;
import com.google.common.base.Function;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.RequestedArticle;
import com.franciaflex.magalie.persistence.entity.RequestedList;
import com.google.common.collect.ImmutableListMultimap;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
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-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.Location;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
/**
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Building;
/**
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.AbstractEntity;
import java.util.List;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.DeliveredRequestedArticle;
import com.franciaflex.magalie.persistence.entity.RequestedList;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedList;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
import com.franciaflex.magalie.persistence.entity.Kanban;
import com.franciaflex.magalie.persistence.entity.Warehouse;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Location;
import com.franciaflex.magalie.persistence.entity.Warehouse;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Location;
import com.franciaflex.magalie.persistence.entity.LocationError;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.MagalieUser;
import java.util.List;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedArticle;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.RequestedList;
/**
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.StorageMovementOrder;
public interface StorageMovementOrderDao extends Dao<StorageMovementOrder> {
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -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.Building;
import com.franciaflex.magalie.persistence.entity.Warehouse;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.Dao;
import com.franciaflex.magalie.persistence.entity.AbstractEntity;
import com.google.common.collect.Iterables;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.ArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.google.common.collect.Iterables;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/BuildingJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/BuildingJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/BuildingJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.BuildingDao;
import com.franciaflex.magalie.persistence.entity.Building;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.DeliveredRequestedArticleDao;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle;
import com.franciaflex.magalie.persistence.entity.RequestedList;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.DeliveredRequestedListDao;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.KanbanDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Kanban;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.LocationErrorDao;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.LocationError;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.LocationDao;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.Warehouse;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.MagalieUserDao;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.RequestedArticleDao;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedListJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedListJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedListJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.RequestedListDao;
import com.franciaflex.magalie.persistence.entity.RequestedList;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.StorageMovementOrderDao;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.dao.StoredArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/WarehouseJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/WarehouseJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/WarehouseJpaDao.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.dao.jpa;
+/*
+ * #%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.Locations;
import com.franciaflex.magalie.persistence.dao.WarehouseDao;
import com.franciaflex.magalie.persistence.entity.Building;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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.google.common.base.Objects;
import org.apache.commons.lang3.builder.ToStringBuilder;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,6 +1,29 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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%
+ */
+
public enum DeliveredRequestedListStatus {
PENDING,
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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.google.common.base.Objects;
import javax.persistence.Entity;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.persistence.entity;
+/*
+ * #%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 javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: trunk/magalie-persistence/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/magalie-persistence/src/main/resources/META-INF/persistence.xml 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/resources/META-INF/persistence.xml 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+<!--
+ #%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%
+ -->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
Modified: trunk/magalie-persistence/src/main/resources/magalie.properties
===================================================================
--- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+###
+# #%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%
+###
javax.persistence.jdbc.driver=org.h2.Driver
javax.persistence.jdbc.url=jdbc:h2:file:/tmp/magalie/h2data
javax.persistence.jdbc.user=sa
Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java
===================================================================
--- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie;
+/*
+ * #%L
+ * MagaLiE :: Persistence
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.junit.Test;
public class PersistenceTest {
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.MagalieApplicationConfig;
import com.franciaflex.magalie.MagalieTechnicalException;
import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.esotericsoftware.yamlbeans.YamlException;
import com.esotericsoftware.yamlbeans.YamlReader;
import com.franciaflex.magalie.MagalieTechnicalException;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.StorageMovements;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.LocationError;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import java.util.Map;
import java.util.Set;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InvalidMagalieBarcodeException.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InvalidMagalieBarcodeException.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InvalidMagalieBarcodeException.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.exception;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
public class InvalidMagalieBarcodeException extends MagalieException {
public InvalidMagalieBarcodeException(String message) {
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/MagalieException.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/MagalieException.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/MagalieException.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.exception;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
public class MagalieException extends Exception {
public MagalieException() {
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.StoredArticles;
import com.franciaflex.magalie.persistence.dao.LocationDao;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleRequest.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleRequest.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleRequest.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.Locations;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.dao.BuildingDao;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.services.MagalieService;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.dao.BuildingDao;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.Locations;
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.dao.KanbanDao;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.dao.LocationErrorDao;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.LocationError;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.services.MagalieService;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.MagalieService;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.LocationError;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.MagalieApplicationConfig;
import com.franciaflex.magalie.services.service.FixturesService;
import org.junit.Rule;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.JpaUtil;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.services.service;
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedArticle;
Modified: trunk/magalie-services/src/test/resources/log4j.properties
===================================================================
--- trunk/magalie-services/src/test/resources/log4j.properties 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-services/src/test/resources/log4j.properties 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+###
+# #%L
+# MagaLiE :: Services
+# $Id:$
+# $HeadURL:$
+# %%
+# Copyright (C) 2013 CodeLutin
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
log4j.rootCategory=ERROR, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
/**
* Current activity of the user. May be used for redirection since a user
* keep doing the same thing until manually declare otherwise.
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.MagalieApplicationConfig;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.MagalieApplicationConfig;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.Warehouse;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.web.MagalieActionSupport;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,6 +1,29 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.web.MagalieActionSupport;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.service.BuildingsService;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.web.MagalieActionSupport;
import com.franciaflex.magalie.web.MagalieSession;
import org.apache.struts2.convention.annotation.Result;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.service.RequestedArticleService;
import com.franciaflex.magalie.web.MagalieActionSupport;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.MagalieApplicationConfig;
import com.franciaflex.magalie.services.MagalieReport;
import com.franciaflex.magalie.services.service.ReportService;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,5 +1,28 @@
package com.franciaflex.magalie.web.action;
+/*
+ * #%L
+ * MagaLiE :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.franciaflex.magalie.services.service.FixturesService;
import com.franciaflex.magalie.web.MagalieActionSupport;
import org.apache.struts2.convention.annotation.Result;
Modified: trunk/magalie-web/src/main/resources/magalie.properties
===================================================================
--- trunk/magalie-web/src/main/resources/magalie.properties 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/resources/magalie.properties 2013-04-22 09:26:10 UTC (rev 119)
@@ -0,0 +1,22 @@
+###
+# #%L
+# MagaLiE :: UI
+# $Id:$
+# $HeadURL:$
+# %%
+# Copyright (C) 2013 CodeLutin
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+<%--
+ #%L
+ MagaLiE :: UI
+ $Id:$
+ $HeadURL:$
+ %%
+ Copyright (C) 2013 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+<%--
+ #%L
+ MagaLiE :: UI
+ $Id:$
+ $HeadURL:$
+ %%
+ Copyright (C) 2013 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+<%--
+ #%L
+ MagaLiE :: UI
+ $Id:$
+ $HeadURL:$
+ %%
+ Copyright (C) 2013 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-18 15:50:52 UTC (rev 118)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-22 09:26:10 UTC (rev 119)
@@ -1,3 +1,25 @@
+<%--
+ #%L
+ MagaLiE :: UI
+ $Id:$
+ $HeadURL:$
+ %%
+ Copyright (C) 2013 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
1
0
r118 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa
by bleny@users.forge.codelutin.com 18 Apr '13
by bleny@users.forge.codelutin.com 18 Apr '13
18 Apr '13
Author: bleny
Date: 2013-04-18 17:50:52 +0200 (Thu, 18 Apr 2013)
New Revision: 118
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
use dao protected helper in dao impl
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-18 15:32:38 UTC (rev 117)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-18 15:50:52 UTC (rev 118)
@@ -5,11 +5,9 @@
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedList;
-import com.google.common.collect.Iterables;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
-import java.util.List;
public class DeliveredRequestedListJpaDao extends AbstractJpaDao<DeliveredRequestedList> implements DeliveredRequestedListDao {
@@ -25,38 +23,26 @@
@Override
public DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo) {
- TypedQuery<DeliveredRequestedList> query =
- entityManager.createQuery(
- "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo",
- getEntityClass());
+ TypedQuery<DeliveredRequestedList> query = createQuery(
+ "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo");
query.setParameter("affectedTo", affectedTo);
query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED);
- List<DeliveredRequestedList> resultList = query.getResultList();
+ return findUniqueOrNull(query);
- DeliveredRequestedList onlyElement = Iterables.getOnlyElement(resultList, null);
-
- return onlyElement;
-
}
@Override
public DeliveredRequestedList findByRequestedList(RequestedList requestedList) {
- TypedQuery<DeliveredRequestedList> query =
- entityManager.createQuery(
- "from DeliveredRequestedList drl where drl.requestedList = :requestedList",
- getEntityClass());
+ TypedQuery<DeliveredRequestedList> query = createQuery(
+ "from DeliveredRequestedList drl where drl.requestedList = :requestedList");
query.setParameter("requestedList", requestedList);
- List<DeliveredRequestedList> resultList = query.getResultList();
+ return findUniqueOrNull(query);
- DeliveredRequestedList onlyElement = Iterables.getOnlyElement(resultList, null);
-
- return onlyElement;
-
}
}
1
0
Author: bleny
Date: 2013-04-18 17:32:38 +0200 (Thu, 18 Apr 2013)
New Revision: 117
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
remove useless comment in pom
Modified:
trunk/magalie-web/pom.xml
Modified: trunk/magalie-web/pom.xml
===================================================================
--- trunk/magalie-web/pom.xml 2013-04-18 14:46:51 UTC (rev 116)
+++ trunk/magalie-web/pom.xml 2013-04-18 15:32:38 UTC (rev 117)
@@ -149,7 +149,6 @@
<build>
- <!-- call result war : pollen-xxx.war -->
<finalName>magalie-${project.version}</finalName>
<pluginManagement>
1
0
r116 - in trunk/magalie-services/src: main/java/com/franciaflex/magalie/services/service test/java/com/franciaflex/magalie/services/service
by bleny@users.forge.codelutin.com 18 Apr '13
by bleny@users.forge.codelutin.com 18 Apr '13
18 Apr '13
Author: bleny
Date: 2013-04-18 16:46:51 +0200 (Thu, 18 Apr 2013)
New Revision: 116
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
checks that affectation are well managed
Modified:
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.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-04-18 14:46:31 UTC (rev 115)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 14:46:51 UTC (rev 116)
@@ -259,10 +259,20 @@
log.info("no order to execute found: there is something to do but driver license is required");
}
- findOrderToExecuteResult.setDriverLicenseRequired(driverLicenseRequired);
+ if (somethingIsAvailable) {
- findOrderToExecuteResult.setEverythingUnavailable( ! somethingIsAvailable);
+ Preconditions.checkState(driverLicenseRequired);
+ findOrderToExecuteResult.setDriverLicenseRequired(driverLicenseRequired);
+
+ } else {
+
+ Preconditions.checkState( ! driverLicenseRequired);
+
+ findOrderToExecuteResult.setEverythingUnavailable(true);
+
+ }
+
}
}
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-18 14:46:31 UTC (rev 115)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-18 14:46:51 UTC (rev 116)
@@ -4,6 +4,7 @@
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedArticle;
import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -150,4 +151,53 @@
}
+ @Test
+ public void testFindOrderAffectations() {
+
+ FindOrderToExecuteResult orderToExecute;
+
+ // user is affected to first list, must know new affectation
+ {
+ orderToExecute = service.findOrderToExecute(magalieUser, building);
+ Preconditions.checkState(orderToExecute.isSuccess());
+
+ Assert.assertNull(orderToExecute.getOldAffectation());
+ Assert.assertNotNull(orderToExecute.getNewAffectation());
+
+ }
+
+ // continuing first list, user affectation not changed
+ {
+ orderToExecute = service.findOrderToExecute(magalieUser, building);
+ Preconditions.checkState(orderToExecute.isSuccess());
+
+ Assert.assertNull(orderToExecute.getOldAffectation());
+ Assert.assertNull(orderToExecute.getNewAffectation());
+
+ }
+
+ // first list is finished, must know old affectation and new affectation
+ {
+ orderToExecute = service.findOrderToExecute(magalieUser, building);
+ Preconditions.checkState(orderToExecute.isSuccess());
+
+ Assert.assertNotNull(orderToExecute.getOldAffectation());
+ Assert.assertNotNull(orderToExecute.getNewAffectation());
+ Assert.assertNotEquals(
+ orderToExecute.getOldAffectation().getRequestedList(),
+ orderToExecute.getNewAffectation().getRequestedList());
+
+ }
+
+ {
+ orderToExecute = service.findOrderToExecute(magalieUser, building);
+ Preconditions.checkState(orderToExecute.isSuccess());
+
+ Assert.assertNull(orderToExecute.getOldAffectation());
+ Assert.assertNull(orderToExecute.getNewAffectation());
+
+ }
+
+ }
+
}
1
0