This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 4a70606d65e1411384fa450d7e2812e990708c8f Merge: 546b909 139b85e Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu Mar 12 14:17:18 2015 +0100 Merge branch 'feature/1190-encodage-path' into develop lima-business/README.txt | 9 +++- lima-business/pom.xml | 36 ++++++++++++- .../src/main/assembly/bin.xml | 42 --------------- .../src/main/assembly/lima-server | 0 .../src/main/java/org/chorem/lima/LimaServer.java | 11 +++- ...aServiceConfig.java => LimaBusinessConfig.java} | 33 +++++++----- .../org/chorem/lima/business/LimaInterceptor.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 8 +-- .../lima/business/ejb/EntryBookServiceImpl.java | 7 ++- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +- .../ejb/FinancialTransactionServiceImpl.java | 20 ++++---- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 8 +-- .../lima/business/ejb/OptionsServiceImpl.java | 40 +++++++-------- .../lima/business/utils/BigDecimalToString.java | 4 +- .../chorem/lima/service/LimaServiceFactory.java | 23 +++++++-- .../src/{test => main}/resources/log4j.properties | 4 +- .../org/chorem/lima/business/AbstractLimaTest.java | 6 +-- .../org/chorem/lima/business/LimaMiscTest.java | 4 +- .../org/chorem/lima/business/LimaTestsConfig.java | 4 +- .../accountingrules/AccountServiceRuleFrTest.java | 8 +-- .../EntryBookServiceRuleFrTest.java | 8 +-- .../FinancialPeriodServiceRuleFrTest.java | 8 +-- .../FinancialTransactionServiceRuleFrTest.java | 8 +-- .../FiscalPeriodServiceRuleFrTest.java | 8 +-- .../accountingrules/ImportServiceRuleFrTest.java | 8 +-- .../accountingrules/ReportServiceRuleFrTest.java | 8 +-- lima-business/src/test/resources/log4j.properties | 4 +- lima-swing/pom.xml | 12 ++--- .../src/main/java/org/chorem/lima/LimaMain.java | 4 +- .../chorem/lima/LimaSwingApplicationContext.java | 4 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 12 +++-- .../chorem/lima/ui/account/AccountViewHandler.java | 44 ++++++++-------- lima-swing/src/main/resources/META-INF/ejb-jar.xml | 41 +++++++++++++++ .../src/main/resources/lima-config.properties | 3 ++ lima-swing/src/main/resources/log4j.properties | 57 ++++++++++---------- .../java/org/chorem/lima/ui/AbstractLimaTest.java | 9 ++-- .../java/org/chorem/lima/ui/LimaTestsConfig.java | 6 +-- lima-web/pom.xml | 60 ++-------------------- .../org/chorem/lima/web/action/ReportBuilder.java | 4 +- .../chorem/lima/web/service/DocumentService.java | 4 +- .../chorem/lima/web/service/HttpServerService.java | 14 ++--- .../src/main}/resources/log4j.properties | 0 pom.xml | 3 +- 43 files changed, 311 insertions(+), 291 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.