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
Jenkins build is back to normal : franciaflex-magalie » MagaLiE #58
by admin+hudson@codelutin.com 04 Jun '13
by admin+hudson@codelutin.com 04 Jun '13
04 Jun '13
Jenkins build is back to normal : franciaflex-magalie » MagaLiE :: Services #58
by admin+hudson@codelutin.com 04 Jun '13
by admin+hudson@codelutin.com 04 Jun '13
04 Jun '13
Author: bleny
Date: 2013-06-03 12:05:46 +0200 (Mon, 03 Jun 2013)
New Revision: 231
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
upgrade to jqueryPluginVersion 3.6.0
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-06-03 10:02:45 UTC (rev 230)
+++ trunk/pom.xml 2013-06-03 10:05:46 UTC (rev 231)
@@ -107,7 +107,7 @@
<nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
<h2Version>1.3.172</h2Version>
<struts2Version>2.3.14.2</struts2Version>
- <jqueryPluginVersion>3.5.1</jqueryPluginVersion>
+ <jqueryPluginVersion>3.6.0</jqueryPluginVersion>
<bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>
<shiroVersion>1.2.1</shiroVersion>
<slf4jVersion>1.7.5</slf4jVersion>
1
0
03 Jun '13
Author: bleny
Date: 2013-06-03 12:02:45 +0200 (Mon, 03 Jun 2013)
New Revision: 230
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
update bootstrapPluginVersion to 1.6.1 so we have iconPrepend
Modified:
trunk/magalie-web/src/main/resources/log4j.properties
trunk/pom.xml
Modified: trunk/magalie-web/src/main/resources/log4j.properties
===================================================================
--- trunk/magalie-web/src/main/resources/log4j.properties 2013-06-03 08:42:39 UTC (rev 229)
+++ trunk/magalie-web/src/main/resources/log4j.properties 2013-06-03 10:02:45 UTC (rev 230)
@@ -34,7 +34,7 @@
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n
-# log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE
+log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE
# log4j.logger.com.franciaflex.magalie=TRACE
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-06-03 08:42:39 UTC (rev 229)
+++ trunk/pom.xml 2013-06-03 10:02:45 UTC (rev 230)
@@ -108,7 +108,7 @@
<h2Version>1.3.172</h2Version>
<struts2Version>2.3.14.2</struts2Version>
<jqueryPluginVersion>3.5.1</jqueryPluginVersion>
- <bootstrapPluginVersion>1.6.0</bootstrapPluginVersion>
+ <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>
<shiroVersion>1.2.1</shiroVersion>
<slf4jVersion>1.7.5</slf4jVersion>
<jettyVersion>${jettyPluginVersion}</jettyVersion>
1
0
03 Jun '13
Author: bleny
Date: 2013-06-03 10:42:39 +0200 (Mon, 03 Jun 2013)
New Revision: 229
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
remove useless comments
Modified:
trunk/magalie-web/src/main/resources/struts.xml
trunk/pom.xml
Modified: trunk/magalie-web/src/main/resources/struts.xml
===================================================================
--- trunk/magalie-web/src/main/resources/struts.xml 2013-05-31 15:45:03 UTC (rev 228)
+++ trunk/magalie-web/src/main/resources/struts.xml 2013-06-03 08:42:39 UTC (rev 229)
@@ -40,13 +40,6 @@
<default-interceptor-ref name="magalieStack"/>
- <!--<action name="login" class="fr.cerqual.nflogement.extranet.ui.actions.Login">-->
- <!--<result name="alreadyLogged" type="redirectAction">-->
- <!--<param name="actionName">dashboard</param>-->
- <!--</result>-->
- <!--<result name="success">/WEB-INF/jsp/login.jsp</result>-->
- <!--</action>-->
-
</package>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-31 15:45:03 UTC (rev 228)
+++ trunk/pom.xml 2013-06-03 08:42:39 UTC (rev 229)
@@ -106,7 +106,6 @@
<nuitonWebVersion>1.13</nuitonWebVersion>
<nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
<h2Version>1.3.172</h2Version>
- <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>
<struts2Version>2.3.14.2</struts2Version>
<jqueryPluginVersion>3.5.1</jqueryPluginVersion>
<bootstrapPluginVersion>1.6.0</bootstrapPluginVersion>
1
0
31 May '13
Author: Bavencoff
Date: 2013-05-31 17:45:03 +0200 (Fri, 31 May 2013)
New Revision: 228
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2370 : Multy-Companies
Added:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.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/ArticleJpaDao.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/MagalieUserJpaDao.java
trunk/magalie-persistence/src/main/xmi/magalie.properties
trunk/magalie-persistence/src/main/xmi/magalie.zargo
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.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/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/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/SimpleWithdrawItemService.java
trunk/magalie-services/src/main/resources/fixtures.yaml
trunk/magalie-services/src/main/resources/fixtures2.yaml
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.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/PrepareWithdrawItemAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.dao.ArticleJpaDao;
import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
+import com.franciaflex.magalie.persistence.dao.CompanyJpaDao;
import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleJpaDao;
import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListJpaDao;
import com.franciaflex.magalie.persistence.dao.KanbanJpaDao;
@@ -84,4 +85,5 @@
PreparedArticleReceptionJpaDao getPreparedArticleReceptionDao();
+ CompanyJpaDao getCompanyDao();
}
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -24,10 +24,11 @@
*/
import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Company;
/** @author bleny */
public interface ArticleDao {
- Article findByCode(String articleCode);
+ Article findByCode(String articleCode, Company company);
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -24,6 +24,7 @@
*/
import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Company;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
@@ -35,9 +36,11 @@
}
@Override
- public Article findByCode(String articleCode) {
- TypedQuery<Article> query = createQuery("from Article a where a.code = :code");
- query.setParameter("code", articleCode);
+ public Article findByCode(String articleCode, Company company) {
+
+ TypedQuery<Article> query = createQuery(Article.PROPERTY_CODE, articleCode,
+ Article.PROPERTY_COMPANY, company);
+
return findUniqueOrNull(query);
}
Added: 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 (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -0,0 +1,15 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
+
+import java.util.List;
+
+/**
+ * @author Bavencoff
+ */
+public interface BuildingDao {
+
+ public List<Building> findAllByCompany(Company company);
+
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -0,0 +1,25 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+/**
+ * @author Bavencoff
+ */
+public class BuildingJpaDao extends AbstractBuildingJpaDao {
+ public BuildingJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<Building> findAllByCompany(Company company) {
+
+ TypedQuery<Building> query = createQuery(Building.PROPERTY_COMPANY, company);
+
+ return findAll(query);
+ }
+}
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -23,6 +23,7 @@
* #L%
*/
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import java.util.List;
@@ -34,4 +35,6 @@
List<MagalieUser> findAll();
+ List<MagalieUser> findAllByCompany(Company company);
+
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -23,10 +23,10 @@
* #L%
*/
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import javax.persistence.EntityManager;
-import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.List;
@@ -45,8 +45,13 @@
@Override
public List<MagalieUser> findAll() {
- Query query = entityManager.createQuery("from MagalieUser mu order by mu.login");
- List<MagalieUser> resultList = query.getResultList();
- return resultList;
+ TypedQuery<MagalieUser> query = createQuery("from MagalieUser mu order by mu.login");
+ return findAll(query);
}
+
+ @Override
+ public List<MagalieUser> findAllByCompany(Company company) {
+ TypedQuery<MagalieUser> query = createQuery(MagalieUser.PROPERTY_COMPANY, company);
+ return findAll(query);
+ }
}
Modified: trunk/magalie-persistence/src/main/xmi/magalie.properties
===================================================================
--- trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-05-31 15:45:03 UTC (rev 228)
@@ -22,6 +22,7 @@
###
com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique
+com.franciaflex.magalie.persistence.entity.Company.class.stereotype=notGeneratedValue
com.franciaflex.magalie.persistence.entity.Article.class.stereotype=notGeneratedValue
com.franciaflex.magalie.persistence.entity.Building.class.stereotype=notGeneratedValue
com.franciaflex.magalie.persistence.entity.Location.class.stereotype=notGeneratedValue
Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo
===================================================================
(Binary files differ)
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -28,6 +28,7 @@
import com.franciaflex.magalie.MagalieTechnicalException;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.Kanban;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
@@ -58,6 +59,7 @@
throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e);
}
YamlReader reader = new YamlReader(yaml);
+ reader.getConfig().setClassTag("company", Company.class);
reader.getConfig().setClassTag("building", Building.class);
reader.getConfig().setClassTag("warehouse", Warehouse.class);
reader.getConfig().setClassTag("supplier", Supplier.class);
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
@@ -55,4 +56,10 @@
}
+ public List<Building> getAllBuildingsByCompany(Company company) {
+
+ BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao();
+
+ return dao.findAllByCompany(company);
+ }
}
Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -0,0 +1,38 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.CompanyJpaDao;
+import com.franciaflex.magalie.persistence.entity.Company;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+
+import java.util.List;
+
+/**
+ * @author Bavencoff
+ */
+public class CompanyService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(com.franciaflex.magalie.services.MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public List<Company> getAllCompanies() {
+
+ CompanyJpaDao dao = serviceContext.getPersistenceContext().getCompanyDao();
+
+ return dao.findAll();
+
+ }
+
+ public Company getCompany(String CompanyId) {
+
+ CompanyJpaDao dao = serviceContext.getPersistenceContext().getCompanyDao();
+
+ return dao.findById(CompanyId);
+
+ }
+
+}
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -26,6 +26,7 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.dao.ArticleJpaDao;
import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
+import com.franciaflex.magalie.persistence.dao.CompanyJpaDao;
import com.franciaflex.magalie.persistence.dao.KanbanJpaDao;
import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
import com.franciaflex.magalie.persistence.dao.MagalieUserJpaDao;
@@ -37,6 +38,7 @@
import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.Kanban;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
@@ -108,6 +110,16 @@
}
+ CompanyJpaDao companyDao = persistenceContext.getCompanyDao();
+
+ Collection<Company> companies = fixtures.fixture("companies");
+
+ for (Company company : companies) {
+
+ companyDao.persist(company);
+
+ }
+
MagalieUserJpaDao magalieUserDao = persistenceContext.getMagalieUserDao();
Collection<MagalieUser> users = fixtures.fixture("users");
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -29,6 +29,7 @@
import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.Kanban;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
@@ -120,12 +121,12 @@
}
- public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException {
+ public Article getArticle(String articleBarcode, Company company) throws InvalidMagalieBarcodeException {
MagalieBarcodeService magalieBarcodeService =
serviceContext.newService(MagalieBarcodeService.class);
- Article article = magalieBarcodeService.getArticle(articleBarcode);
+ Article article = magalieBarcodeService.getArticle(articleBarcode, company);
return article;
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
@@ -38,11 +39,11 @@
this.serviceContext = serviceContext;
}
- public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException {
+ public Article getArticle(String articleBarcode, Company company) throws InvalidMagalieBarcodeException {
ArticleDao articleDao = serviceContext.getPersistenceContext().getArticleDao();
- Article article = articleDao.findByCode(articleBarcode);
+ Article article = articleDao.findByCode(articleBarcode, company);
if (article == null) {
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -24,6 +24,7 @@
*/
import com.franciaflex.magalie.persistence.dao.MagalieUserJpaDao;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
@@ -40,13 +41,13 @@
this.serviceContext = serviceContext;
}
- public MagalieUser getMagalieUser(String login) {
+ public MagalieUser getMagalieUser(String magalieUserId) {
MagalieUserJpaDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
- MagalieUser magalieUser = dao.findByLogin(login);
+ MagalieUser magalieUser = dao.findById(magalieUserId);
- Preconditions.checkArgument(magalieUser != null, "there is no user with login '" + login + "'");
+ Preconditions.checkArgument(magalieUser != null, "there is no user with id '" + magalieUserId + "'");
return magalieUser;
@@ -61,4 +62,13 @@
return allMagalieUsers;
}
+
+ public List<MagalieUser> getAllMagalieUsersByCompany(Company company) {
+
+ MagalieUserJpaDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
+
+ List<MagalieUser> allMagalieUsers = dao.findAllByCompany(company);
+
+ return allMagalieUsers;
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -31,6 +31,7 @@
import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
@@ -66,8 +67,10 @@
MagalieBarcodeService magalieBarcodeService =
serviceContext.newService(MagalieBarcodeService.class);
- Article article = magalieBarcodeService.getArticle(articleBarcode);
+ Company company = magalieUser.getCompany();
+ Article article = magalieBarcodeService.getArticle(articleBarcode, company);
+
Iterable<StoredArticle> storedArticles =
articleStorageService.getStoredArticles(building, article);
Modified: trunk/magalie-services/src/main/resources/fixtures.yaml
===================================================================
--- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-31 15:45:03 UTC (rev 228)
@@ -1,3 +1,17 @@
+franciaflex:
+ &franciaflex !company
+ id: frflex
+ name: FranciaFlex
+
+lerheu:
+ &lerheu !company
+ id: lr
+ name: Le Rheu
+
+companies:
+ - *franciaflex
+ - *lerheu
+
pascal:
&pascal !user
id: magalie_user_pascal
@@ -5,6 +19,7 @@
name: Pascal Heinz
accreditationLevel: 9
craneMan: false
+ company: *franciaflex
bruno:
&bruno !user
@@ -13,6 +28,7 @@
name: Bruno Menager
accreditationLevel: 9
craneMan: true
+ company: *franciaflex
corinne:
&corinne !user
@@ -21,6 +37,7 @@
name: Corinne Cocolon
accreditationLevel: 0
craneMan: false
+ company: *franciaflex
xavier:
&xavier !user
@@ -29,6 +46,7 @@
name: Xavier Bertini
accreditationLevel: 0
craneMan: false
+ company: *franciaflex
users:
- *bruno
@@ -40,11 +58,13 @@
&B1 !building
id: building_1
code: B1
+ company: *franciaflex
B2:
&B2 !building
id: building_2
code: B2
+ company: *franciaflex
buildings:
- *B1
@@ -316,6 +336,7 @@
unit: M
description: Jonc Souple D5
fixedLocationsFirst: true
+ company: *franciaflex
article2:
&article2 !article
@@ -326,6 +347,7 @@
unit: PCE
description: Moteur Oréa Slt 50 RTS 50/12
fixedLocationsFirst: false
+ company: *franciaflex
article3:
&article3 !article
@@ -336,6 +358,7 @@
unit: PCE
description: Interface ASA/SOMFY + clip
fixedLocationsFirst: true
+ company: *franciaflex
article4:
&article4 !article
@@ -344,6 +367,7 @@
unit: PCE
description: Kit Tr.PM Fixe 122G D40Plat 10
fixedLocationsFirst: false
+ company: *franciaflex
article5:
&article5 !article
@@ -354,6 +378,7 @@
unit: B60
description: Caisson 2005 3F 6000 Brun
fixedLocationsFirst: false
+ company: *franciaflex
article6:
&article6 !article
@@ -365,6 +390,7 @@
description: Ensemble SOLIRIS UNO
fixedLocationsFirst: false
supplier: *supplier2
+ company: *franciaflex
articles:
- *article1
Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml
===================================================================
--- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-31 15:45:03 UTC (rev 228)
@@ -1,3 +1,17 @@
+franciaflex:
+ &franciaflex !company
+ id: frflex
+ name: FranciaFlex
+
+lerheu:
+ &lerheu !company
+ id: lr
+ name: Le Rheu
+
+companies:
+ - *franciaflex
+ - *lerheu
+
alexandre:
&alexandre !user
id: magalie_user_alexandre
@@ -5,6 +19,7 @@
name: Alexandre
accreditationLevel: 9
craneMan: true
+ company: *franciaflex
basile:
&basile !user
@@ -13,6 +28,7 @@
name: Basile
accreditationLevel: 0
craneMan: false
+ company: *franciaflex
cathy:
&cathy !user
@@ -21,6 +37,7 @@
name: Cathy
accreditationLevel: 9
craneMan: false
+ company: *franciaflex
david:
&david !user
@@ -29,6 +46,7 @@
name: David
accreditationLevel: 0
craneMan: false
+ company: *franciaflex
users:
- *alexandre
@@ -40,6 +58,7 @@
&B1 !building
id: building_1
code: B1
+ company: *franciaflex
buildings:
- *B1
@@ -173,6 +192,7 @@
unit: kg
description: very big screws
fixedLocationsFirst: false
+ company: *franciaflex
article2:
&article2 !article
@@ -181,6 +201,7 @@
unit: box
description: little buttons
fixedLocationsFirst: false
+ company: *franciaflex
article3:
&article3 !article
@@ -191,6 +212,7 @@
unit: g
description: magic powder
fixedLocationsFirst: false
+ company: *franciaflex
article4:
&article4 !article
@@ -199,6 +221,7 @@
unit: g
description: lutins malins
fixedLocationsFirst: false
+ company: *franciaflex
articles:
- *article1
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -24,8 +24,10 @@
*/
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.Warehouse;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.Serializable;
@@ -69,6 +71,13 @@
this.building = building;
}
+ public Company getCompany() {
+
+ Preconditions.checkNotNull(magalieUser);
+
+ return magalieUser.getCompany();
+ }
+
public Warehouse getLastUsedDestinationWarehouseForKanbans() {
return lastUsedDestinationWarehouseForKanbans;
}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -0,0 +1,33 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.persistence.entity.Company;
+import com.franciaflex.magalie.services.service.CompanyService;
+import com.franciaflex.magalie.web.MagalieActionSupport;
+
+import java.util.List;
+
+/**
+ * @author Bavencoff
+ */
+public class ChooseCompanyAction extends MagalieActionSupport {
+
+ protected CompanyService service;
+
+ protected List<Company> companies;
+
+ public void setService(CompanyService service) {
+ this.service = service;
+ }
+
+ @Override
+ public String execute() throws Exception {
+
+ companies = service.getAllCompanies();
+
+ return SUCCESS;
+ }
+
+ public List<Company> getCompanies() {
+ return companies;
+ }
+}
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.persistence.entity.Warehouse;
@@ -135,6 +136,8 @@
MagalieUser magalieUser = session.getMagalieUser();
+ Company company = session.getCompany();
+
destinationWarehouse = service.getStore(destinationWarehouseId);
// save used destination warehouse to propose it by default on next kanban
@@ -142,7 +145,7 @@
try {
- article = service.getArticle(articleBarcode);
+ article = service.getArticle(articleBarcode, company);
} catch (InvalidMagalieBarcodeException e) {
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -29,7 +29,7 @@
import org.apache.struts2.convention.annotation.Results;
@Results({
- @Result(name="success", type="redirectAction", params = { "actionName", "login!input" })
+ @Result(name="success", type="redirectAction", params = { "actionName", "choose-company" })
})
public class IndexAction extends MagalieActionSupport {
}
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -24,8 +24,10 @@
*/
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.service.BuildingsService;
+import com.franciaflex.magalie.services.service.CompanyService;
import com.franciaflex.magalie.services.service.MagalieUsersService;
import com.franciaflex.magalie.web.MagalieActionSupport;
import com.franciaflex.magalie.web.MagalieSession;
@@ -43,14 +45,18 @@
protected BuildingsService buildingsService;
+ protected CompanyService companyService;
+
protected List<MagalieUser> allMagalieUsers;
protected List<Building> allBuildings;
protected MagalieSession session;
- protected String login;
+ protected String companyId;
+ protected String magalieUserId;
+
protected String buildingId;
public void setMagalieUsersService(MagalieUsersService magalieUsersService) {
@@ -61,14 +67,22 @@
this.buildingsService = buildingsService;
}
+ public void setCompanyService(CompanyService companyService) {
+ this.companyService = companyService;
+ }
+
public void setSession(MagalieSession session) {
this.session = session;
}
- public void setLogin(String login) {
- this.login = login;
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
}
+ public void setMagalieUserId(String magalieUserId) {
+ this.magalieUserId = magalieUserId;
+ }
+
public void setBuildingId(String buildingId) {
this.buildingId = buildingId;
}
@@ -76,16 +90,18 @@
@Override
public String input() {
- allMagalieUsers = magalieUsersService.getAllMagalieUsers();
+ Company company = companyService.getCompany(companyId);
- allBuildings = buildingsService.getAllBuildings();
+ allMagalieUsers = magalieUsersService.getAllMagalieUsersByCompany(company);
+ allBuildings = buildingsService.getAllBuildingsByCompany(company);
+
return INPUT;
}
- public String getLogin() {
- return login;
+ public String getMagalieUserId() {
+ return magalieUserId;
}
public String getBuildingId() {
@@ -103,7 +119,7 @@
@Override
public String execute() {
- MagalieUser magalieUser = magalieUsersService.getMagalieUser(login);
+ MagalieUser magalieUser = magalieUsersService.getMagalieUser(magalieUserId);
Building building = buildingsService.getBuilding(buildingId);
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java 2013-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java 2013-05-31 15:45:03 UTC (rev 228)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Company;
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.persistence.entity.Warehouse;
import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
@@ -134,12 +135,14 @@
destinationWarehouse = fulfilKanbanService.getStore(destinationWarehouseId);
+ Company company = session.getCompany();
+
// save used destination warehouse to propose it by default on next kanban
session.setLastUsedDestinationWarehouseForKanbans(destinationWarehouse);
try {
- article = fulfilKanbanService.getArticle(articleBarcode);
+ article = fulfilKanbanService.getArticle(articleBarcode, company);
} catch (InvalidMagalieBarcodeException e) {
Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-05-31 15:45:03 UTC (rev 228)
@@ -0,0 +1,35 @@
+
+
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <title>Entreprise</title>
+</head>
+
+
+<s:iterator value="companies" status="stat">
+ <li>
+ <s:set var="elementCompanyId">companyId<s:property value="#stat.index" /></s:set>
+ <s:url namespace="/" action="login!input" id="loginUrl">
+ <s:param name="companyId" value="%{id}" />
+ </s:url>
+ <s:if test="#stat.index < shortcuts.size()">
+ <script type="text/javascript">
+ $(document).ready(function () {
+ var id = '<s:property value="elementCompanyId" />';
+ bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));});
+ });
+ </script>
+ <s:a href="%{loginUrl}" id="%{elementCompanyId}">
+ <s:property value="name" />
+ (<s:property value="shortcuts.get(#stat.index)" />)
+ </s:a>
+ </s:if>
+ <s:else>
+ <s:a href="%{loginUrl}" ><s:property value="name" />
+ </s:a>
+ </s:else>
+ </li>
+</s:iterator>
+
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-05-31 12:40:58 UTC (rev 227)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-05-31 15:45:03 UTC (rev 228)
@@ -30,9 +30,9 @@
<s:form>
<s:select label="Utilisateur"
- key="login"
+ key="magalieUserId"
list="allMagalieUsers"
- listKey="login"
+ listKey="id"
listValue="name"
required="true"
/>
1
0
31 May '13
Author: bleny
Date: 2013-05-31 14:40:58 +0200 (Fri, 31 May 2013)
New Revision: 227
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
update file headers
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java
trunk/magalie-persistence/src/main/xmi/magalie.properties
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.PreparedArticleReception;
/** @author bleny */
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.PreparedArticleReception;
import javax.persistence.EntityManager;
Modified: trunk/magalie-persistence/src/main/xmi/magalie.properties
===================================================================
--- trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-05-31 12:40:58 UTC (rev 227)
@@ -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%
+###
com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique
com.franciaflex.magalie.persistence.entity.Article.class.stereotype=notGeneratedValue
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.StoredArticle;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -12,12 +12,12 @@
* 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-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.StoredArticles;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -1,6 +1,29 @@
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.LocationDao;
import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.StoredArticles;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.PreparedArticleReception;
import com.franciaflex.magalie.services.service.ReceptionService;
import com.franciaflex.magalie.web.Activity;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.StorageMovementOrder;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.StoredArticles;
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/StorageTransferAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.Location;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-05-31 12:40:58 UTC (rev 227)
@@ -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.Location;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-05-31 12:40:58 UTC (rev 227)
@@ -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/simple-withdraw-item-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-05-31 12:40:58 UTC (rev 227)
@@ -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/storage-transfer-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-05-31 12:40:58 UTC (rev 227)
@@ -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/storage-transfer-location-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-05-31 12:37:06 UTC (rev 226)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-05-31 12:40:58 UTC (rev 227)
@@ -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
r226 - in trunk: . magalie-persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny@users.forge.codelutin.com 31 May '13
by bleny@users.forge.codelutin.com 31 May '13
31 May '13
Author: bleny
Date: 2013-05-31 14:37:06 +0200 (Fri, 31 May 2013)
New Revision: 226
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
clean poms
Removed:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java
Modified:
trunk/magalie-persistence/pom.xml
trunk/pom.xml
Modified: trunk/magalie-persistence/pom.xml
===================================================================
--- trunk/magalie-persistence/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
+++ trunk/magalie-persistence/pom.xml 2013-05-31 12:37:06 UTC (rev 226)
@@ -32,19 +32,16 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -133,7 +130,6 @@
<plugin>
<groupId>de.juplo</groupId>
<artifactId>hibernate4-maven-plugin</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<id>executionCreate</id>
@@ -142,7 +138,7 @@
</goals>
<configuration>
<type>CREATE</type>
- <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile>
+ <outputFile>${project.build.directory}/generated-sources/magalie-create-oracle.sql</outputFile>
</configuration>
</execution>
<execution>
@@ -152,7 +148,7 @@
</goals>
<configuration>
<type>DROP</type>
- <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile>
+ <outputFile>${project.build.directory}/generated-sources/magalie-drop-oracle.sql</outputFile>
</configuration>
</execution>
</executions>
@@ -161,37 +157,6 @@
<target>SCRIPT</target>
</configuration>
</plugin>
- <plugin>
- <groupId>de.juplo</groupId>
- <artifactId>hibernate4-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>executionCreate</id>
- <goals>
- <goal>export</goal>
- </goals>
- <configuration>
- <type>CREATE</type>
- <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile>
- </configuration>
- </execution>
- <execution>
- <id>executionDrop</id>
- <goals>
- <goal>export</goal>
- </goals>
- <configuration>
- <type>DROP</type>
- <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect>
- <target>SCRIPT</target>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted: 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-05-31 10:42:59 UTC (rev 225)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-05-31 12:37:06 UTC (rev 226)
@@ -1,55 +0,0 @@
-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;
-
-import java.io.Serializable;
-
-public abstract class AbstractEntity implements Serializable {
-
- public abstract String getId();
-
- @Override
- public boolean equals(Object o) {
- String id = getId();
- if (this == o) return true;
- if (!(o instanceof AbstractEntity)) return false;
- AbstractEntity that = (AbstractEntity) o;
- if (id == null && that.getId() == null) return false;
- if (!id.equals(that.getId())) return false;
- return Objects.equal(id, that.getId());
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(getId());
- }
-
- @Override
- public String toString() {
- return ToStringBuilder.reflectionToString(this);
- }
-}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
+++ trunk/pom.xml 2013-05-31 12:37:06 UTC (rev 226)
@@ -134,7 +134,57 @@
<dependencies>
+ <!-- common dependencies (all module) -->
+
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2Version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ <version>${nuitonUtilsVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ <version>${nuitonUtilsVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockitoVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.esotericsoftware.yamlbeans</groupId>
+ <artifactId>yamlbeans</artifactId>
+ <version>1.06</version>
+ </dependency>
+
+ <!-- persistence module dependencies -->
+
+ <dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<version>1.0.1.Final</version>
@@ -158,16 +208,10 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernateVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- <version>${h2Version}</version>
- </dependency>
-
- <dependency>
<groupId>org.nuiton.jpa</groupId>
<artifactId>nuiton-jpa-api</artifactId>
<version>${nuitonJpaVersion}</version>
@@ -180,17 +224,13 @@
<scope>test</scope>
</dependency>
- <!-- Nuiton libs -->
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- <version>${nuitonUtilsVersion}</version>
- </dependency>
+ <!-- web module -->
<dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-config</artifactId>
- <version>${nuitonUtilsVersion}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -206,14 +246,6 @@
<version>${nuitonWebVersion}</version>
</dependency>
- <!--dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.12.1.GA</version>
- </dependency-->
-
- <!-- Struts 2 -->
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
@@ -265,51 +297,8 @@
</exclusions>
</dependency>
- <!-- Logging -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4jVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Others -->
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockitoVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.esotericsoftware.yamlbeans</groupId>
- <artifactId>yamlbeans</artifactId>
- <version>1.06</version>
- </dependency>
-
</dependencies>
+
</dependencyManagement>
<build>
@@ -329,28 +318,17 @@
</plugin>
<plugin>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <version>${nuitonI18nVersion}</version>
- </plugin>
-
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils-maven-report-plugin</artifactId>
- <version>${nuitonUtilsVersion}</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${projectInfoReportsPluginVersion}</version>
- </plugin>
-
- <plugin>
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene-maven-plugin</artifactId>
<version>${eugeneVersion}</version>
</plugin>
+ <plugin>
+ <groupId>de.juplo</groupId>
+ <artifactId>hibernate4-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -396,22 +374,6 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils-maven-report-plugin</artifactId>
- <version>${nuitonUtilsVersion}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate-application-config-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <i18nBundleName>${magalieI18nBundle}</i18nBundleName>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${projectInfoReportsPluginVersion}</version>
<reportSets>
1
0
31 May '13
Author: bleny
Date: 2013-05-31 12:42:59 +0200 (Fri, 31 May 2013)
New Revision: 225
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
merge branch into trunk, now using nuiton-jpa
Added:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseJpaDao.java
trunk/magalie-persistence/src/main/xmi/magalie.properties
Removed:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.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/jpa/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.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/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/PreparedArticleReception.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/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/UnavailableArticle.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java
Modified:
trunk/
trunk/magalie-persistence/pom.xml
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/RequestedArticles.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/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/PreparedArticleReceptionDao.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/SupplierDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.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/DeliveredRequestedArticle.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/StorageMovement.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
trunk/magalie-persistence/src/main/xmi/magalie.zargo
trunk/magalie-services/pom.xml
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.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/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/MagalieUsersService.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/ReportService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java
trunk/magalie-services/src/test/resources/log4j.properties
trunk/magalie-web/pom.xml
trunk/pom.xml
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/magalie-eugene:191-224
Modified: trunk/magalie-persistence/pom.xml
===================================================================
--- trunk/magalie-persistence/pom.xml 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
@@ -9,7 +9,6 @@
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>com.franciaflex</groupId>
<artifactId>magalie-persistence</artifactId>
<name>MagaLiE :: Persistence</name>
<description>Couche d'accès à la base de données pour MagaLiE</description>
@@ -21,6 +20,11 @@
<dependencies>
<dependency>
+ <groupId>org.nuiton.jpa</groupId>
+ <artifactId>nuiton-jpa-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
@@ -44,12 +48,6 @@
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-config</artifactId>
</dependency>
@@ -94,36 +92,45 @@
<build>
<plugins>
- <!--<plugin>-->
- <!--<groupId>org.nuiton.eugene</groupId>-->
- <!--<artifactId>eugene-maven-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<inputs>zargo</inputs>-->
- <!--<resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>-->
- <!--</configuration>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>generate-entities</id>-->
- <!--<phase>generate-sources</phase>-->
- <!--<configuration>-->
- <!--<!– Corresponding to extracted package from zargo file –>-->
- <!--<fullPackagePath>com.franciaflex.magalie.persistence.entities</fullPackagePath>-->
- <!--<!– DefaultPackage used for DAOHelper generation –>-->
- <!--<defaultPackage>com.franciaflex.magalie.persistence.entities</defaultPackage>-->
- <!--<templates>-->
- <!--org.nuiton.eugene.java.JavaInterfaceTransformer,-->
- <!--org.nuiton.eugene.java.JavaBeanTransformer,-->
- <!--org.nuiton.eugene.java.JavaEnumerationTransformer,-->
- <!--org.nuiton.topia.generator.TopiaMetaTransformer-->
- <!--</templates>-->
- <!--</configuration>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
<plugin>
+ <groupId>org.nuiton.eugene</groupId>
+ <artifactId>eugene-maven-plugin</artifactId>
+ <configuration>
+ <inputs>zargo</inputs>
+ <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-entities</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <!-- Corresponding to extracted package from zargo file -->
+ <fullPackagePath>
+ com.franciaflex.magalie.persistence.entity
+ </fullPackagePath>
+ <!-- defaultPackage used for generation -->
+ <defaultPackage>
+ com.franciaflex.magalie.persistence
+ </defaultPackage>
+ <templates>
+ org.nuiton.eugene.java.JavaEnumerationTransformer,
+ org.nuiton.jpa.templates.JpaMetaTransformer
+ </templates>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.nuiton.jpa</groupId>
+ <artifactId>nuiton-jpa-templates</artifactId>
+ <version>${nuitonJpaVersion}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>de.juplo</groupId>
<artifactId>hibernate4-maven-plugin</artifactId>
<version>1.0.1</version>
@@ -154,6 +161,37 @@
<target>SCRIPT</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>de.juplo</groupId>
+ <artifactId>hibernate4-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>executionCreate</id>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ <configuration>
+ <type>CREATE</type>
+ <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>executionDrop</id>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ <configuration>
+ <type>DROP</type>
+ <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect>
+ <target>SCRIPT</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,66 +0,0 @@
-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;
-import com.google.common.base.Predicates;
-import org.apache.commons.lang3.ObjectUtils;
-
-import java.util.Comparator;
-
-public class Entities {
-
- private Entities() {}
-
- protected static class GetIdFunction implements Function<AbstractEntity, String> {
-
- @Override
- public String apply(AbstractEntity entity) {
- return entity.getId();
- }
- }
-
- protected static class ArbitraryComparator<E extends AbstractEntity> implements Comparator<E> {
-
- @Override
- public int compare(E x, E y) {
- return ObjectUtils.compare(x.getId(), y.getId());
- }
-
- }
-
- public static Function<AbstractEntity, String> getIdFunction() {
- return new GetIdFunction();
- }
-
- public static Predicate<AbstractEntity> entityHasId(String id) {
- return Predicates.compose(Predicates.equalTo(id), getIdFunction());
- }
-
- public static <E extends AbstractEntity> Comparator<E> arbitraryComparator() {
- return new ArbitraryComparator();
- }
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,161 +23,21 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.dao.ArticleDao;
-import com.franciaflex.magalie.persistence.dao.BuildingDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao;
-import com.franciaflex.magalie.persistence.dao.KanbanDao;
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
-import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao;
-import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.LocationDao;
-import com.franciaflex.magalie.persistence.dao.LocationErrorDao;
-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.UnavailableArticleDao;
-import com.franciaflex.magalie.persistence.dao.WarehouseDao;
-import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
-import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.BuildingJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.DeliveredRequestedArticleJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.DeliveredRequestedListJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.KanbanJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.LocationErrorJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.LocationJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.PreparedArticleReceptionJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao;
-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.UnavailableArticleJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.WarehouseJpaDao;
-import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao;
+import org.nuiton.jpa.api.hibernate.HibernateUtil;
import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-public class JpaMagaliePersistenceContext implements MagaliePersistenceContext {
+public class JpaMagaliePersistenceContext extends AbstractJpaMagaliePersistenceContext implements MagaliePersistenceContext {
- protected EntityManager entityManager;
-
- protected EntityTransaction entityTransaction;
-
public JpaMagaliePersistenceContext(EntityManager entityManager) {
- this.entityManager = entityManager;
- entityTransaction = entityManager.getTransaction();
- if ( ! entityTransaction.isActive()) {
- entityTransaction.begin();
- }
+ super(entityManager);
}
@Override
- public void commit() {
- entityTransaction.commit();
- entityTransaction = entityManager.getTransaction();
- entityTransaction.begin();
- }
-
- @Override
- public void rollback() {
- entityTransaction.rollback();
- entityTransaction = entityManager.getTransaction();
- entityTransaction.begin();
- }
-
- @Override
public void clearDatabase() {
rollback();
- JpaUtil.cleanDatabase(entityManager);
+ HibernateUtil.cleanDatabase(entityManager);
commit();
}
- @Override
- public MagalieUserDao getMagalieUserDao() {
- return new MagalieUserJpaDao(entityManager);
- }
-
- @Override
- public StoredArticleDao getStoredArticleDao() {
- return new StoredArticleJpaDao(entityManager);
- }
-
- @Override
- public RequestedArticleDao getRequestedArticleDao() {
- return new RequestedArticleJpaDao(entityManager);
- }
-
- @Override
- public ArticleDao getArticleDao() {
- return new ArticleJpaDao(entityManager);
- }
-
- @Override
- public StorageMovementDao getStorageMovementDao() {
- return new StorageMovementJpaDao(entityManager);
- }
-
- @Override
- public LocationErrorDao getLocationErrorDao() {
- return new LocationErrorJpaDao(entityManager);
- }
-
- @Override
- public StorageMovementOrderDao getStorageMovementOrderDao() {
- return new StorageMovementOrderJpaDao(entityManager);
- }
-
- @Override
- public LocationDao getLocationDao() {
- return new LocationJpaDao(entityManager);
- }
-
- @Override
- public DeliveredRequestedArticleDao getDeliveredRequestedArticleDao() {
- return new DeliveredRequestedArticleJpaDao(entityManager);
- }
-
- @Override
- public WarehouseDao getWarehouseDao() {
- return new WarehouseJpaDao(entityManager);
- }
-
- @Override
- public BuildingDao getBuildingDao() {
- return new BuildingJpaDao(entityManager);
- }
-
- @Override
- public RequestedListDao getRequestedListDao() {
- return new RequestedListJpaDao(entityManager);
- }
-
- @Override
- public DeliveredRequestedListDao getDeliveredRequestedListDao() {
- return new DeliveredRequestedListJpaDao(entityManager);
- }
-
- @Override
- public KanbanDao getKanbanDao() {
- return new KanbanJpaDao(entityManager);
- }
-
- @Override
- public SupplierDao getSupplierDao() {
- return new SupplierJpaDao(entityManager);
- }
-
- @Override
- public UnavailableArticleDao getUnavailableArticleDao() {
- return new UnavailableArticleJpaDao(entityManager);
- }
-
- @Override
- public PreparedArticleReceptionDao getPreparedArticleReceptionDao() {
- return new PreparedArticleReceptionJpaDao(entityManager);
- }
-}
+} //JpaMagaliePersistenceContext
\ No newline at end of file
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,139 +0,0 @@
-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;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.ejb.AvailableSettings;
-import org.hibernate.ejb.EntityManagerFactoryImpl;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.internal.SessionFactoryServiceRegistryImpl;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.Map;
-
-public class JpaUtil {
-
- private static final Log log = LogFactory.getLog(JpaUtil.class);
-
- protected static final ImmutableMap<String, String> JPA_H2_CONFIG =
- ImmutableMap.of(
- AvailableSettings.JDBC_DRIVER, org.h2.Driver.class.getName(),
- AvailableSettings.JDBC_USER, "sa",
- AvailableSettings.JDBC_PASSWORD, "",
- Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName(),
- Environment.HBM2DDL_AUTO, "create"
- );
-
- private JpaUtil() {}
-
- public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context) {
-
- EntityManagerFactory tempEntityManagerFactory =
- createTempEntityManagerFactory(
- persistenceUnitName,
- context, Collections.<String, String>emptyMap());
-
- return tempEntityManagerFactory;
-
- }
-
- public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context, Map<String, String> jpaParameters) {
-
- Map<String, String> allJpaParameters = Maps.newHashMap();
-
- allJpaParameters.putAll(jpaParameters);
-
- allJpaParameters.putAll(JPA_H2_CONFIG);
-
- File tempDirFile = SystemUtils.getJavaIoTmpDir();
-
- File databaseFile = new File(tempDirFile, context);
-
- String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data";
-
- String jdbcUrl = "jdbc:h2:file:" + h2dataPath;
-
- allJpaParameters.put(AvailableSettings.JDBC_URL, jdbcUrl);
-
- if (log.isTraceEnabled()) {
- log.trace("will store H2 data in " + h2dataPath);
- log.trace("jdbc url is\n" + jdbcUrl);
- log.trace("allJpaParameters = " + allJpaParameters);
- }
-
- EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory(persistenceUnitName, allJpaParameters);
-
- return entityManagerFactory;
-
- }
-
- public static void cleanDatabase(EntityManager entityManager) {
-
- if (log.isInfoEnabled()) {
- log.info("will clean database");
- }
-
- ServiceRegistry serviceRegistry =
- ((EntityManagerFactoryImpl) entityManager.getEntityManagerFactory())
- .getSessionFactory().getServiceRegistry();
-
- Configuration configuration = null;
- try {
- Field configurationField = SessionFactoryServiceRegistryImpl.class.getDeclaredField("configuration");
- configurationField.setAccessible(true);
- configuration = (Configuration) configurationField.get(serviceRegistry);
- } catch (IllegalAccessException e) {
- if (log.isErrorEnabled()) {
- log.error("should not occur", e);
- }
- } catch (NoSuchFieldException e) {
- if (log.isErrorEnabled()) {
- log.error("should not occur", e);
- }
- }
-
- SchemaExport schemaExport= new SchemaExport(serviceRegistry, configuration);
-
- schemaExport.setHaltOnError(true);
-
- // drop
- schemaExport.execute(true, true, true, false);
-
- // create
- schemaExport.execute(true, true, false, true);
-
- }
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -72,7 +72,9 @@
@Override
public int compare(Location location1, Location location2) {
- return Integer.compare(location2.getRequiredAccreditationLevel(), location1.getRequiredAccreditationLevel());
+ return location2.getRequiredAccreditationLevel() - location1.getRequiredAccreditationLevel();
+ //FIXME Jdk 1.7
+// return Integer.compare(location2.getRequiredAccreditationLevel(), location1.getRequiredAccreditationLevel());
}
}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,27 +23,25 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.dao.ArticleDao;
-import com.franciaflex.magalie.persistence.dao.BuildingDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao;
-import com.franciaflex.magalie.persistence.dao.KanbanDao;
-import com.franciaflex.magalie.persistence.dao.LocationDao;
-import com.franciaflex.magalie.persistence.dao.LocationErrorDao;
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
-import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao;
-import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
-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.StoredArticleDao;
-import com.franciaflex.magalie.persistence.dao.SupplierDao;
-import com.franciaflex.magalie.persistence.dao.UnavailableArticleDao;
-import com.franciaflex.magalie.persistence.dao.WarehouseDao;
+import com.franciaflex.magalie.persistence.dao.ArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
+import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListJpaDao;
+import com.franciaflex.magalie.persistence.dao.KanbanJpaDao;
+import com.franciaflex.magalie.persistence.dao.LocationErrorJpaDao;
+import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserJpaDao;
+import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionJpaDao;
+import com.franciaflex.magalie.persistence.dao.RequestedArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.RequestedListJpaDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderJpaDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.SupplierJpaDao;
+import com.franciaflex.magalie.persistence.dao.UnavailableArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
-/**
- * @author bleny
- */
+/** @author bleny */
public interface MagaliePersistenceContext {
void commit();
@@ -52,38 +50,38 @@
void clearDatabase();
- MagalieUserDao getMagalieUserDao();
+ MagalieUserJpaDao getMagalieUserDao();
- StoredArticleDao getStoredArticleDao();
+ StoredArticleJpaDao getStoredArticleDao();
- RequestedArticleDao getRequestedArticleDao();
+ RequestedArticleJpaDao getRequestedArticleDao();
- ArticleDao getArticleDao();
+ ArticleJpaDao getArticleDao();
- StorageMovementDao getStorageMovementDao();
+ StorageMovementJpaDao getStorageMovementDao();
- LocationErrorDao getLocationErrorDao();
+ LocationErrorJpaDao getLocationErrorDao();
- StorageMovementOrderDao getStorageMovementOrderDao();
+ StorageMovementOrderJpaDao getStorageMovementOrderDao();
- LocationDao getLocationDao();
+ LocationJpaDao getLocationDao();
- DeliveredRequestedArticleDao getDeliveredRequestedArticleDao();
+ DeliveredRequestedArticleJpaDao getDeliveredRequestedArticleDao();
- BuildingDao getBuildingDao();
+ BuildingJpaDao getBuildingDao();
- WarehouseDao getWarehouseDao();
+ WarehouseJpaDao getWarehouseDao();
- RequestedListDao getRequestedListDao();
+ RequestedListJpaDao getRequestedListDao();
- DeliveredRequestedListDao getDeliveredRequestedListDao();
+ DeliveredRequestedListJpaDao getDeliveredRequestedListDao();
- KanbanDao getKanbanDao();
+ KanbanJpaDao getKanbanDao();
- SupplierDao getSupplierDao();
+ SupplierJpaDao getSupplierDao();
- UnavailableArticleDao getUnavailableArticleDao();
+ UnavailableArticleJpaDao getUnavailableArticleDao();
- PreparedArticleReceptionDao getPreparedArticleReceptionDao();
+ PreparedArticleReceptionJpaDao getPreparedArticleReceptionDao();
}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -28,6 +28,7 @@
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
+import org.nuiton.jpa.api.JpaEntities;
import java.util.Comparator;
import java.util.List;
@@ -56,7 +57,7 @@
new RequestedListComparator(RequestedLists.comparator(requests, affectedRequestedList)),
// we can still have ambiguous or priorities, so to be deterministic, use arbitrary order
- Entities.<RequestedArticle>arbitraryComparator()
+ JpaEntities.<RequestedArticle>arbitraryComparator()
)
);
return comparator;
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -25,10 +25,8 @@
import com.franciaflex.magalie.persistence.entity.Article;
-/**
- * @author bleny
- */
-public interface ArticleDao extends Dao<Article> {
+/** @author bleny */
+public interface ArticleDao {
Article findByCode(String articleCode);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,44 @@
+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 javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+public class ArticleJpaDao extends AbstractArticleJpaDao {
+
+ public ArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public Article findByCode(String articleCode) {
+ TypedQuery<Article> query = createQuery("from Article a where a.code = :code");
+ query.setParameter("code", articleCode);
+ return findUniqueOrNull(query);
+ }
+
+}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,33 +0,0 @@
-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;
-
-/**
- * @author bleny
- */
-public interface BuildingDao extends Dao<Building> {
-
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,44 +0,0 @@
-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;
-
-public interface Dao<E extends AbstractEntity> {
-
- E findById(String id);
-
- List<E> findAll();
-
- void persist(E entity);
-
- E merge(E entity);
-
- void remove(E entity);
-
- boolean contains(E entity);
-
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -29,10 +29,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface DeliveredRequestedArticleDao extends Dao<DeliveredRequestedArticle> {
+/** @author bleny */
+public interface DeliveredRequestedArticleDao {
DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,57 @@
+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;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class DeliveredRequestedArticleJpaDao extends AbstractDeliveredRequestedArticleJpaDao {
+
+ public DeliveredRequestedArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder) {
+ TypedQuery<DeliveredRequestedArticle> query =
+ entityManager.createQuery(
+ "from DeliveredRequestedArticle dra where dra.storageMovementOrder = :storageMovementOrder", getEntityClass());
+ query.setParameter("storageMovementOrder", storageMovementOrder);
+ return findUniqueOrNull(query);
+ }
+
+ @Override
+ public List<DeliveredRequestedArticle> findAll(RequestedList requestedList) {
+ TypedQuery<DeliveredRequestedArticle> query =
+ entityManager.createQuery(
+ "from DeliveredRequestedArticle dra where dra.requestedArticle.requestedList = :requestedList", getEntityClass());
+ query.setParameter("requestedList", requestedList);
+ return findAll(query);
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -27,10 +27,8 @@
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.RequestedList;
-/**
- * @author bleny
- */
-public interface DeliveredRequestedListDao extends Dao<DeliveredRequestedList> {
+/** @author bleny */
+public interface DeliveredRequestedListDao {
DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,65 @@
+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.DeliveredRequestedListStatus;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.RequestedList;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+public class DeliveredRequestedListJpaDao extends AbstractDeliveredRequestedListJpaDao {
+
+ public DeliveredRequestedListJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo) {
+
+ TypedQuery<DeliveredRequestedList> query = createQuery(
+ "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo");
+
+ query.setParameter("affectedTo", affectedTo);
+
+ query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED);
+
+ return findUniqueOrNull(query);
+
+ }
+
+ @Override
+ public DeliveredRequestedList findByRequestedList(RequestedList requestedList) {
+
+ TypedQuery<DeliveredRequestedList> query = createQuery(
+ "from DeliveredRequestedList drl where drl.requestedList = :requestedList");
+
+ query.setParameter("requestedList", requestedList);
+
+ return findUniqueOrNull(query);
+
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -27,10 +27,8 @@
import com.franciaflex.magalie.persistence.entity.Kanban;
import com.franciaflex.magalie.persistence.entity.Warehouse;
-/**
- * @author bleny
- */
-public interface KanbanDao extends Dao<Kanban> {
+/** @author bleny */
+public interface KanbanDao {
public Kanban find(Article article, Warehouse warehouse);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,46 @@
+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;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+public class KanbanJpaDao extends AbstractKanbanJpaDao {
+
+ public KanbanJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public Kanban find(Article article, Warehouse warehouse) {
+ TypedQuery<Kanban> query = entityManager.createQuery("from Kanban k where k.article = :article and k.warehouse = :warehouse", getEntityClass());
+ query.setParameter("article", article);
+ query.setParameter("warehouse", warehouse);
+ return query.getSingleResult();
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -29,7 +29,7 @@
import java.util.List;
-public interface LocationDao extends Dao<Location> {
+public interface LocationDao {
Location find(String code, Warehouse 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -29,15 +29,12 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface LocationErrorDao extends Dao<LocationError> {
+/** @author bleny */
+public interface LocationErrorDao {
LocationError findByLocation(Location location);
List<Location> getAllLocationsInError(Article article);
List<LocationError> findAll();
-
}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,62 @@
+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.Location;
+import com.franciaflex.magalie.persistence.entity.LocationError;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class LocationErrorJpaDao extends AbstractLocationErrorJpaDao {
+
+ public LocationErrorJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public LocationError findByLocation(Location location) {
+ TypedQuery<LocationError> query = createQuery("from LocationError se where se.location = :location");
+ query.setParameter("location", location);
+ return findUniqueOrNull(query);
+ }
+
+ @Override
+ public List<Location> getAllLocationsInError(Article article) {
+ Query query = entityManager.createQuery("select se.location from LocationError se where se.article = :article");
+ query.setParameter("article", article);
+ List<Location> allLocationsInError = query.getResultList();
+ return allLocationsInError;
+ }
+
+ @Override
+ public List<LocationError> findAll() {
+ Query query = entityManager.createQuery("from LocationError se order by se.reportDate");
+ List<LocationError> all = query.getResultList();
+ return all;
+ }
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,94 @@
+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.Locations;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Location;
+import com.franciaflex.magalie.persistence.entity.Warehouse;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class LocationJpaDao extends AbstractLocationJpaDao {
+
+ public LocationJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public Location find(String code, Warehouse warehouse) {
+ TypedQuery<Location> query = createQuery("from Location l where l.code = :code and l.warehouse = :warehouse");
+ query.setParameter("code", code);
+ query.setParameter("warehouse", warehouse);
+ return findUnique(query);
+ }
+
+ protected List<Location> findAllWithoutReception(Building building, Warehouse warehouse) {
+ boolean filterOnBuilding = building != null;
+ boolean filterOnWarehouse = warehouse != null;
+ String hql = " from Location l where";
+ if (filterOnBuilding) {
+ hql += " l.warehouse.building = :building and ";
+ }
+ if (filterOnWarehouse) {
+ hql += " l.warehouse = :warehouse and ";
+ }
+ hql += " l.code != :codeForReceptionLocations and "
+ + " l.code != :codeForWarehouseWithoutLocations and "
+ + " l.fullLocation = false "
+ + " order by l.warehouse.building.code, l.warehouse.code, l.code";
+ TypedQuery <Location> query = createQuery(hql);
+ if (filterOnBuilding) {
+ query.setParameter("building", building);
+ }
+ if (filterOnWarehouse) {
+ query.setParameter("warehouse", warehouse);
+ }
+ query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations());
+ query.setParameter("codeForWarehouseWithoutLocations", Locations.codeForWarehouseWithoutLocations());
+ return findAll(query);
+ }
+
+ @Override
+ public List<Location> findAllWithoutReception(Building building) {
+ return findAllWithoutReception(building, null);
+ }
+
+ @Override
+ public List<Location> findAllWithoutReception(Warehouse warehouse) {
+ return findAllWithoutReception(null, warehouse);
+ }
+
+ @Override
+ public Location findByBarCode(String barCode, Building building) {
+ TypedQuery<Location> query = createQuery("from Location l " +
+ "where CONCAT(l.warehouse.code, l.code) = :barCode " +
+ "and l.warehouse.building = :building");
+ query.setParameter("barCode", barCode);
+ query.setParameter("building", building);
+ return findUniqueOrNull(query);
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -27,10 +27,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface MagalieUserDao extends Dao<MagalieUser> {
+/** @author bleny */
+public interface MagalieUserDao {
MagalieUser findByLogin(String login);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,52 @@
+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 javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class MagalieUserJpaDao extends AbstractMagalieUserJpaDao {
+
+ public MagalieUserJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public MagalieUser findByLogin(String login) {
+ TypedQuery<MagalieUser> query = createQuery("from MagalieUser mu where mu.login = :login");
+ query.setParameter("login", login);
+ return findUnique(query);
+ }
+
+ @Override
+ public List<MagalieUser> findAll() {
+ Query query = entityManager.createQuery("from MagalieUser mu order by mu.login");
+ List<MagalieUser> resultList = query.getResultList();
+ return resultList;
+ }
+}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -2,11 +2,8 @@
import com.franciaflex.magalie.persistence.entity.PreparedArticleReception;
-/**
- * @author bleny
- */
-public interface PreparedArticleReceptionDao extends Dao<PreparedArticleReception> {
+/** @author bleny */
+public interface PreparedArticleReceptionDao {
PreparedArticleReception findByBarcode(String barcode);
-
}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,20 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.PreparedArticleReception;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+public class PreparedArticleReceptionJpaDao extends AbstractPreparedArticleReceptionJpaDao {
+
+ public PreparedArticleReceptionJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public PreparedArticleReception findByBarcode(String barcode) {
+ TypedQuery<PreparedArticleReception> query = createQuery("from PreparedArticleReception par where par.barcode = :barcode");
+ query.setParameter("barcode", barcode);
+ return findUniqueOrNull(query);
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -30,10 +30,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface RequestedArticleDao extends Dao<RequestedArticle> {
+/** @author bleny */
+public interface RequestedArticleDao {
List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,65 @@
+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.DeliveredRequestedListStatus;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.RequestedArticle;
+import com.franciaflex.magalie.persistence.entity.RequestedList;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class RequestedArticleJpaDao extends AbstractRequestedArticleJpaDao {
+
+ public RequestedArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType) {
+ TypedQuery<RequestedArticle> query = createQuery(
+ "from RequestedArticle ra where "
+ + " ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra) "
+ + " and ra.requestedList.building = :building "
+ + " and ra.requestedList.listType = :listType "
+ + " and ra.requestedList not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :complete or drl.status = :affected and drl.affectedTo != :affectedTo)");
+ query.setParameter("building", building);
+ query.setParameter("listType", listType);
+ query.setParameter("complete", DeliveredRequestedListStatus.COMPLETE);
+ query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED);
+ query.setParameter("affectedTo", affectedTo);
+ return findAll(query);
+ }
+
+ @Override
+ public List<RequestedArticle> findAll(RequestedList requestedList) {
+ TypedQuery<RequestedArticle> query = createQuery("from RequestedArticle ra where ra.requestedList = :requestedList");
+ query.setParameter("requestedList", requestedList);
+ return findAll(query);
+ }
+
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,14 +23,10 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.entity.RequestedList;
-
import java.util.List;
-/**
- * @author bleny
- */
-public interface RequestedListDao extends Dao<RequestedList> {
+/** @author bleny */
+public interface RequestedListDao {
List<String> findAllDistinctListTypes();
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,41 @@
+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 javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class RequestedListJpaDao extends AbstractRequestedListJpaDao {
+
+ public RequestedListJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<String> findAllDistinctListTypes() {
+ TypedQuery<String> query = entityManager.createQuery("select distinct rl.listType from RequestedList rl", String.class);
+ return query.getResultList();
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -30,10 +30,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface StorageMovementDao extends Dao<StorageMovement> {
+/** @author bleny */
+public interface StorageMovementDao {
List<StorageMovement> findAllByArticle(Article article);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,74 @@
+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.Locations;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class StorageMovementJpaDao extends AbstractStorageMovementJpaDao {
+
+ public StorageMovementJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<StorageMovement> findAllByArticle(Article article) {
+ Query query = entityManager.createQuery("from StorageMovement sm where sm.article = :article");
+ query.setParameter("article", article);
+ return query.getResultList();
+ }
+
+ @Override
+ public List<StorageMovement> findAllInReception(Building building) {
+ Query query = entityManager.createQuery(
+ " from StorageMovement sm" +
+ " where sm.originLocation.code = :codeForReceptionLocations and sm.originLocation.warehouse.building = :building" +
+ " or " +
+ " sm.destinationLocation.code = :codeForReceptionLocations and sm.destinationLocation.warehouse.building = :building");
+ query.setParameter("building", building);
+ query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations());
+ return query.getResultList();
+ }
+
+ @Override
+ public List<StorageMovement> findAllImpactingStoredArticle(StoredArticle storedArticle) {
+ Query query = entityManager.createQuery("from StorageMovement sm where sm.article = :article and (sm.originLocation = :location or sm.destinationLocation = :location)");
+ query.setParameter("location", storedArticle.getLocation());
+ query.setParameter("article", storedArticle.getArticle());
+ return query.getResultList();
+ }
+
+ @Override
+ public List<StorageMovement> findAll() {
+ Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate");
+ return query.getResultList();
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -29,7 +29,7 @@
import java.util.List;
-public interface StorageMovementOrderDao extends Dao<StorageMovementOrder> {
+public interface StorageMovementOrderDao {
public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,53 @@
+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.StorageMovementOrder;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class StorageMovementOrderJpaDao extends AbstractStorageMovementOrderJpaDao {
+
+ public StorageMovementOrderJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building) {
+ Query query = entityManager.createQuery(
+ " select distinct smo" +
+ " from StorageMovementOrder smo" +
+ " inner join smo.storageMovements as sm" +
+ " where sm.magalieUser = :magalieUser" +
+ " and sm.originLocation.warehouse.building = :building" +
+ " and sm.confirmDate is null" );
+ query.setParameter("magalieUser", magalieUser);
+ query.setParameter("building", building);
+ return query.getResultList();
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -30,7 +30,7 @@
import java.util.List;
-public interface StoredArticleDao extends Dao<StoredArticle> {
+public interface StoredArticleDao {
List<StoredArticle> findAllForArticleInBuilding(Article article, Building building);
@@ -40,6 +40,6 @@
StoredArticle findDetachedById(String storedArticleId);
+ List<StoredArticle> findAllByLocation(Location location);
- List<StoredArticle> findAllByLocation(Location location);
}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,96 @@
+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.Locations;
+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 javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class StoredArticleJpaDao extends AbstractStoredArticleJpaDao {
+
+ public StoredArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) {
+ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.withdrawAllowed = true and sa.location.warehouse.building = :building");
+ query.setParameter("article", article);
+ query.setParameter("building", building);
+ List<StoredArticle> resultList = findAll(query);
+ for (StoredArticle storedArticle : resultList) {
+ entityManager.detach(storedArticle);
+ }
+ return resultList;
+ }
+
+ @Override
+ 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());
+ List<StoredArticle> resultList = findAll(query);
+ for (StoredArticle storedArticle : resultList) {
+ entityManager.detach(storedArticle);
+ }
+ return resultList;
+ }
+
+ @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());
+ List<StoredArticle> resultList = findAll(query);
+ for (StoredArticle storedArticle : resultList) {
+ entityManager.detach(storedArticle);
+ }
+ return resultList;
+ }
+
+ @Override
+ public List<StoredArticle> findAllByLocation(Location location) {
+ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location = :location");
+ query.setParameter("location", location);
+ List<StoredArticle> resultList = findAll(query);
+ for (StoredArticle storedArticle : resultList) {
+ entityManager.detach(storedArticle);
+ }
+ return resultList;
+ }
+
+ @Override
+ public StoredArticle findDetachedById(String storedArticleId) {
+ StoredArticle storedArticle = findById(storedArticleId);
+ entityManager.detach(storedArticle);
+ return storedArticle;
+ }
+}
Modified: 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 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -28,10 +28,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface SupplierDao extends Dao<Supplier> {
+/** @author bleny */
+public interface SupplierDao {
List<Supplier> findAllWithReceivedArticles(Building building);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,48 @@
+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.Locations;
+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 AbstractSupplierJpaDao {
+
+ public SupplierJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @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-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -27,10 +27,8 @@
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.UnavailableArticle;
-/**
- * @author bleny
- */
-public interface UnavailableArticleDao extends Dao<UnavailableArticle> {
+/** @author bleny */
+public interface UnavailableArticleDao {
UnavailableArticle findByArticle(Building building, Article article);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,46 @@
+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.UnavailableArticle;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+public class UnavailableArticleJpaDao extends AbstractUnavailableArticleJpaDao {
+
+ public UnavailableArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public UnavailableArticle findByArticle(Building building, Article article) {
+ TypedQuery<UnavailableArticle> query = createQuery("from UnavailableArticle ua where ua.article = :article and ua.building = :building");
+ query.setParameter("article", article);
+ query.setParameter("building", building);
+ return findUniqueOrNull(query);
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -28,10 +28,8 @@
import java.util.List;
-/**
- * @author bleny
- */
-public interface WarehouseDao extends Dao<Warehouse> {
+/** @author bleny */
+public interface WarehouseDao {
List<Warehouse> findAllWithoutLocations(Building building);
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseJpaDao.java (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseJpaDao.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,47 @@
+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.Locations;
+import com.franciaflex.magalie.persistence.entity.Building;
+import com.franciaflex.magalie.persistence.entity.Warehouse;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import java.util.List;
+
+public class WarehouseJpaDao extends AbstractWarehouseJpaDao {
+
+ public WarehouseJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ public List<Warehouse> findAllWithoutLocations(Building building) {
+ TypedQuery<Warehouse> query = entityManager.createQuery("from Warehouse w where w.building = :building and w in (select l.warehouse from Location l where l.code = :code)", getEntityClass());
+ query.setParameter("building", building);
+ query.setParameter("code", Locations.codeForWarehouseWithoutLocations());
+ return query.getResultList();
+ }
+}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,72 +24,13 @@
*/
import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
import java.util.Set;
@Entity
-public class Article extends AbstractEntity {
+public class Article extends AbstractJpaArticle {
- @Id
- protected String id;
+ private static final long serialVersionUID = 1L;
- @ManyToMany
- protected Set<Location> fixedLocations;
-
- @ManyToOne
- protected Supplier supplier;
-
- protected String description;
-
- protected String code;
-
- protected String unit;
-
- protected boolean fixedLocationsFirst;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Set<Location> getFixedLocations() {
- return fixedLocations;
- }
-
- public void setFixedLocations(Set<Location> fixedLocations) {
- this.fixedLocations = fixedLocations;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
public boolean isFixedLocation(Location location) {
boolean isFixedLocation = false;
Set<Location> fixedLocations = getFixedLocations();
@@ -98,20 +39,4 @@
}
return isFixedLocation;
}
-
- public boolean isFixedLocationsFirst() {
- return fixedLocationsFirst;
- }
-
- public void setFixedLocationsFirst(boolean fixedLocationsFirst) {
- this.fixedLocationsFirst = fixedLocationsFirst;
- }
-
- public Supplier getSupplier() {
- return supplier;
- }
-
- public void setSupplier(Supplier supplier) {
- this.supplier = supplier;
- }
-}
+} //Article
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,53 +0,0 @@
-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;
-
-@Entity
-public class Building extends AbstractEntity {
-
- @Id
- protected String id;
-
- protected String code;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,45 +24,14 @@
*/
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
@Entity
-public class DeliveredRequestedArticle extends AbstractEntity {
+public class DeliveredRequestedArticle extends AbstractJpaDeliveredRequestedArticle {
- @Id
- @GeneratedValue
- protected String id;
+ private static final long serialVersionUID = 1L;
- @OneToOne
- protected StorageMovementOrder storageMovementOrder;
-
- @OneToOne
- protected RequestedArticle requestedArticle;
-
- @Override
- public String getId() {
- return id;
- }
-
- public StorageMovementOrder getStorageMovementOrder() {
- return storageMovementOrder;
- }
-
- public void setStorageMovementOrder(StorageMovementOrder storageMovementOrder) {
- this.storageMovementOrder = storageMovementOrder;
- }
-
- public RequestedArticle getRequestedArticle() {
- return requestedArticle;
- }
-
- public void setRequestedArticle(RequestedArticle requestedArticle) {
- this.requestedArticle = requestedArticle;
- }
-
public boolean isConfirmed() {
return getStorageMovementOrder().isConfirmed();
}
-}
+
+} //DeliveredRequestedArticle
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,82 +0,0 @@
-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;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-
-@Entity
-public class DeliveredRequestedList extends AbstractEntity {
-
- @Id
- @GeneratedValue
- protected String id;
-
- @OneToOne
- protected RequestedList requestedList;
-
- @OneToOne
- protected MagalieUser affectedTo;
-
- @Enumerated(value = EnumType.STRING)
- protected DeliveredRequestedListStatus status;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public RequestedList getRequestedList() {
- return requestedList;
- }
-
- public void setRequestedList(RequestedList requestedList) {
- this.requestedList = requestedList;
- }
-
- public MagalieUser getAffectedTo() {
- return affectedTo;
- }
-
- public void setAffectedTo(MagalieUser affectedTo) {
- this.affectedTo = affectedTo;
- }
-
- public DeliveredRequestedListStatus getStatus() {
- return status;
- }
-
- public void setStatus(DeliveredRequestedListStatus status) {
- this.status = status;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,32 +0,0 @@
-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,
- AFFECTED,
- COMPLETE
-
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,78 +0,0 @@
-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;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Kanban extends AbstractEntity {
-
- @Id
- @GeneratedValue
- protected String id;
-
- @ManyToOne
- protected Article article;
-
- @ManyToOne
- protected Warehouse warehouse;
-
- protected double requiredQuantity;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-
- public Warehouse getWarehouse() {
- return warehouse;
- }
-
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
- public double getRequiredQuantity() {
- return requiredQuantity;
- }
-
- public void setRequiredQuantity(double requiredQuantity) {
- this.requiredQuantity = requiredQuantity;
- }
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,78 +24,14 @@
*/
import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
@Entity
-public class Location extends AbstractEntity {
+public class Location extends AbstractJpaLocation {
- @Id
- protected String id;
+ private static final long serialVersionUID = 1L;
- @ManyToOne
- protected Warehouse warehouse;
-
- protected String code;
-
- protected int requiredAccreditationLevel;
-
- protected boolean fullLocation;
-
- protected boolean requiredCraneMan;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Warehouse getWarehouse() {
- return warehouse;
- }
-
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public int getRequiredAccreditationLevel() {
- return requiredAccreditationLevel;
- }
-
- public void setRequiredAccreditationLevel(int requiredAccreditationLevel) {
- this.requiredAccreditationLevel = requiredAccreditationLevel;
- }
-
public String getBarcode() {
String barcode = getWarehouse().getCode() + getCode();
return barcode;
}
-
- public boolean isFullLocation() {
- return fullLocation;
- }
-
- public void setFullLocation(boolean fullLocation) {
- this.fullLocation = fullLocation;
- }
-
- public boolean isRequiredCraneMan() {
- return requiredCraneMan;
-}
-
- public void setRequiredCraneMan(boolean requiredCraneMan) {
- this.requiredCraneMan = requiredCraneMan;
- }
-
-}
+} //Location
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,91 +0,0 @@
-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;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import java.util.Date;
-
-@Entity
-public class LocationError extends AbstractEntity {
-
- @Id
- @GeneratedValue
- protected String id;
-
- @OneToOne
- protected Location location;
-
- @OneToOne
- protected Article article;
-
- @ManyToOne
- protected MagalieUser magalieUser;
-
- protected Date reportDate;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Location getLocation() {
- return location;
- }
-
- public void setLocation(Location location) {
- this.location = location;
- }
-
- public MagalieUser getMagalieUser() {
- return magalieUser;
- }
-
- public void setMagalieUser(MagalieUser magalieUser) {
- this.magalieUser = magalieUser;
- }
-
- public Date getReportDate() {
- return reportDate;
- }
-
- public void setReportDate(Date reportDate) {
- this.reportDate = reportDate;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,85 +0,0 @@
-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;
-
-@Entity
-public class MagalieUser extends AbstractEntity {
-
- @Id
- protected String id;
-
- protected String login;
-
- protected String name;
-
- protected int accreditationLevel;
-
- protected boolean craneMan;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getLogin() {
- return login;
- }
-
- public void setLogin(String login) {
- this.login = login;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getAccreditationLevel() {
- return accreditationLevel;
- }
-
- public void setAccreditationLevel(int accreditationLevel) {
- this.accreditationLevel = accreditationLevel;
- }
-
-
- public boolean isCraneMan() {
- return craneMan;
- }
-
- public void setCraneMan(boolean craneMan) {
- this.craneMan = craneMan;
- }
-
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,52 +0,0 @@
-package com.franciaflex.magalie.persistence.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class PreparedArticleReception extends AbstractEntity {
-
- @Id
- protected String id;
-
- protected String barcode;
-
- @ManyToOne
- protected StoredArticle storedArticle;
-
- protected double quantity;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public StoredArticle getStoredArticle() {
- return storedArticle;
- }
-
- public void setStoredArticle(StoredArticle storedArticle) {
- this.storedArticle = storedArticle;
- }
-
- public double getQuantity() {
- return quantity;
- }
-
- public void setQuantity(double quantity) {
- this.quantity = quantity;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,88 +0,0 @@
-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;
-import javax.persistence.OneToOne;
-
-@Entity
-public class RequestedArticle extends AbstractEntity {
-
- @Id
- protected String id;
-
- @ManyToOne
- protected Article article;
-
- @ManyToOne
- protected RequestedList requestedList;
-
- @OneToOne
- protected Location destinationLocation;
-
- protected double quantity;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-
- public double getQuantity() {
- return quantity;
- }
-
- public void setQuantity(double quantity) {
- this.quantity = quantity;
- }
-
- public RequestedList getRequestedList() {
- return requestedList;
- }
-
- public void setRequestedList(RequestedList requestedList) {
- this.requestedList = requestedList;
- }
-
- public Location getDestinationLocation() {
- return destinationLocation;
- }
-
- public void setDestinationLocation(Location destinationLocation) {
- this.destinationLocation = destinationLocation;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,96 +0,0 @@
-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;
-import java.util.Date;
-
-@Entity
-public class RequestedList extends AbstractEntity {
-
- @Id
- protected String id;
-
- @ManyToOne
- protected Building building;
-
- protected String code;
-
- protected Date requestDate;
-
- protected boolean urgent;
-
- protected String listType;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Date getRequestDate() {
- return requestDate;
- }
-
- public void setRequestDate(Date requestDate) {
- this.requestDate = requestDate;
- }
-
- public boolean isUrgent() {
- return urgent;
- }
-
- public void setUrgent(boolean urgent) {
- this.urgent = urgent;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Building getBuilding() {
- return building;
- }
-
- public void setBuilding(Building building) {
- this.building = building;
- }
-
- public String getListType() {
- return listType;
- }
-
- public void setListType(String listType) {
- this.listType = listType;
- }
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -26,117 +26,18 @@
import com.google.common.base.Objects;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.util.Date;
@Entity
-public class StorageMovement extends AbstractEntity {
+public class StorageMovement extends AbstractJpaStorageMovement {
- @Id
- @GeneratedValue
- protected String id;
+ private static final long serialVersionUID = 1L;
- @ManyToOne
- protected Location originLocation;
-
- @ManyToOne
- protected Location destinationLocation;
-
- @ManyToOne
- protected Article article;
-
- @ManyToOne
- protected MagalieUser magalieUser;
-
- protected double expectedQuantity;
-
- protected Date orderDate;
-
- protected Double actualQuantity;
-
- protected Date confirmDate;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Location getOriginLocation() {
- return originLocation;
- }
-
- public void setOriginLocation(Location originLocation) {
- this.originLocation = originLocation;
- }
-
- public Location getDestinationLocation() {
- return destinationLocation;
- }
-
- public void setDestinationLocation(Location destinationLocation) {
- this.destinationLocation = destinationLocation;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-
- public MagalieUser getMagalieUser() {
- return magalieUser;
- }
-
- public void setMagalieUser(MagalieUser magalieUser) {
- this.magalieUser = magalieUser;
- }
-
- public double getExpectedQuantity() {
- return expectedQuantity;
- }
-
- public void setExpectedQuantity(double expectedQuantity) {
- this.expectedQuantity = expectedQuantity;
- }
-
- public Date getOrderDate() {
- return orderDate;
- }
-
- public void setOrderDate(Date orderDate) {
- this.orderDate = orderDate;
- }
-
- public Date getConfirmDate() {
- return confirmDate;
- }
-
- public void setConfirmDate(Date confirmDate) {
- this.confirmDate = confirmDate;
- }
-
public boolean isConfirmed() {
return confirmDate != null;
}
- public Double getActualQuantity() {
- return actualQuantity;
- }
-
- public void setActualQuantity(Double actualQuantity) {
- this.actualQuantity = actualQuantity;
- }
-
public double getQuantity() {
double quantity = Objects.firstNonNull(actualQuantity, expectedQuantity);
return quantity;
}
-}
+} //StorageMovement
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,51 +23,22 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.Entities;
import com.franciaflex.magalie.persistence.StorageMovements;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.nuiton.jpa.api.JpaEntities;
-import javax.persistence.CascadeType;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import java.util.List;
import java.util.Set;
@Entity
-public class StorageMovementOrder extends AbstractEntity {
+public class StorageMovementOrder extends AbstractJpaStorageMovementOrder {
- @Id
- @GeneratedValue
- protected String id;
+ private static final long serialVersionUID = 1L;
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- @OneToMany(cascade = CascadeType.ALL)
- @OrderColumn
- protected List<StorageMovement> storageMovements;
-
- public List<StorageMovement> getStorageMovements() {
- return storageMovements;
- }
-
- public void setStorageMovements(List<StorageMovement> storageMovements) {
- this.storageMovements = storageMovements;
- }
-
protected Set<Article> getArticles() {
Set<Article> articles =
Sets.newHashSet(
@@ -86,17 +57,17 @@
public double getQuantity() {
double quantity = 0.;
- for (StorageMovement storageMovement : storageMovements) {
+ for (StorageMovement storageMovement : this.storageMovements) {
quantity += storageMovement.getExpectedQuantity();
}
return quantity;
}
public void addStorageMovement(StorageMovement storageMovement) {
- if (storageMovements == null) {
- storageMovements = Lists.newLinkedList();
+ if (this.storageMovements == null) {
+ this.storageMovements= Lists.newLinkedList();
}
- storageMovements.add(storageMovement);
+ super.addStorageMovements(storageMovement);
}
public Set<Location> getLocations() {
@@ -115,7 +86,7 @@
Iterables.find(
getStorageMovements(),
Predicates.compose(
- Entities.entityHasId(locationId),
+ JpaEntities.entityHasId(locationId),
StorageMovements.getOriginFunction()
),
null
@@ -150,5 +121,4 @@
StorageMovements.storageMovementIsConfirmed());
return isConfirmed;
}
-
-}
+} //StorageMovementOrder
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,76 +0,0 @@
-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;
-
-@Entity
-public class StoredArticle extends AbstractEntity {
-
- @Id
- protected String id;
-
- @ManyToOne
- protected Article article;
-
- @ManyToOne
- protected Location location;
-
- protected double quantity;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Location getLocation() {
- return location;
- }
-
- public void setLocation(Location location) {
- this.location = location;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-
- public double getQuantity() {
- return quantity;
- }
-
- public void setQuantity(double quantity) {
- this.quantity = quantity;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,53 +0,0 @@
-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;
-
-@Entity
-public class Supplier extends AbstractEntity {
-
- @Id
- protected String id;
-
- protected String name;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,79 +0,0 @@
-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;
-import javax.persistence.OneToOne;
-import java.util.Date;
-
-@Entity
-public class UnavailableArticle extends AbstractEntity {
-
- @Id
- @GeneratedValue
- protected String id;
-
- @OneToOne
- protected Article article;
-
- @OneToOne
- protected Building building;
-
- protected Date reportDate;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Article getArticle() {
- return article;
- }
-
- public void setArticle(Article article) {
- this.article = article;
- }
-
- public Building getBuilding() {
- return building;
- }
-
- public void setBuilding(Building building) {
- this.building = building;
- }
-
- public void setReportDate(Date reportDate) {
- this.reportDate = reportDate;
- }
-
- public Date getReportDate() {
- return reportDate;
- }
-}
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,75 +0,0 @@
-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;
-
-@Entity
-public class Warehouse extends AbstractEntity {
-
- @Id
- protected String id;
-
- protected String code;
-
- @ManyToOne
- protected Building building;
-
- protected boolean withdrawAllowed;
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Building getBuilding() {
- return building;
- }
-
- public void setBuilding(Building building) {
- this.building = building;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public boolean isWithdrawAllowed() {
- return withdrawAllowed;
- }
-
- public void setWithdrawAllowed(boolean withdrawAllowed) {
- this.withdrawAllowed = withdrawAllowed;
- }
-}
Copied: trunk/magalie-persistence/src/main/xmi/magalie.properties (from rev 224, branches/magalie-eugene/magalie-persistence/src/main/xmi/magalie.properties)
===================================================================
--- trunk/magalie-persistence/src/main/xmi/magalie.properties (rev 0)
+++ trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-05-31 10:42:59 UTC (rev 225)
@@ -0,0 +1,12 @@
+com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique
+
+com.franciaflex.magalie.persistence.entity.Article.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.Building.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.Location.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.MagalieUser.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.PreparedArticleReception.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.RequestedArticle.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.RequestedList.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.StoredArticle.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.Supplier.class.stereotype=notGeneratedValue
+com.franciaflex.magalie.persistence.entity.Warehouse.class.stereotype=notGeneratedValue
Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo
===================================================================
(Binary files differ)
Modified: trunk/magalie-services/pom.xml
===================================================================
--- trunk/magalie-services/pom.xml 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
@@ -9,7 +9,6 @@
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>com.franciaflex</groupId>
<artifactId>magalie-services</artifactId>
<name>MagaLiE :: Services</name>
<description>Services pour MagaLiE</description>
@@ -21,6 +20,11 @@
<dependencies>
<dependency>
+ <groupId>org.nuiton.jpa</groupId>
+ <artifactId>nuiton-jpa-junit</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -26,11 +26,6 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.StorageMovements;
import com.franciaflex.magalie.persistence.StoredArticles;
-import com.franciaflex.magalie.persistence.dao.LocationDao;
-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.UnavailableArticleDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
@@ -39,6 +34,11 @@
import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.persistence.entity.StoredArticle;
import com.franciaflex.magalie.persistence.entity.UnavailableArticle;
+import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderJpaDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.UnavailableArticleJpaDao;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
import com.franciaflex.magalie.services.StorageMovementConfirmation;
@@ -113,7 +113,7 @@
StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder();
- StorageMovementOrderDao dao = persistenceContext.getStorageMovementOrderDao();
+ StorageMovementOrderJpaDao dao = persistenceContext.getStorageMovementOrderDao();
dao.persist(storageMovementOrder);
@@ -127,9 +127,7 @@
}
- /**
- * Add or remove a line in table {@link UnavailableArticle}
- */
+ /** Add or remove a line in table {@link UnavailableArticle} */
protected void updateArticleAvailability(BookArticleResult bookArticleResult) {
BookArticleRequest bookArticleRequest = bookArticleResult.getBookArticleRequest();
@@ -140,11 +138,11 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- UnavailableArticleDao dao = persistenceContext.getUnavailableArticleDao();
+ UnavailableArticleJpaDao dao = persistenceContext.getUnavailableArticleDao();
UnavailableArticle unavailableArticle = dao.findByArticle(building, article);
- boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable();
+ boolean articleIsAvailable = !bookArticleResult.isArticleUnavailable();
if (articleIsAvailable) {
@@ -248,8 +246,8 @@
if (bookArticleRequest.isBestEffortPolicy()) {
log.debug("best effort policy, requested quantity was "
- + requestedQuantity + " but only " + quantity +
- " available");
+ + requestedQuantity + " but only " + quantity +
+ " available");
} else {
@@ -291,7 +289,7 @@
public StorageMovementTask getStorageMovementTask(String storageMovementOrderId) {
- StorageMovementOrderDao dao = serviceContext.getPersistenceContext().getStorageMovementOrderDao();
+ StorageMovementOrderJpaDao dao = serviceContext.getPersistenceContext().getStorageMovementOrderDao();
StorageMovementOrder storageMovementOrder = dao.findById(storageMovementOrderId);
@@ -314,7 +312,7 @@
Location location = storedArticle.getLocation();
- if ( ! locationsInOrder.contains(location)) {
+ if (!locationsInOrder.contains(location)) {
StorageMovement newStorageMovement = new StorageMovement();
@@ -335,9 +333,7 @@
}
- /**
- * Get a snapshot of the actual current state of the stock.
- */
+ /** Get a snapshot of the actual current state of the stock. */
protected Iterable<StoredArticle> getStoredArticles(Building building, Article article) {
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
@@ -422,10 +418,10 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- StorageMovementOrderDao storageMovementOrderDao =
+ StorageMovementOrderJpaDao storageMovementOrderDao =
persistenceContext.getStorageMovementOrderDao();
- LocationDao locationDao = persistenceContext.getLocationDao();
+ LocationJpaDao locationDao = persistenceContext.getLocationDao();
StorageMovementOrder storageMovementOrder =
storageMovementOrderDao.findById(
@@ -497,7 +493,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- StorageMovementOrderDao storageMovementOrderDao =
+ StorageMovementOrderJpaDao storageMovementOrderDao =
persistenceContext.getStorageMovementOrderDao();
StorageMovementOrder storageMovementOrder = storageMovementOrderDao.findById(storageMovementOrderId);
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,7 +23,7 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.dao.BuildingDao;
+import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
@@ -41,7 +41,7 @@
public List<Building> getAllBuildings() {
- BuildingDao dao = serviceContext.getPersistenceContext().getBuildingDao();
+ BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao();
return dao.findAll();
@@ -49,7 +49,7 @@
public Building getBuilding(String buildingId) {
- BuildingDao dao = serviceContext.getPersistenceContext().getBuildingDao();
+ BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao();
return dao.findById(buildingId);
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,17 +24,17 @@
*/
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
-import com.franciaflex.magalie.persistence.dao.ArticleDao;
-import com.franciaflex.magalie.persistence.dao.BuildingDao;
-import com.franciaflex.magalie.persistence.dao.KanbanDao;
-import com.franciaflex.magalie.persistence.dao.LocationDao;
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
-import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao;
-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.dao.ArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.BuildingJpaDao;
+import com.franciaflex.magalie.persistence.dao.KanbanJpaDao;
+import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserJpaDao;
+import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionJpaDao;
+import com.franciaflex.magalie.persistence.dao.RequestedArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.RequestedListJpaDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.SupplierJpaDao;
+import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Kanban;
@@ -108,7 +108,7 @@
}
- MagalieUserDao magalieUserDao = persistenceContext.getMagalieUserDao();
+ MagalieUserJpaDao magalieUserDao = persistenceContext.getMagalieUserDao();
Collection<MagalieUser> users = fixtures.fixture("users");
@@ -118,7 +118,7 @@
}
- BuildingDao buildingDao = persistenceContext.getBuildingDao();
+ BuildingJpaDao buildingDao = persistenceContext.getBuildingDao();
Collection<Building> buildings = fixtures.fixture("buildings");
@@ -128,7 +128,7 @@
}
- WarehouseDao warehouseDao = persistenceContext.getWarehouseDao();
+ WarehouseJpaDao warehouseDao = persistenceContext.getWarehouseDao();
Collection<Warehouse> warehouses = fixtures.fixture("warehouses");
@@ -140,7 +140,7 @@
persistenceContext.commit();
- LocationDao locationDao = persistenceContext.getLocationDao();
+ LocationJpaDao locationDao = persistenceContext.getLocationDao();
Collection<Location> locations = fixtures.fixture("locations");
@@ -152,7 +152,7 @@
persistenceContext.commit();
- SupplierDao supplierDao = persistenceContext.getSupplierDao();
+ SupplierJpaDao supplierDao = persistenceContext.getSupplierDao();
Collection<Supplier> suppliers = fixtures.fixture("suppliers");
@@ -164,7 +164,7 @@
persistenceContext.commit();
- ArticleDao articleDao = persistenceContext.getArticleDao();
+ ArticleJpaDao articleDao = persistenceContext.getArticleDao();
Collection<Article> articles = fixtures.fixture("articles");
@@ -174,7 +174,7 @@
}
- KanbanDao kanbanDao = persistenceContext.getKanbanDao();
+ KanbanJpaDao kanbanDao = persistenceContext.getKanbanDao();
Collection<Kanban> kanbans = fixtures.fixture("kanbans");
@@ -186,7 +186,7 @@
persistenceContext.commit();
- StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao();
+ StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao();
Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles");
@@ -198,7 +198,7 @@
persistenceContext.commit();
- RequestedListDao requestedListDao = persistenceContext.getRequestedListDao();
+ RequestedListJpaDao requestedListDao = persistenceContext.getRequestedListDao();
Collection<RequestedList> requestedLists = fixtures.fixture("requestedLists");
@@ -210,7 +210,7 @@
persistenceContext.commit();
- RequestedArticleDao requestedArticleDao = persistenceContext.getRequestedArticleDao();
+ RequestedArticleJpaDao requestedArticleDao = persistenceContext.getRequestedArticleDao();
Collection<RequestedArticle> requestedArticles = fixtures.fixture("requestedArticles");
@@ -222,7 +222,7 @@
persistenceContext.commit();
- PreparedArticleReceptionDao preparedArticleReceptionDao = persistenceContext.getPreparedArticleReceptionDao();
+ PreparedArticleReceptionJpaDao preparedArticleReceptionDao = persistenceContext.getPreparedArticleReceptionDao();
Collection<PreparedArticleReception> preparedArticleReceptions = fixtures.fixture("preparedArticleReceptions");
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -26,6 +26,7 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.dao.KanbanDao;
import com.franciaflex.magalie.persistence.dao.WarehouseDao;
+import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Kanban;
@@ -55,7 +56,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- WarehouseDao warehouseDao = persistenceContext.getWarehouseDao();
+ WarehouseJpaDao warehouseDao = persistenceContext.getWarehouseDao();
Warehouse warehouse = warehouseDao.findById(storeId);
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,7 +23,7 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.dao.LocationErrorDao;
+import com.franciaflex.magalie.persistence.dao.LocationErrorJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.LocationError;
@@ -57,7 +57,7 @@
public void reportError(Location location, Article article, MagalieUser magalieUser, Date reportDate) {
- LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
+ LocationErrorJpaDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
LocationError existingLocationError = locationErrorDao.findByLocation(location);
@@ -88,7 +88,7 @@
public List<Location> getAllLocationsInError(Article article) {
- LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
+ LocationErrorJpaDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
List<Location> allLocationsInError = locationErrorDao.getAllLocationsInError(article);
@@ -98,7 +98,7 @@
public List<LocationError> getAllLocationErrors() {
- LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
+ LocationErrorJpaDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao();
List<LocationError> allLocationErrors = locationErrorDao.findAll();
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -23,7 +23,7 @@
* #L%
*/
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserJpaDao;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
@@ -42,7 +42,7 @@
public MagalieUser getMagalieUser(String login) {
- MagalieUserDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
+ MagalieUserJpaDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
MagalieUser magalieUser = dao.findByLogin(login);
@@ -54,7 +54,7 @@
public List<MagalieUser> getAllMagalieUsers() {
- MagalieUserDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
+ MagalieUserJpaDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
List<MagalieUser> allMagalieUsers = dao.findAll();
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -27,9 +27,12 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.StoredArticles;
import com.franciaflex.magalie.persistence.dao.LocationDao;
-import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao;
+import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
+import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionJpaDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
@@ -120,7 +123,7 @@
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
- StoredArticleDao storedArticleDao =
+ StoredArticleJpaDao storedArticleDao =
persistenceContext.getStoredArticleDao();
StoredArticle storedArticle =
@@ -245,15 +248,15 @@
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
- StoredArticleDao storedArticleDao =
+ StoredArticleJpaDao storedArticleDao =
persistenceContext.getStoredArticleDao();
StoredArticle storedArticle =
storedArticleDao.findById(storedArticleId);
- LocationDao locationDao = persistenceContext.getLocationDao();
+ LocationJpaDao locationDao = persistenceContext.getLocationDao();
- StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao();
+ StorageMovementJpaDao storageMovementDao = persistenceContext.getStorageMovementDao();
Date now = serviceContext.getNow();
@@ -290,7 +293,7 @@
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
- PreparedArticleReceptionDao dao =
+ PreparedArticleReceptionJpaDao dao =
persistenceContext.getPreparedArticleReceptionDao();
PreparedArticleReception preparedArticleReception =
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,8 +24,8 @@
*/
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
-import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
-import com.franciaflex.magalie.persistence.dao.UnavailableArticleDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
+import com.franciaflex.magalie.persistence.dao.UnavailableArticleJpaDao;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList;
import com.franciaflex.magalie.persistence.entity.LocationError;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
@@ -62,7 +62,7 @@
magalieReport.setAllMagalieUsers(allMagalieUsers);
- StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao();
+ StorageMovementJpaDao storageMovementDao = persistenceContext.getStorageMovementDao();
List<StorageMovement> allStorageMovements = storageMovementDao.findAll();
@@ -80,7 +80,7 @@
magalieReport.setAllDeliveredRequestedLists(allDeliveredRequestedLists);
- UnavailableArticleDao unavailableArticleDao = persistenceContext.getUnavailableArticleDao();
+ UnavailableArticleJpaDao unavailableArticleDao = persistenceContext.getUnavailableArticleDao();
magalieReport.setAllUnavailableArticles(unavailableArticleDao.findAll());
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -26,11 +26,13 @@
import com.franciaflex.magalie.persistence.DeliveredRequestedArticles;
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.RequestedArticles;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
+import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleJpaDao;
import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao;
+import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListJpaDao;
import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.RequestedListDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.dao.RequestedArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.RequestedListJpaDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle;
@@ -112,7 +114,7 @@
boolean somethingIsAvailable = false;
- while ( ! success && requestedArticleIterator.hasNext()) {
+ while (!success && requestedArticleIterator.hasNext()) {
requestedArticle = requestedArticleIterator.next();
@@ -126,7 +128,7 @@
bookArticleResult = articleStorageService.bookArticle(bookArticleRequest);
- boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable();
+ boolean articleIsAvailable = !bookArticleResult.isArticleUnavailable();
if (articleIsAvailable) {
@@ -152,7 +154,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- DeliveredRequestedArticleDao dao = persistenceContext.getDeliveredRequestedArticleDao();
+ DeliveredRequestedArticleJpaDao dao = persistenceContext.getDeliveredRequestedArticleDao();
DeliveredRequestedArticle newDeliveredRequestedArticle = new DeliveredRequestedArticle();
@@ -167,7 +169,7 @@
findOrderToExecuteResult.setStorageMovementOrder(storageMovementOrder);
// deal with affectations
- DeliveredRequestedListDao deliveredRequestedListDao =
+ DeliveredRequestedListJpaDao deliveredRequestedListDao =
persistenceContext.getDeliveredRequestedListDao();
DeliveredRequestedList oldAffectation =
@@ -208,23 +210,23 @@
log.info("user is affected to " + oldAffectation.getRequestedList().getCode());
}
- boolean affectationChanged = ! oldAffectation.getRequestedList().equals(requestedList);
+ boolean affectationChanged = !oldAffectation.getRequestedList().equals(requestedList);
if (affectationChanged) {
if (log.isInfoEnabled()) {
log.info("user changed affectation from "
- + oldAffectation.getRequestedList().getCode()
- + " to " + requestedList.getCode());
+ + oldAffectation.getRequestedList().getCode()
+ + " to " + requestedList.getCode());
}
boolean isFinished = oldAffectation.getStatus().equals(DeliveredRequestedListStatus.COMPLETE);
- if ( ! isFinished) {
+ if (!isFinished) {
if (log.isInfoEnabled()) {
log.info("request list " + oldAffectation.getRequestedList()
- + " is not complete, putting it back to pending");
+ + " is not complete, putting it back to pending");
}
oldAffectation.setStatus(DeliveredRequestedListStatus.PENDING);
@@ -271,7 +273,7 @@
log.info("no order to execute found: everything is unavailable");
}
- Preconditions.checkState( ! driverLicenseRequired);
+ Preconditions.checkState(!driverLicenseRequired);
findOrderToExecuteResult.setEverythingUnavailable(true);
@@ -318,7 +320,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- DeliveredRequestedListDao dao = persistenceContext.getDeliveredRequestedListDao();
+ DeliveredRequestedListJpaDao dao = persistenceContext.getDeliveredRequestedListDao();
List<DeliveredRequestedList> all = dao.findAll();
@@ -339,10 +341,10 @@
RequestedList requestedList = deliveredRequestedList.getRequestedList();
- RequestedArticleDao requestedArticleDao =
+ RequestedArticleJpaDao requestedArticleDao =
persistenceContext.getRequestedArticleDao();
- DeliveredRequestedArticleDao deliveredRequestedArticleDao =
+ DeliveredRequestedArticleJpaDao deliveredRequestedArticleDao =
persistenceContext.getDeliveredRequestedArticleDao();
List<RequestedArticle> requestedArticles =
@@ -352,15 +354,15 @@
deliveredRequestedArticleDao.findAll(requestedList);
boolean allIsConfirmed = deliveredRequestedArticles.size() == requestedArticles.size()
- && Iterables.all(
- deliveredRequestedArticles,
- DeliveredRequestedArticles.isConfirmedPredicate());
+ && Iterables.all(
+ deliveredRequestedArticles,
+ DeliveredRequestedArticles.isConfirmedPredicate());
if (allIsConfirmed) {
if (log.isInfoEnabled()) {
log.info("all requested articles have confirmed order, marking list "
- + requestedList.getCode() + " as complete");
+ + requestedList.getCode() + " as complete");
}
deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE);
@@ -386,8 +388,8 @@
if (log.isInfoEnabled()) {
log.info("user " + magalieUser.getLogin() +
- " is no longer affected to list " +
- deliveredRequestedList.getRequestedList().getCode());
+ " is no longer affected to list " +
+ deliveredRequestedList.getRequestedList().getCode());
}
deliveredRequestedList.setAffectedTo(null);
@@ -404,7 +406,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- DeliveredRequestedListDao dao = persistenceContext.getDeliveredRequestedListDao();
+ DeliveredRequestedListJpaDao dao = persistenceContext.getDeliveredRequestedListDao();
DeliveredRequestedList deliveredRequestedList = dao.findByAffectedTo(magalieUser);
@@ -424,7 +426,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- RequestedListDao dao = persistenceContext.getRequestedListDao();
+ RequestedListJpaDao dao = persistenceContext.getRequestedListDao();
List<String> allDistinctListTypes = dao.findAllDistinctListTypes();
@@ -432,18 +434,16 @@
}
- /**
- * @return null if storage movement order is not about a requested-list (for example, kanban)
- */
+ /** @return null if storage movement order is not about a requested-list (for example, kanban) */
public DeliveredRequestedList getDeliveredRequestedList(String storageMovementOrderId) {
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
- DeliveredRequestedArticleDao deliveredRequestedArticleDao =
+ DeliveredRequestedArticleJpaDao deliveredRequestedArticleDao =
persistenceContext.getDeliveredRequestedArticleDao();
- StorageMovementOrderDao storageMovementOrderDao =
+ StorageMovementOrderJpaDao storageMovementOrderDao =
persistenceContext.getStorageMovementOrderDao();
StorageMovementOrder storageMovementOrder =
@@ -459,7 +459,7 @@
RequestedList requestedList =
deliveredRequestedArticle.getRequestedArticle().getRequestedList();
- DeliveredRequestedListDao deliveredRequestedListDao =
+ DeliveredRequestedListJpaDao deliveredRequestedListDao =
persistenceContext.getDeliveredRequestedListDao();
deliveredRequestedList =
@@ -476,7 +476,7 @@
MagaliePersistenceContext persistenceContext =
serviceContext.getPersistenceContext();
- DeliveredRequestedArticleDao deliveredRequestedArticleDao =
+ DeliveredRequestedArticleJpaDao deliveredRequestedArticleDao =
persistenceContext.getDeliveredRequestedArticleDao();
DeliveredRequestedArticle deliveredRequestedArticle =
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -4,8 +4,8 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.StoredArticles;
import com.franciaflex.magalie.persistence.dao.LocationDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
-import com.franciaflex.magalie.persistence.dao.WarehouseDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
+import com.franciaflex.magalie.persistence.dao.WarehouseJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
@@ -71,7 +71,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- WarehouseDao warehouseDao = persistenceContext.getWarehouseDao();
+ WarehouseJpaDao warehouseDao = persistenceContext.getWarehouseDao();
Date now = serviceContext.getNow();
@@ -113,7 +113,7 @@
// save storage movement
- StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao();
+ StorageMovementJpaDao storageMovementDao = persistenceContext.getStorageMovementDao();
storageMovementDao.persist(storageMovement);
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -3,8 +3,11 @@
import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
import com.franciaflex.magalie.persistence.dao.LocationDao;
+import com.franciaflex.magalie.persistence.dao.LocationJpaDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
@@ -47,7 +50,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- LocationDao locationDao = persistenceContext.getLocationDao();
+ LocationJpaDao locationDao = persistenceContext.getLocationDao();
Location location = locationDao.findById(id);
@@ -84,7 +87,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao();
+ StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao();
StoredArticle storedArticle = storedArticleDao.findById(storedArticleId);
@@ -95,7 +98,7 @@
MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();
- StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao();
+ StorageMovementJpaDao storageMovementDao = persistenceContext.getStorageMovementDao();
Date now = serviceContext.getNow();
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -26,6 +26,7 @@
import com.franciaflex.magalie.MagalieApplicationConfig;
import com.franciaflex.magalie.services.service.FixturesService;
import org.junit.Rule;
+import org.nuiton.jpa.junit.JpaEntityManagerRule;
import javax.persistence.EntityManager;
import java.util.Map;
Deleted: 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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -1,122 +0,0 @@
-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;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import java.util.Date;
-import java.util.Map;
-
-public class JpaEntityManagerRule implements TestRule {
-
- private static final Log log = LogFactory.getLog(JpaEntityManagerRule.class);
-
- protected String persistenceUnitName;
-
- protected String timestamp = String.valueOf(new Date().getTime());
-
- protected EntityManager entityManager;
-
- protected boolean open = false;
-
- protected Map<String, String> jpaParameters;
-
- public JpaEntityManagerRule(String persistenceUnitName, Map<String, String> jpaParameters) {
- this.persistenceUnitName = persistenceUnitName;
- this.jpaParameters = jpaParameters;
- }
-
- @Override
- public Statement apply(final Statement base, Description description) {
-
- final String testClassName = description.getClassName();
-
- final String testMethodName = description.getMethodName();
-
- if (log.isDebugEnabled()) {
- log.debug("will create entityManager for test class " + testClassName + " and method " + testMethodName);
- }
-
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- createEntityManager(testClassName, testMethodName);
- try {
- base.evaluate();
- } finally {
- closeEntityManager();
- }
- }
- };
- }
-
- protected void createEntityManager(String testClassName, String testMethodName) {
-
- String context = Joiner.on('_').join(testClassName, testMethodName, timestamp);
-
- EntityManagerFactory entityManagerFactory = JpaUtil.createTempEntityManagerFactory(persistenceUnitName, context, jpaParameters);
-
- entityManager = entityManagerFactory.createEntityManager();
-
- if (log.isDebugEnabled()) {
- log.debug("created entityManager " + entityManager);
- }
-
- open = true;
-
- }
-
- public EntityManager getEntityManager() {
-
- Preconditions.checkState(open);
-
- return entityManager;
-
- }
-
- /**
- * Override to tear down your specific external resource.
- */
- protected void closeEntityManager() {
-
- if (log.isDebugEnabled()) {
- log.debug("close entityManager " + entityManager);
- }
-
- open = false;
-
- entityManager.close();
-
- }
-
-}
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-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-31 10:42:59 UTC (rev 225)
@@ -24,7 +24,7 @@
*/
import com.franciaflex.magalie.persistence.Locations;
-import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.Building;
import com.franciaflex.magalie.persistence.entity.Location;
@@ -193,7 +193,7 @@
service.confirmReception(magalieUser, receptionConfirmation);
- StorageMovementDao storageMovementDao = serviceContext.getPersistenceContext().getStorageMovementDao();
+ StorageMovementJpaDao storageMovementDao = serviceContext.getPersistenceContext().getStorageMovementDao();
List<StorageMovement> storageMovements = storageMovementDao.findAll();
Modified: trunk/magalie-services/src/test/resources/log4j.properties
===================================================================
--- trunk/magalie-services/src/test/resources/log4j.properties 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-services/src/test/resources/log4j.properties 2013-05-31 10:42:59 UTC (rev 225)
@@ -29,3 +29,4 @@
# log4j.logger.com.franciaflex.magalie=TRACE
# log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL
+log4j.logger.org.nuiton.jpa.api.hibernate.HibernateUtil=TRACE
Modified: trunk/magalie-web/pom.xml
===================================================================
--- trunk/magalie-web/pom.xml 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/magalie-web/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
@@ -90,7 +90,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -121,11 +120,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-31 09:59:59 UTC (rev 224)
+++ trunk/pom.xml 2013-05-31 10:42:59 UTC (rev 225)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>3.4.8</version>
+ <version>3.4.11</version>
</parent>
<groupId>com.franciaflex</groupId>
@@ -101,6 +101,8 @@
<projectId>franciaflex-magalie</projectId>
<!-- versions -->
+ <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion>
+
<nuitonWebVersion>1.13</nuitonWebVersion>
<nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
<h2Version>1.3.172</h2Version>
@@ -115,7 +117,7 @@
<seleniumVersion>2.28.0</seleniumVersion>
<mockitoVersion>1.9.5</mockitoVersion>
<nuitonI18nVersion>2.5</nuitonI18nVersion>
- <eugeneVersion>2.5.6.1</eugeneVersion>
+ <eugeneVersion>2.6.3</eugeneVersion>
<!-- license to use -->
<license.licenseName>agpl_v3</license.licenseName>
@@ -161,10 +163,23 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
<version>${h2Version}</version>
</dependency>
+ <dependency>
+ <groupId>org.nuiton.jpa</groupId>
+ <artifactId>nuiton-jpa-api</artifactId>
+ <version>${nuitonJpaVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.jpa</groupId>
+ <artifactId>nuiton-jpa-junit</artifactId>
+ <version>${nuitonJpaVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Nuiton libs -->
<dependency>
<groupId>org.nuiton</groupId>
@@ -203,7 +218,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${struts2Version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -257,14 +271,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>${slf4jVersion}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4jVersion}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<!-- Others -->
1
0
Author: bleny
Date: 2013-05-31 11:59:59 +0200 (Fri, 31 May 2013)
New Revision: 224
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
merge trunk into branch
Modified:
branches/magalie-eugene/
Property changes on: branches/magalie-eugene
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:191-222
+ /trunk:191-223
1
0