This is an automated email from the git hooks/post-receive script. New change to branch master in repository lima. See http://git.chorem.org/lima.git from 953e04b Merge branch 'release/0.8.1' adds a091a07 [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development adds b6d8ad4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 67a1114 Merge branch 'master' into develop adds c834d79 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 07c3c57 fixes #1189: fix flayway properties in create database adds fd942df fixes #1196 changement de polices sur les rapports + correction à la génération de ceux ci adds 3b132bf refs #1196 il restait des polices non libres sur ce documents adds 479daf4 refs #1196 correction sur taille police trop grande adds 0dc1dd2 fixes #1196 Il faudrait empacter les fonts pour la génération des rapports Merge branch 'feature/1196-reports_font' into develop adds 22604db fixes #1194 les fichiers sont retrouvés via leur URL et non plus via le file path adds 11ced16 fixes #1194 Les fichiers d'import par défaut ne peuvent être chargés adds 546b909 correction sur scope de la dépendance 'jasperreports-fonts' adds d5b2b30 refs #1190 some fixes, work in progress adds 0dd23ac refs #1190 Refactoring déplacement de LimaServer sur la partie business, correction sur les POMs, ajout de paramètres à openEjb. La partie serveur démarre et la partie client essaie de s'y connecter mais elle ne semble pas y parvenir, elle démarre toujours sur une base locale. adds 30ac42d refs #1190 uncomment necessary code adds 32911a4 refs #1190 Le mode client serveur est fonctionnel adds 139b85e refs #1190 Revue de code : -renommage LimaServiceConfig en LimaBusinessConfig ; -correction des Lima*Config pour la définition du nom de la propriété de conf, ainsi que le nom du fichier de conf par défaut (lima-config.properties) adds 4a70606 Merge branch 'feature/1190-encodage-path' into develop adds b9b6b57 refs #1198 properties file rename lima.properties -> lima-config.properties adds 93d92a4 refs #1202 : optimisation du rafraichissment de la page d'accueil adds 15b5e1b refs #1202 : optimisation du temps de reponce de la saisie de écritures adds d77d66d prefer use inner class than anonymous class adds eda4da1 fixes #1202: Optimisation du temps de réponses de l'UI adds fded943 fixes #1206 Reduire la taille minimale de l'application adds 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 adds b874da8 refs #1197 fix some dependencies adds d92dc73 fixes #1197: Revoir la modularisation adds b923f12 [jgitflow-maven-plugin]updating poms for branch '0.8.2' with snapshot versions adds 049f7c8 [jgitflow-maven-plugin]updating poms for branch'release/0.8.2' with non-snapshot versions adds 44c9906 fix third parties adds 2753820 fix license headers adds d7d9a15 refs #1197 Les implantations d'entités doivent être dans le module callao adds 078cd83 utilisation d'un package org.chorem.lima et pas d'un répertoire nommé org.chorem.lima SuperLol adds 2f1935d fix license headers adds d45413e Merge branch 'release/0.8.2' No new revisions were added by this update. Summary of changes: lima-business-api/pom.xml | 34 +- .../src/license/THIRD-PARTY.properties | 13 +- .../chorem/lima/business}/LimaServiceFactory.java | 43 +- .../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 +- .../LimaConfigOptionDef.java} | 16 +- .../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 | 1 - lima-business/pom.xml | 58 +- .../chorem/lima/business/LimaBusinessConfig.java | 398 +++++++++++++ .../org/chorem/lima/business/LimaInterceptor.java | 2 +- .../chorem/lima/business/LimaServiceConfig.java | 602 ------------------- .../accountingrules/DefaultAccountingRules.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 8 +- .../lima/business/ejb/EntryBookServiceImpl.java | 7 +- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +- .../ejb/FinancialTransactionServiceImpl.java | 22 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 8 +- .../lima/business/ejb/OptionsServiceImpl.java | 95 +-- .../ProvisionalEntryBookReportServiceImpl.java | 9 +- .../org/chorem/lima/entity/AccountTopiaDao.java | 0 .../entity/ClosedPeriodicEntryBookTopiaDao.java | 0 .../java/org/chorem/lima/entity/EntryTopiaDao.java | 0 .../lima/entity/FinancialPeriodTopiaDao.java | 0 .../lima/entity/FinancialStatementTopiaDao.java | 2 +- .../lima/entity/FinancialTransactionTopiaDao.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 | 6 + .../chorem/lima/entity/VatStatementTopiaDao.java | 0 .../resources/i18n/lima-business_en_GB.properties | 7 + .../resources/i18n/lima-business_fr_FR.properties | 7 + .../org/chorem/lima/business/AbstractLimaTest.java | 9 +- .../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 +- .../src/test/resources/META-INF/ejb-jar.xml | 41 -- lima-business/src/test/resources/log4j.properties | 4 +- .../src/test/resources/reports/AccountReport.jrxml | 144 ----- lima-callao/pom.xml | 42 +- .../org/chorem/lima/DefaultServiceContext.java | 148 ----- .../main/java/org/chorem/lima/ServiceContext.java | 38 -- lima-callao/src/main/xmi/accounting-model.zargo | Bin 57335 -> 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 | 119 +--- .../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 | 423 +++++++++++++ .../lima/report}/service/DocumentService.java | 275 +++++---- .../lima/report/service/GeneratedReport.java | 63 ++ .../chorem/lima/report/service/JasperReports.java | 55 +- .../balance/BalanceReportAccountReport.jrxml | 4 +- .../balance/BalanceSubAccountsReport.jrxml | 34 +- .../jasperreports/balance/DocumentReport.jrxml | 10 +- .../jasperreports/entryBook/DocumentReport.jrxml | 14 +- .../jasperreports/entryBook/EntryBookReport.jrxml | 6 +- .../entryBook/FinancialPeriodReport.jrxml | 14 +- .../entryBook/TransactionReport.jrxml | 18 +- .../generalEntryBook/DocumentReport.jrxml | 14 +- .../generalEntryBook/EntryBookPeriodReport.jrxml | 10 +- .../GeneralEntryBookEntryReport.jrxml | 10 +- .../generalLedger/DocumentReport.jrxml | 10 +- .../generalLedger/GeneralLedgerEntryReport.jrxml | 6 +- .../generalLedger/GeneralLedgerReport.jrxml | 6 +- .../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 | 213 ++----- .../src/license/THIRD-PARTY.properties | 12 +- .../src/main/assembly/bin.xml | 42 -- .../src/main/assembly/lima-server | 0 .../java/org/chorem/lima/server}/FormatsEnum.java | 12 +- .../org/chorem/lima/server/HttpServerService.java | 295 ++++++++++ .../java/org/chorem/lima/server/LimaServer.java | 120 ++++ .../org/chorem/lima/server/LimaServerConfig.java | 202 +++++++ .../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 | 15 +- lima-swing/README.txt | 11 +- lima-swing/pom.xml | 33 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 43 +- .../chorem/lima/LimaSwingApplicationContext.java | 6 - .../main/java/org/chorem/lima/LimaSwingConfig.java | 222 +------ .../org/chorem/lima/enums/AccountsChartEnum.java | 14 +- .../org/chorem/lima/enums/EntryBooksChartEnum.java | 11 +- .../lima/enums/FinancialStatementsChartEnum.java | 11 +- .../org/chorem/lima/enums/ImportExportEnum.java | 39 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 11 +- .../EntryBookConditionHandler.java | 2 +- .../FinancialPeriodConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 2 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 2 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 80 ++- .../chorem/lima/ui/account/AccountImportForm.css | 2 +- .../chorem/lima/ui/account/AccountViewHandler.java | 61 +- .../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 | 4 +- .../FinancialPeriodViewHandler.java | 2 +- .../FinancialStatementChartTreeTableModel.java | 2 +- .../FinancialStatementChartViewHandler.java | 4 +- .../FinancialTransactionViewHandler.java | 55 +- .../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 | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 2 +- .../java/org/chorem/lima/ui/home/HomeView.jaxx | 23 +- .../chorem/lima/ui/identity/IdentityHandler.java | 2 +- .../chorem/lima/ui/importexport/ImportExport.java | 376 +++++++----- .../lima/ui/lettering/LetteringViewHandler.java | 2 +- .../chorem/lima/ui/opening/CreateAccountsPanel.css | 2 +- .../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 2 +- .../ui/opening/CreateIdentityPanelHandler.java | 2 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 2 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 28 +- .../lima/ui/vatchart/VatChartTreeTableModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 4 +- .../org/chorem/lima/util/BigDecimalToString.java | 26 +- lima-swing/src/main/resources/META-INF/aop.xml | 37 -- .../{lima-config.properties => lima-swing.config} | 3 + lima-swing/src/main/resources/log4j.properties | 57 +- .../java/org/chorem/lima/ui/AbstractLimaTest.java | 653 --------------------- .../java/org/chorem/lima/ui/LimaTestsConfig.java | 71 --- .../lima/ui/account/AccountViewHandlerTest.java | 5 +- .../src/main/java/org/chorem/lima/LimaServer.java | 75 --- .../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 -- pom.xml | 29 +- src/site/rst/devel/server.rst | 2 +- 164 files changed, 2763 insertions(+), 3747 deletions(-) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/LimaServiceFactory.java (78%) 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%) copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions/NoDataToImportException.java => config/LimaConfigOptionDef.java} (71%) 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%) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.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/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/FinancialStatementTopiaDao.java (94%) 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/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 (97%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java (100%) 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 (68%) 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 (95%) rename {lima-web => lima-report}/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml (95%) rename {lima-web => lima-report}/src/main/resources/jasperreports/balance/DocumentReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml (96%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml (94%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml (97%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml (98%) rename {lima-web => lima-report}/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml (98%) 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 (72%) copy {lima-business => lima-server}/src/license/THIRD-PARTY.properties (92%) rename {lima-web => lima-server}/src/main/assembly/bin.xml (59%) rename {lima-web => lima-server}/src/main/assembly/lima-server (100%) rename {lima-business-api/src/main/java/org/chorem/lima/business/utils => lima-server/src/main/java/org/chorem/lima/server}/FormatsEnum.java (88%) 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/LimaServer.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/src/main/resources/lima.properties => lima-server/src/main/resources/log4j.properties (70%) delete mode 100644 lima-swing/src/main/resources/META-INF/aop.xml rename lima-swing/src/main/resources/{lima-config.properties => lima-swing.config} (93%) 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/LimaServer.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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.