This is an automated email from the git hooks/post-receive script. New commit to branch feature/1197-modularisation in repository lima. See http://git.chorem.org/lima.git commit 304ae4c3153cbd6902ce91ce3bfbb4bb934f30e1 Author: dcosse <cosse@codelutin.com> Date: Fri Mar 20 18:05:06 2015 +0100 refs #1197 déplacement des dao sur business --- lima-business-api/pom.xml | 16 ++++++ lima-business/pom.xml | 31 +++++++++--- .../accountingrules/DefaultAccountingRules.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../org/chorem/lima/entity/AccountTopiaDao.java | 0 .../entity/ClosedPeriodicEntryBookTopiaDao.java | 0 .../java/org/chorem/lima/entity/EntryImpl.java | 0 .../java/org/chorem/lima/entity/EntryTopiaDao.java | 0 .../lima/entity/FinancialPeriodTopiaDao.java | 0 .../chorem/lima/entity/FinancialStatementImpl.java | 0 .../lima/entity/FinancialStatementTopiaDao.java | 2 +- .../lima/entity/FinancialTransactionImpl.java | 0 .../lima/entity/FinancialTransactionTopiaDao.java | 0 .../org/chorem/lima/entity/FiscalPeriodImpl.java | 0 .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 0 .../org/chorem/lima/entity/GeneratorHQuery.java | 0 .../entity/LimaCallaoTopiaApplicationContext.java | 0 .../entity/LimaCallaoTopiaPersistenceContext.java | 4 -- .../chorem/lima/entity/LimaFlywayServiceImpl.java | 0 .../org/chorem/lima/entity/VatStatementImpl.java | 0 .../chorem/lima/entity/VatStatementTopiaDao.java | 0 lima-callao/pom.xml | 57 +++++++++------------- lima-report/pom.xml | 4 ++ lima-server/pom.xml | 7 ++- lima-swing/pom.xml | 4 +- 25 files changed, 79 insertions(+), 50 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 70ee339..99b1760 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -43,6 +43,22 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> <profiles> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 63fb44c..3eac719 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -91,6 +91,15 @@ <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> </dependencies> <build> @@ -133,20 +142,30 @@ </executions> </plugin> <plugin> - <artifactId>maven-dependency-plugin</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> + <id>generate-entities</id> + <phase>generate-sources</phase> <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> + <inputs>classpath:model:/:lima-callao-model.objectmodel</inputs> + <!-- DefaultPackage used for DAOHelper generation --> + <defaultPackage>org.chorem.lima.entity</defaultPackage> + <templates> + org.nuiton.topia.templates.EntityDaoTransformer, + org.nuiton.topia.templates.ApplicationContextTransformer, + org.nuiton.topia.templates.PersistenceContextTransformer + </templates> </configuration> + <goals> + <goal>generate</goal> + </goals> </execution> </executions> </plugin> </plugins> + </build> <profiles> diff --git a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java index 3f68385..b6e2be7 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java +++ b/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java @@ -83,7 +83,7 @@ public class DefaultAccountingRules implements AccountingRules { * Return Dao helper to use in current thread. * Defined by {@link LimaInterceptor}. * - * @return dao helper + * @return api helper */ protected LimaCallaoTopiaDaoSupplier getDaoHelper() { return LimaInterceptor.DAO_HELPER.get(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index 73a5959..ba41e51 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -588,7 +588,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme financialTransactionCondition.accept(generator); FinancialTransactionFilter filter = generator.getFilter(); - // next on financial transaction dao + // next on financial transaction api FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); List<FinancialTransaction> result = financialTransactionTopiaDao.searchFinancialTransaction(filter); diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/EntryImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/EntryImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java similarity index 94% rename from lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java index b5fb871..19380a9 100644 --- a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java @@ -26,7 +26,7 @@ import java.util.List; /** - * Ajout de requetes specifiques aux {@link FinancialStatement} sur le DAO. + * Ajout de requetes specifiques aux {@link org.chorem.lima.entity.FinancialStatement} sur le DAO. * * @author chatellier * @version $Revision$ diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java b/lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java rename to lima-business/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java b/lima-business/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java rename to lima-business/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java b/lima-business/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java similarity index 90% rename from lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java rename to lima-business/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java index 0cf0219..68d08fb 100644 --- a/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java @@ -25,11 +25,7 @@ package org.chorem.lima.entity; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; -import org.nuiton.topia.persistence.internal.HibernateProvider; -import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; -import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/VatStatementImpl.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java rename to lima-business/src/main/java/org/chorem/lima/entity/VatStatementImpl.java diff --git a/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java similarity index 100% rename from lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java rename to lima-business/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index df54c88..d9a8bd4 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -25,19 +25,10 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -46,19 +37,6 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-flyway</artifactId> - </dependency> - <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> <scope>compile</scope> @@ -92,21 +70,12 @@ <fullPackagePath>org.chorem.lima</fullPackagePath> <defaultPackage>org.chorem.lima.entity</defaultPackage> <templates> - org.nuiton.topia.templates.TopiaMetaTransformer, org.nuiton.topia.templates.EntityTransformer, + org.nuiton.topia.templates.EntityHibernateMappingGenerator, + org.nuiton.eugene.java.JavaEnumerationTransformer, + org.nuiton.topia.templates.EntityEnumTransformer, org.nuiton.eugene.java.JavaBeanTransformer </templates> - <excludeTemplates> - <excludeTemplate> - org.nuiton.topia.generator.EntityAbstractTransformer - </excludeTemplate> - <excludeTemplate> - org.nuiton.topia.generator.EntityImplTransformer - </excludeTemplate> - <excludeTemplate> - org.nuiton.topia.generator.EntityInterfaceTransformer - </excludeTemplate> - </excludeTemplates> </configuration> <goals> <goal>generate</goal> @@ -114,7 +83,27 @@ </execution> </executions> </plugin> + <plugin> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer-maven-plugin</artifactId> + <executions> + <execution> + <id>run</id> <!-- id is optional --> + <configuration> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <!-- if some of parameter names you need to retain are held in pre-existing jars, they need to be added to the classpath --> + </dependencies> + </plugin> </plugins> + </build> <profiles> diff --git a/lima-report/pom.xml b/lima-report/pom.xml index e8af7a5..6305455 100644 --- a/lima-report/pom.xml +++ b/lima-report/pom.xml @@ -90,6 +90,10 @@ <artifactId>javaee-api</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> </dependencies> <build> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index 37c1256..59b9eae 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -71,7 +71,6 @@ <artifactId>jetty-server</artifactId> </dependency> - <!-- for remote mode only --> <dependency> <groupId>org.apache.openejb</groupId> @@ -104,6 +103,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <!--<scope>provided</scope>--> </dependency> <dependency> @@ -138,6 +138,11 @@ <artifactId>nuiton-config</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies> <build> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index b84c24e..598438a 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -203,8 +203,8 @@ </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> </dependencies> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.