This is an automated email from the git hooks/post-receive script. New change to branch feature/1187 in repository lima. See http://git.chorem.org/lima.git discards 3cc977b refs #1187 : identitiy popups discards b3f089b refs #1187 : Vat chart popups discards e68fb18 refs #1187 : inancial statement popups discards 15794a7 refs #1187 : fiscal period popups discards e772fdd refs #1187 : entry book popups discards 9b6471a refs #1187 : account popups discards b957513 change remove icon on tab 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 ac287f3 [jgitflow-maven-plugin]updating poms for 0.8.3-SNAPSHOT development adds 5947526 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' adds 937f0ae Merge branch 'master' into develop adds 7b18ab3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 14ee9ac change remove icon on tab new ea8d12e refs #1187 : account popups new 91dab5f refs #1187 : entry book popups new e27ec71 refs #1187 : fiscal period popups new d212660 refs #1187 : inancial statement popups new 4e12c75 refs #1187 : Vat chart popups new 7e3dbfa refs #1187 : identitiy popups This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3cc977b) \ N -- N -- N refs/heads/feature/1187 (7e3dbfa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 7 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 7e3dbfad1825b2124bf7ce5adb15935ca4282250 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 14:28:51 2015 +0200 refs #1187 : identitiy popups commit 4e12c75619aa429819fc635973ce72b2614367a4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 09:09:09 2015 +0200 refs #1187 : Vat chart popups commit d21266052aea3a51213c85a24c8851bbf98e7e15 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 30 17:13:41 2015 +0200 refs #1187 : inancial statement popups commit e27ec71ef6a2a600f8a1ea2eadb01c46ad6d43de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 27 08:52:22 2015 +0100 refs #1187 : fiscal period popups commit 91dab5f180eb1a89e00578978fa88684138bf8f3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:26:07 2015 +0100 refs #1187 : entry book popups commit ea8d12ee23fd35cb5ec845422792645fe23b7210 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:15:42 2015 +0100 refs #1187 : account popups commit 14ee9ac587c16ad2f7eaba26270d1b3c68e54017 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 15:02:18 2015 +0100 change remove icon on tab Summary of changes: lima-business-api/pom.xml | 34 +- .../src/license/THIRD-PARTY.properties | 13 +- .../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 +- .../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 | 8 - lima-business/pom.xml | 88 +-- .../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/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 | 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 | 42 +- .../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 | 63 +- .../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 | 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 | 219 ++----- .../src/license/THIRD-PARTY.properties | 12 +- .../src/main/assembly/bin.xml | 0 .../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 | 0 lima-swing/README.txt | 11 +- lima-swing/pom.xml | 31 +- 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 +------ .../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 | 78 ++- .../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 | 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 | 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 | 20 +- src/site/rst/devel/server.rst | 2 +- 143 files changed, 1902 insertions(+), 3094 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%) 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%) 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/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 (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 (82%) 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 (72%) 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%) 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 => 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>.