[Lima-commits] branch develop updated (d9bb931 -> d92dc73)

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from d9bb931 Merge branch 'feature/1206' into develop adds aa44acf refs #1197 ajout du module lima-server, fonctionnel mais travail non terminé adds e73557c refs #1197 mise à jour des fichiers readme et ajout de fichiers manquants adds 02bce0d refs #1197 mise à jour des fichiers readme et ajout de fichiers manquants adds a2ea31a refs #1197 Le module serveur est responsable du lancement du serveur web adds c771fc5 refs #1197 renommage du zip du module server adds 9cace2b Make module lima-report independant against lima-business (only depends on lima-business-api) adds cf1949b Force BigDecimal formatting properties to be saved on server side adds 1b9c881 Move some configuration (about lima-report) in lima-business common module adds 5429310 Make lima-swing independent of lima-business (only lima-business-api) adds fea2115 Fix *ConfigOption naming ; remove some of the unused config options adds 76f02ea refs #1197 prise en compte des parametres ejbd par LimaServiceFactory adds 293a3b4 SimpleDateFormat is not thread-safe adds 5d551a0 Refactor lima-report and lima-server's HttpServerServlet adds ab38cb4 Fix resources module location (move misplaced, delete obsolete, ...) adds 72ca5d0 Rename model file to match module name adds 5f68057 Remove useless classes adds 304ae4c refs #1197 déplacement des dao sur business new b874da8 refs #1197 fix some dependencies new d92dc73 fixes #1197: Revoir la modularisation The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d92dc73b6fd7a49010e2fde38c6dc53ea052c8a6 Merge: d9bb931 b874da8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 20 18:51:37 2015 +0100 fixes #1197: Revoir la modularisation commit b874da8d6995700086033c58b2413a21fe2a088d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 20 18:33:52 2015 +0100 refs #1197 fix some dependencies Summary of changes: lima-business-api/pom.xml | 32 +- .../chorem/lima/business}/LimaServiceFactory.java | 20 +- .../org/chorem/lima/business/ServiceListener.java | 0 .../chorem/lima/business/ServiceMonitorable.java | 0 .../lima/business}/ServiceMonitorableHandler.java | 3 +- .../chorem/lima/business/api/OptionsService.java | 47 +- .../lima/business/config/LimaConfigOptionDef.java | 12 + .../lima/business/utils/AccountComparator.java | 0 .../lima/business/utils/BigDecimalToString.java | 28 +- .../lima/business/utils/EntryComparator.java | 2 +- .../business/utils/FinancialPeriodComparator.java | 0 .../business/utils/FiscalPeriodComparator.java | 0 lima-business/README.txt | 8 - lima-business/pom.xml | 86 +-- .../src/main/java/org/chorem/lima/LimaServer.java | 82 --- .../chorem/lima/business/LimaBusinessConfig.java | 387 +++--------- .../accountingrules/DefaultAccountingRules.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../lima/business/ejb/OptionsServiceImpl.java | 89 +-- .../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 .../resources/i18n/lima-business_en_GB.properties | 7 + .../resources/i18n/lima-business_fr_FR.properties | 7 + .../src/main/resources/lima-config.properties | 28 - .../org/chorem/lima/business/AbstractLimaTest.java | 5 +- .../org/chorem/lima/business/LimaMiscTest.java | 2 +- .../accountingrules/ImportServiceRuleFrTest.java | 2 +- .../src/test/resources/META-INF/ejb-jar.xml | 41 -- .../src/test/resources/reports/AccountReport.jrxml | 144 ----- lima-callao/pom.xml | 40 +- .../org/chorem/lima/DefaultServiceContext.java | 148 ----- .../main/java/org/chorem/lima/ServiceContext.java | 38 -- lima-callao/src/main/xmi/accounting-model.zargo | Bin 57302 -> 0 bytes ...del.properties => lima-callao-model.properties} | 0 lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 0 -> 57316 bytes {lima-web => lima-report}/LICENSE.txt | 0 {lima-web => lima-report}/README.txt | 0 {lima-web => lima-report}/pom.xml | 61 +- .../src/license/THIRD-PARTY.properties | 0 .../chorem/lima/report}/DocumentReportTypes.java | 2 +- .../org/chorem/lima/report}/DocumentsEnum.java | 2 +- .../org/chorem/lima/report/LimaReportConfig.java | 401 +++++++++++++ .../lima/report}/service/DocumentService.java | 275 +++++---- .../lima/report/service/GeneratedReport.java | 41 ++ .../chorem/lima/report/service/JasperReports.java | 55 +- .../balance/BalanceReportAccountReport.jrxml | 0 .../balance/BalanceSubAccountsReport.jrxml | 0 .../jasperreports/balance/DocumentReport.jrxml | 0 .../jasperreports/entryBook/DocumentReport.jrxml | 0 .../jasperreports/entryBook/EntryBookReport.jrxml | 0 .../entryBook/FinancialPeriodReport.jrxml | 0 .../entryBook/TransactionReport.jrxml | 0 .../generalEntryBook/DocumentReport.jrxml | 0 .../generalEntryBook/EntryBookPeriodReport.jrxml | 0 .../GeneralEntryBookEntryReport.jrxml | 0 .../generalLedger/DocumentReport.jrxml | 0 .../generalLedger/GeneralLedgerEntryReport.jrxml | 0 .../generalLedger/GeneralLedgerReport.jrxml | 0 .../src/main/resources/reports/vat_form_fr.pdf | Bin .../org/chorem/lima/report}/action/ReportTest.java | 4 +- LICENSE.txt => lima-server/LICENSE.txt | 0 lima-server/README.txt | 7 + {lima-swing => lima-server}/pom.xml | 214 ++----- .../src/license/THIRD-PARTY.properties | 12 +- .../src/main/assembly/bin.xml | 0 .../src/main/assembly/lima-server | 0 .../src/main/java/org.chorem.lima/LimaServer.java | 121 ++++ .../java/org.chorem.lima/server}/FormatsEnum.java | 5 +- .../org.chorem.lima/server/HttpServerService.java | 297 ++++++++++ .../org.chorem.lima/server/LimaServerConfig.java | 180 ++++++ .../src/main/resources/images/accounts.png | Bin .../src/main/resources/images/entries.png | Bin .../src/main/resources/images/entrybooks.png | Bin .../src/main/resources/images/fiscalperiods.png | Bin .../src/main/resources/images/identity.png | Bin .../src/main/resources/images/puzzle_icon_mini.png | Bin .../src/main/resources/log4j.properties | 0 lima-swing/README.txt | 11 +- lima-swing/pom.xml | 29 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 42 +- .../chorem/lima/LimaSwingApplicationContext.java | 6 - .../main/java/org/chorem/lima/LimaSwingConfig.java | 222 +------ .../EntryBookConditionHandler.java | 2 +- .../FinancialPeriodConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 2 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 41 +- .../chorem/lima/ui/account/AccountViewHandler.java | 10 +- .../lima/ui/combobox/AccountComboBoxModel.java | 2 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 2 +- .../ui/combobox/FinancialPeriodComboBoxModel.java | 2 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 2 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 2 +- .../lima/ui/combobox/LetterComboBoxModel.java | 2 +- .../ui/common/FinancialTransactionTableModel.java | 2 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 2 +- .../FinancialPeriodViewHandler.java | 2 +- .../FinancialStatementChartTreeTableModel.java | 2 +- .../FinancialStatementChartViewHandler.java | 2 +- .../FinancialTransactionViewHandler.java | 2 +- .../FinancialTransactionSearchTableModel.java | 2 +- .../FinancialTransactionSearchViewHandler.java | 2 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 2 +- .../java/org/chorem/lima/ui/home/AccountsPane.java | 2 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 2 +- .../lima/ui/home/FinancialTransactionsPane.java | 2 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 2 +- .../chorem/lima/ui/identity/IdentityHandler.java | 2 +- .../chorem/lima/ui/importexport/ImportExport.java | 2 +- .../lima/ui/lettering/LetteringViewHandler.java | 2 +- .../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 2 +- .../ui/opening/CreateIdentityPanelHandler.java | 2 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 2 +- .../lima/ui/vatchart/VatChartTreeTableModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 2 +- .../org/chorem/lima/util/BigDecimalToString.java | 26 +- lima-swing/src/main/resources/META-INF/aop.xml | 37 -- lima-swing/src/main/resources/META-INF/ejb-jar.xml | 41 -- .../{lima-config.properties => lima-swing.config} | 0 .../java/org/chorem/lima/ui/AbstractLimaTest.java | 652 --------------------- .../java/org/chorem/lima/ui/LimaTestsConfig.java | 71 --- .../lima/ui/account/AccountViewHandlerTest.java | 5 +- .../chorem/lima/web/service/HttpServerService.java | 326 ----------- .../org/chorem/lima/web/utils/DocumentsEnum.java | 67 --- .../main/resources/i18n/lima-web_en_GB.properties | 60 -- .../main/resources/i18n/lima-web_fr_FR.properties | 60 -- lima-web/src/main/resources/log4j.properties | 33 -- pom.xml | 18 +- src/site/rst/devel/server.rst | 2 +- 145 files changed, 1732 insertions(+), 3040 deletions(-) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/LimaServiceFactory.java (88%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/ServiceListener.java (100%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/ServiceMonitorable.java (100%) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/ServiceMonitorableHandler.java (97%) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/config/LimaConfigOptionDef.java rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/AccountComparator.java (100%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java (71%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/EntryComparator.java (91%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java (100%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java (100%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/LimaServer.java rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/EntryImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java (94%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java (90%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/VatStatementImpl.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java (100%) delete mode 100644 lima-business/src/main/resources/lima-config.properties delete mode 100644 lima-business/src/test/resources/META-INF/ejb-jar.xml delete mode 100644 lima-business/src/test/resources/reports/AccountReport.jrxml delete mode 100644 lima-callao/src/main/java/org/chorem/lima/DefaultServiceContext.java delete mode 100644 lima-callao/src/main/java/org/chorem/lima/ServiceContext.java delete mode 100644 lima-callao/src/main/xmi/accounting-model.zargo rename lima-callao/src/main/xmi/{accounting-model.properties => lima-callao-model.properties} (100%) create mode 100644 lima-callao/src/main/xmi/lima-callao-model.zargo rename {lima-web => lima-report}/LICENSE.txt (100%) rename {lima-web => lima-report}/README.txt (100%) rename {lima-web => lima-report}/pom.xml (83%) rename {lima-web => lima-report}/src/license/THIRD-PARTY.properties (100%) rename {lima-business/src/main/java/org/chorem/lima/business/utils => lima-report/src/main/java/org/chorem/lima/report}/DocumentReportTypes.java (96%) rename {lima-business/src/main/java/org/chorem/lima/business/utils => lima-report/src/main/java/org/chorem/lima/report}/DocumentsEnum.java (98%) create mode 100644 lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java rename {lima-web/src/main/java/org/chorem/lima/web => lima-report/src/main/java/org/chorem/lima/report}/service/DocumentService.java (68%) create mode 100644 lima-report/src/main/java/org/chorem/lima/report/service/GeneratedReport.java rename lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java => lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java (68%) rename {lima-web => lima-report}/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/balance/DocumentReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml (100%) rename {lima-web => lima-report}/src/main/resources/reports/vat_form_fr.pdf (100%) rename {lima-web/src/test/java/org/chorem/lima/web => lima-report/src/test/java/org/chorem/lima/report}/action/ReportTest.java (94%) copy LICENSE.txt => lima-server/LICENSE.txt (100%) create mode 100644 lima-server/README.txt copy {lima-swing => lima-server}/pom.xml (73%) copy {lima-business => lima-server}/src/license/THIRD-PARTY.properties (92%) rename {lima-business => lima-server}/src/main/assembly/bin.xml (100%) rename {lima-business => lima-server}/src/main/assembly/lima-server (100%) create mode 100644 lima-server/src/main/java/org.chorem.lima/LimaServer.java rename {lima-business-api/src/main/java/org/chorem/lima/business/utils => lima-server/src/main/java/org.chorem.lima/server}/FormatsEnum.java (93%) create mode 100644 lima-server/src/main/java/org.chorem.lima/server/HttpServerService.java create mode 100644 lima-server/src/main/java/org.chorem.lima/server/LimaServerConfig.java rename {lima-web => lima-server}/src/main/resources/images/accounts.png (100%) rename {lima-web => lima-server}/src/main/resources/images/entries.png (100%) rename {lima-web => lima-server}/src/main/resources/images/entrybooks.png (100%) rename {lima-web => lima-server}/src/main/resources/images/fiscalperiods.png (100%) rename {lima-web => lima-server}/src/main/resources/images/identity.png (100%) rename {lima-web => lima-server}/src/main/resources/images/puzzle_icon_mini.png (100%) rename {lima-business => lima-server}/src/main/resources/log4j.properties (100%) delete mode 100644 lima-swing/src/main/resources/META-INF/aop.xml delete mode 100644 lima-swing/src/main/resources/META-INF/ejb-jar.xml rename lima-swing/src/main/resources/{lima-config.properties => lima-swing.config} (100%) delete mode 100644 lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java delete mode 100644 lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java delete mode 100644 lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java delete mode 100644 lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java delete mode 100644 lima-web/src/main/resources/i18n/lima-web_en_GB.properties delete mode 100644 lima-web/src/main/resources/i18n/lima-web_fr_FR.properties delete mode 100644 lima-web/src/main/resources/log4j.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.