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 aa44acf5f627e2b20220d4008e6381a024dcb801 Author: dcosse <cosse@codelutin.com> Date: Fri Mar 13 19:47:01 2015 +0100 refs #1197 ajout du module lima-server, fonctionnel mais travail non terminé --- lima-business/README.txt | 8 - lima-business/pom.xml | 53 +----- .../chorem/lima/business/LimaBusinessConfig.java | 20 ++- .../chorem/lima/service/LimaServiceFactory.java | 5 + .../resources/i18n/lima-business_en_GB.properties | 1 + .../resources/i18n/lima-business_fr_FR.properties | 1 + .../org/chorem/lima/business/AbstractLimaTest.java | 2 +- {lima-web => lima-report}/LICENSE.txt | 0 {lima-web => lima-report}/README.txt | 0 {lima-web => lima-report}/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 0 .../chorem/lima/report}/action/ReportBuilder.java | 4 +- .../lima/report}/service/DocumentService.java | 6 +- .../lima/report}/service/HttpServerService.java | 6 +- .../chorem/lima/report}/utils/DocumentsEnum.java | 2 +- .../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 .../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/log4j.properties | 0 .../src/main/resources/reports/vat_form_fr.pdf | Bin .../org/chorem/lima/report}/action/ReportTest.java | 4 +- {lima-web => lima-server}/LICENSE.txt | 0 lima-server/README.txt | 7 + {lima-swing => lima-server}/pom.xml | 194 ++------------------- .../src/main/assembly/bin.xml | 0 .../src/main/assembly/lima-server | 0 .../src/main/java/org.chorem.lima}/LimaServer.java | 20 ++- .../src/main/resources/META-INF/ejb-jar.xml | 41 +++++ .../src/main/resources/log4j.properties | 15 +- lima-swing/pom.xml | 10 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 2 +- .../chorem/lima/LimaSwingApplicationContext.java | 2 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 3 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 5 +- .../{lima-config.properties => lima-swing.config} | 0 .../java/org/chorem/lima/ui/AbstractLimaTest.java | 2 +- .../main/resources/i18n/lima-web_en_GB.properties | 60 ------- .../main/resources/i18n/lima-web_fr_FR.properties | 60 ------- pom.xml | 4 +- 56 files changed, 150 insertions(+), 399 deletions(-) diff --git a/lima-business/README.txt b/lima-business/README.txt index ea7d020..e69de29 100644 --- a/lima-business/README.txt +++ b/lima-business/README.txt @@ -1,8 +0,0 @@ -Pour configurer le client pour se connecter au serveur, éditez le fichier de configuration (lima-config.properties) qui se trouve ici : -Unix-like : $HOME/.config/lima-config.properties -Windows 7 et + : C:\Users\USER_NAME\AppData\Roaming\lima-config.properties -Mac OS : $HOME/Library/Application Support/lima-config.properties - -Ajoutez les 2 lignes suivantes en remplaçant l'IP par celle du serveur : - java.naming.factory.initial=org.apache.openejb.client.RemoteInitialContextFactory - java.naming.provider.url=ejbd://192.168.99.9:4201 diff --git a/lima-business/pom.xml b/lima-business/pom.xml index d84e624..40454b3 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -14,15 +14,6 @@ <name>Lima :: business</name> <description>Business module for lima</description> - <properties> - <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> - - <redmine.releaseFiles> - target/lima-server-${project.version}-bin.zip - </redmine.releaseFiles> - </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -86,11 +77,6 @@ </dependency> <dependency> <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> </dependency> <dependency> @@ -111,16 +97,11 @@ <resources> <resource> <directory>src/main/resources</directory> - <includes> - <include>lima.properties</include> - </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>lima.properties</exclude> - </excludes> + <filtering>false</filtering> </resource> </resources> <pluginManagement> @@ -132,7 +113,6 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>org.chorem.lima.LimaServer</mainClass> </manifest> </archive> </configuration> @@ -170,37 +150,6 @@ </build> <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>lima-server-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <profile> <id>reporting</id> diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java index 7a54cce..02876e8 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java @@ -491,7 +491,11 @@ public class LimaBusinessConfig { config.saveForUser(); } - // ** FIN REPORT PART ** + public String getHostAddress() { + String result = config.getOption(ServiceConfigOption. + LIMA_HOST_ADDRESS.getKey()); + return result; + } /** @@ -503,7 +507,14 @@ public class LimaBusinessConfig { */ public enum ServiceConfigOption implements ConfigOptionDef { - CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima-config.properties", String.class, true, true), + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima-business.config", String.class, true, true), + + DB_DIALECT("hibernate.dialect","", "org.hibernate.dialect.H2Dialect", String.class, false, false), + DB_USER_NAME("hibernate.connection.username","", "sa", String.class, false, false), + DB_PASSWORD("hibernate.connection.password","", "", String.class, false, false), + DB_DRIVER("hibernate.connection.driver_class","", "org.h2.Driver", String.class, false, false), + DB_URL("hibernate.connection.url","", "jdbc:h2:file:${lima.data.dir}/limadb", String.class, false, false), + DB_BATCH_SIZE("hibernate.jdbc.batch_size","", "50", String.class, false, false), APPLICATION_VERSION("application.version", n("application.version"), null, String.class, false, false), DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), @@ -536,7 +547,10 @@ public class LimaBusinessConfig { SCALE("lima.scale", n("lima.config.scale.description"), "2", String.class, false, false), CURRENCY("lima.config.currency", "", "false", Boolean.class, false, false), DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", "", ",", Character.class, false, false), - THOUSAND_SEPARATOR("lima.thousandSeparator", "", " ", Character.class, false, false); + THOUSAND_SEPARATOR("lima.thousandSeparator", "", " ", Character.class, false, false), + + LIMA_HOST_ADDRESS("lima.host.address",n("lima.config.host.address.description"),"localhost",String.class, false, false); + private final String key; diff --git a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java index b012514..ff72208 100644 --- a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java +++ b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java @@ -23,8 +23,10 @@ package org.chorem.lima.service; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.openejb.client.RemoteInitialContextFactory; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.ServiceMonitorable; import org.nuiton.config.ApplicationConfig; @@ -77,6 +79,9 @@ public class LimaServiceFactory { // only copy necessary options props.putAll(config.getOptionStartsWith("java.naming")); props.putAll(config.getOptionStartsWith("openejb")); + if (StringUtils.isNotBlank(config.getOption(Context.PROVIDER_URL))) { + props.put(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName()); + } // transmission des options de logging a openejb // sinon, il utilise son propre pattern interne diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index 7245b4d..7d7f2af 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -66,6 +66,7 @@ lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descriptio lima.config.documentReport.generalLedger.documentReportModelPath.description= lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description= lima.config.documentReport.generalLedger.generalLedgerModelPath.description= +lima.config.host.address.description= lima.config.httpport.description=HTTP Port lima.config.reports.dir.description= lima.config.reportvatpdfurl.description= diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index 8d32a20..cac64f4 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -69,6 +69,7 @@ lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descriptio lima.config.documentReport.generalLedger.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport' lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedgerEntry' lima.config.documentReport.generalLedger.generalLedgerModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedger' +lima.config.host.address.description= lima.config.httpport.description=Port HTTP lima.config.reports.dir.description=Dossier des rapports lima.config.reportvatpdfurl.description=Chemin du raport diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 702c605..32593b3 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -156,7 +156,7 @@ public abstract class AbstractLimaTest { protected Properties getTestConfiguration() { // do not call parse() method (don't read /etc...) - // load file manually (lima-config.properties) + // load file manually (lima-business.config) Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); diff --git a/lima-web/LICENSE.txt b/lima-report/LICENSE.txt similarity index 100% copy from lima-web/LICENSE.txt copy to lima-report/LICENSE.txt diff --git a/lima-web/README.txt b/lima-report/README.txt similarity index 100% rename from lima-web/README.txt rename to lima-report/README.txt diff --git a/lima-web/pom.xml b/lima-report/pom.xml similarity index 98% rename from lima-web/pom.xml rename to lima-report/pom.xml index 6ec33b2..839f8f4 100644 --- a/lima-web/pom.xml +++ b/lima-report/pom.xml @@ -9,10 +9,10 @@ </parent> <groupId>org.chorem.lima</groupId> - <artifactId>lima-web</artifactId> + <artifactId>lima-report</artifactId> - <name>Lima :: web</name> - <description>Lima Web Module</description> + <name>Lima :: report</name> + <description>Lima Report Module</description> <dependencies> <dependency> diff --git a/lima-web/src/license/THIRD-PARTY.properties b/lima-report/src/license/THIRD-PARTY.properties similarity index 100% rename from lima-web/src/license/THIRD-PARTY.properties rename to lima-report/src/license/THIRD-PARTY.properties diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java b/lima-report/src/main/java/org/chorem/lima/report/action/ReportBuilder.java similarity index 99% rename from lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java rename to lima-report/src/main/java/org/chorem/lima/report/action/ReportBuilder.java index 75423d1..1644306 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java +++ b/lima-report/src/main/java/org/chorem/lima/report/action/ReportBuilder.java @@ -1,8 +1,8 @@ -package org.chorem.lima.web.action; +package org.chorem.lima.report.action; /* * #%L - * Lima :: web + * Lima :: report * %% * Copyright (C) 2008 - 2014 CodeLutin * %% diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java similarity index 99% rename from lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java rename to lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java index f8c8cd1..961904b 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java @@ -20,7 +20,7 @@ * #L% */ -package org.chorem.lima.web.service; +package org.chorem.lima.report.service; import com.google.common.collect.Lists; import net.sf.jasperreports.engine.JasperReport; @@ -49,8 +49,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.Identity; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.web.action.ReportBuilder; -import org.chorem.lima.web.utils.DocumentsEnum; +import org.chorem.lima.report.action.ReportBuilder; +import org.chorem.lima.report.utils.DocumentsEnum; import javax.swing.*; import java.io.File; diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java b/lima-report/src/main/java/org/chorem/lima/report/service/HttpServerService.java similarity index 99% rename from lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java rename to lima-report/src/main/java/org/chorem/lima/report/service/HttpServerService.java index 3f0e3f5..a1e3486 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/HttpServerService.java @@ -1,8 +1,8 @@ -package org.chorem.lima.web.service; +package org.chorem.lima.report.service; /* * #%L - * Lima :: web + * Lima :: report * %% * Copyright (C) 2008 - 2014 CodeLutin * %% @@ -34,7 +34,7 @@ import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.Account; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.web.action.ReportBuilder; +import org.chorem.lima.report.action.ReportBuilder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; diff --git a/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java b/lima-report/src/main/java/org/chorem/lima/report/utils/DocumentsEnum.java similarity index 98% rename from lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java rename to lima-report/src/main/java/org/chorem/lima/report/utils/DocumentsEnum.java index bf10d78..4317ce4 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java +++ b/lima-report/src/main/java/org/chorem/lima/report/utils/DocumentsEnum.java @@ -20,7 +20,7 @@ * #L% */ -package org.chorem.lima.web.utils; +package org.chorem.lima.report.utils; import static org.nuiton.i18n.I18n.t; diff --git a/lima-web/src/main/resources/images/accounts.png b/lima-report/src/main/resources/images/accounts.png similarity index 100% rename from lima-web/src/main/resources/images/accounts.png rename to lima-report/src/main/resources/images/accounts.png diff --git a/lima-web/src/main/resources/images/entries.png b/lima-report/src/main/resources/images/entries.png similarity index 100% rename from lima-web/src/main/resources/images/entries.png rename to lima-report/src/main/resources/images/entries.png diff --git a/lima-web/src/main/resources/images/entrybooks.png b/lima-report/src/main/resources/images/entrybooks.png similarity index 100% rename from lima-web/src/main/resources/images/entrybooks.png rename to lima-report/src/main/resources/images/entrybooks.png diff --git a/lima-web/src/main/resources/images/fiscalperiods.png b/lima-report/src/main/resources/images/fiscalperiods.png similarity index 100% rename from lima-web/src/main/resources/images/fiscalperiods.png rename to lima-report/src/main/resources/images/fiscalperiods.png diff --git a/lima-web/src/main/resources/images/identity.png b/lima-report/src/main/resources/images/identity.png similarity index 100% rename from lima-web/src/main/resources/images/identity.png rename to lima-report/src/main/resources/images/identity.png diff --git a/lima-web/src/main/resources/images/puzzle_icon_mini.png b/lima-report/src/main/resources/images/puzzle_icon_mini.png similarity index 100% rename from lima-web/src/main/resources/images/puzzle_icon_mini.png rename to lima-report/src/main/resources/images/puzzle_icon_mini.png diff --git a/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml rename to lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml rename to lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml rename to lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml rename to lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml rename to lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml rename to lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml rename to lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml similarity index 100% rename from lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml rename to lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml diff --git a/lima-web/src/main/resources/log4j.properties b/lima-report/src/main/resources/log4j.properties similarity index 100% rename from lima-web/src/main/resources/log4j.properties rename to lima-report/src/main/resources/log4j.properties diff --git a/lima-web/src/main/resources/reports/vat_form_fr.pdf b/lima-report/src/main/resources/reports/vat_form_fr.pdf similarity index 100% rename from lima-web/src/main/resources/reports/vat_form_fr.pdf rename to lima-report/src/main/resources/reports/vat_form_fr.pdf diff --git a/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java b/lima-report/src/test/java/org/chorem/lima/report/action/ReportTest.java similarity index 94% rename from lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java rename to lima-report/src/test/java/org/chorem/lima/report/action/ReportTest.java index 159cc52..5826982 100644 --- a/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java +++ b/lima-report/src/test/java/org/chorem/lima/report/action/ReportTest.java @@ -1,4 +1,4 @@ -package org.chorem.lima.web.action; +package org.chorem.lima.report.action; /* * #%L @@ -23,7 +23,7 @@ package org.chorem.lima.web.action; */ import net.sf.jasperreports.engine.JRException; -import org.chorem.lima.web.service.DocumentService; +import org.chorem.lima.report.service.DocumentService; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/lima-web/LICENSE.txt b/lima-server/LICENSE.txt similarity index 100% rename from lima-web/LICENSE.txt rename to lima-server/LICENSE.txt diff --git a/lima-server/README.txt b/lima-server/README.txt new file mode 100644 index 0000000..23b5850 --- /dev/null +++ b/lima-server/README.txt @@ -0,0 +1,7 @@ +Pour configurer le client pour se connecter au serveur, éditez le fichier de configuration (lima-config.properties) qui se trouve ici : +Unix-like : $HOME/.config/lima-business.config +Windows 7 et + : C:\Users\USER_NAME\AppData\Roaming\lima-business.config +Mac OS : $HOME/Library/Application Support/lima-business.config + +Ajoutez les 2 lignes suivantes en remplaçant l'IP par celle du serveur : + java.naming.provider.url=ejbd://192.168.99.9:4201 diff --git a/lima-swing/pom.xml b/lima-server/pom.xml similarity index 67% copy from lima-swing/pom.xml copy to lima-server/pom.xml index 328678a..27e8f7c 100644 --- a/lima-swing/pom.xml +++ b/lima-server/pom.xml @@ -9,18 +9,15 @@ </parent> <groupId>org.chorem.lima</groupId> - <artifactId>lima-swing</artifactId> + <artifactId>lima-server</artifactId> - <name>Lima :: Swing</name> - <description>Lima main interface in Swing</description> + <name>Lima :: Server</name> + <description>Lima server module</description> <properties> - <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> - <redmine.releaseFiles> - target/lima-${project.version}-bin.zip + target/lima-server-${project.version}-bin.zip </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> @@ -31,9 +28,6 @@ META-INF/lima-THIRD-PARTY.txt </license.bundleThirdPartyPath> - <i18n.bundles>fr_FR,en_GB</i18n.bundles> - <i18n.bundleOutputName>lima</i18n.bundleOutputName> - <!-- uses some sun.xxx classes --> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> @@ -46,13 +40,13 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>lima-business-api</artifactId> + <artifactId>lima-business</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>lima-web</artifactId> + <artifactId>lima-business-api</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -63,83 +57,10 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-painters</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>lima-report</artifactId> + <version>${project.version}</version> + <scope>compile</scope> </dependency> <!-- for remote mode only --> @@ -161,40 +82,6 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <!-- FIXME tchemit 2015-02-28, please avoid to avoid those dependencies - here, this is for test purpose only, should have something about it - in business module... --> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-flyway</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - </dependencies> <build> @@ -204,15 +91,12 @@ <resource> <directory>src/main/resources</directory> <includes> - <include>lima-config.properties</include> + <include>lima-server.config</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>lima-config.properties</exclude> - </excludes> </resource> </resources> <pluginManagement> @@ -225,11 +109,8 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>org.chorem.lima.LimaMain</mainClass> + <mainClass>org.chorem.lima.LimaServer</mainClass> </manifest> - <manifestEntries> - <SplashScreen-Image>icons/puzzle_splash.png</SplashScreen-Image> - </manifestEntries> </archive> </configuration> </plugin> @@ -266,59 +147,12 @@ </jnlpExtensions> </configuration> </plugin> + </plugins> </pluginManagement> <plugins> <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> - <configuration> - <addCompileClassPath>true</addCompileClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - <configuration> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> - </entries> - </configuration> - </execution> - <execution> - <id>make-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - <configuration> - <generateCsvFile>true</generateCsvFile> - <bundleCsvFile>${project.build.directory}/lima-i18n.csv - </bundleCsvFile> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -505,7 +339,7 @@ <configuration> <dontWrapJar>true</dontWrapJar> <headerType>gui</headerType> - <outfile>target/lima.exe</outfile> + <outfile>target/lima-server.exe</outfile> <jar>lima.jar</jar> <errTitle>${project.name}</errTitle> <jre> diff --git a/lima-business/src/main/assembly/bin.xml b/lima-server/src/main/assembly/bin.xml similarity index 100% rename from lima-business/src/main/assembly/bin.xml rename to lima-server/src/main/assembly/bin.xml diff --git a/lima-business/src/main/assembly/lima-server b/lima-server/src/main/assembly/lima-server similarity index 100% rename from lima-business/src/main/assembly/lima-server rename to lima-server/src/main/assembly/lima-server diff --git a/lima-business/src/main/java/org/chorem/lima/LimaServer.java b/lima-server/src/main/java/org.chorem.lima/LimaServer.java similarity index 79% rename from lima-business/src/main/java/org/chorem/lima/LimaServer.java rename to lima-server/src/main/java/org.chorem.lima/LimaServer.java index ed07e6f..aa93b26 100644 --- a/lima-business/src/main/java/org/chorem/lima/LimaServer.java +++ b/lima-server/src/main/java/org.chorem.lima/LimaServer.java @@ -25,9 +25,11 @@ package org.chorem.lima; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.openejb.core.LocalInitialContextFactory; +import org.chorem.lima.report.service.HttpServerService; +import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.config.ApplicationConfig; import javax.naming.Context; -import javax.naming.InitialContext; import javax.naming.NamingException; import java.util.Properties; @@ -46,6 +48,9 @@ public class LimaServer { private static final Log log = LogFactory.getLog(LimaServer.class); + /** http serveur */ + protected static HttpServerService httpServerService; + /** * Lima server. * @@ -64,7 +69,11 @@ public class LimaServer { //properties.setProperty("ejbd.disabled", "false"); //properties.setProperty("ejbd.only_from", "127.0.0.1,192.168.1.1"); - new InitialContext(properties); + ApplicationConfig config = new ApplicationConfig(); + config.setOptions(properties); + LimaServiceFactory.initFactory(config); + + getHttpServerService(); // block main otherwize, main will end synchronized (properties) { @@ -79,4 +88,11 @@ public class LimaServer { log.info("LimaServer shutdown"); } } + + public static HttpServerService getHttpServerService() { + if (httpServerService == null) { + httpServerService = new HttpServerService(); + } + return httpServerService; + } } diff --git a/lima-server/src/main/resources/META-INF/ejb-jar.xml b/lima-server/src/main/resources/META-INF/ejb-jar.xml new file mode 100644 index 0000000..38b4710 --- /dev/null +++ b/lima-server/src/main/resources/META-INF/ejb-jar.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: business + %% + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!-- + Empty configuration file based on + http://openejb.apache.org/application-discovery-via-the-classpath.html + + Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ +--> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> + <!-- Le nom est a fixer sinon, il est généré et contient la version --> + <module-name>lima</module-name> + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.chorem.lima.business.LimaInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> +</ejb-jar> diff --git a/lima-business/src/main/resources/lima-config.properties b/lima-server/src/main/resources/log4j.properties similarity index 70% rename from lima-business/src/main/resources/lima-config.properties rename to lima-server/src/main/resources/log4j.properties index 1f0ddb1..2a75c2e 100644 --- a/lima-business/src/main/resources/lima-config.properties +++ b/lima-server/src/main/resources/log4j.properties @@ -19,10 +19,13 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### +# Global logging configuration +log4j.rootLogger=WARN, stdout -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:${lima.data.dir}/limadb -hibernate.jdbc.batch_size=50 +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 328678a..1068052 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -63,6 +63,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>lima-report</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <exclusions> @@ -204,14 +210,14 @@ <resource> <directory>src/main/resources</directory> <includes> - <include>lima-config.properties</include> + <include>lima-swing.config</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> <excludes> - <exclude>lima-config.properties</exclude> + <exclude>lima-swing.config</exclude> </excludes> </resource> </resources> diff --git a/lima-swing/src/main/filters/pom.properties b/lima-swing/src/main/filters/pom.properties index 0ab2863..dab6b41 100644 --- a/lima-swing/src/main/filters/pom.properties +++ b/lima-swing/src/main/filters/pom.properties @@ -20,9 +20,9 @@ # #L% ### # mock service -#serviceFactory.impl=org.chorem.lima.web.service.mock.MockServiceFactory +#serviceFactory.impl=org.chorem.lima.reportort.service.mock.MockServiceFactory # neogia service -#serviceFactory.impl=org.chorem.lima.web.service.neogia.NeogiaServiceFactory +#serviceFactory.impl=org.chorem.lima.reportort.service.neogia.NeogiaServiceFactory # callao implementation -serviceFactory.impl=org.chorem.lima.web.service.callao.CallaoServiceFactory +serviceFactory.impl=org.chorem.lima.report.service.callao.CallaoServiceFactory encoding=UTF-8 diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index 00cf568..4d0a194 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -27,11 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; +import org.chorem.lima.report.service.HttpServerService; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; import org.chorem.lima.ui.opening.OpeningView; -import org.chorem.lima.web.service.HttpServerService; import javax.swing.*; import java.util.Arrays; diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java index 2c17b11..54566a7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java @@ -87,7 +87,7 @@ public class LimaSwingApplicationContext extends DefaultApplicationContext { } protected static void initApplicationContext() { - LimaBusinessConfig.getInstance(); + LimaBusinessConfig.getInstance(LimaSwingConfig.Option.CONFIG_FILE.getDefaultValue()); } /** diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index e29b80d..4a77292 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -445,7 +445,7 @@ public class LimaSwingConfig extends ApplicationConfig { CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, t("lima.config.configFileName.label"), n("lima.config.configFileName.description"), - "lima-config.properties", + "lima-swing.config", String.class, true, true), DATA_DIR("lima.data.dir", @@ -517,7 +517,6 @@ public class LimaSwingConfig extends ApplicationConfig { OPENEJB_INCLUDE("openejb.deployments.classpath.include", "open_EJB_include","open_EJB_include", "", String.class, false, false), OPENEJB_EXCLUDE("openejb.deployments.classpath.exclude", "open_EJB_exclude","open_EJB_exclude", ".*", String.class, false, false), OPENEJB_DEPLOYMENTS_CLASSPATH_EAR("openejb.deployments.classpath.ear", "openejb.deployments.classpath.ear", "openejb.deployments.classpath.ear", "false", String.class, false, false), - INITIAL_CONTEXT_FACTORY("java.naming.factory.initial", "java.naming.factory.initial", "java.naming.factory.initial", "org.apache.openejb.core.LocalInitialContextFactory", String.class, false, false), LIMA_HOST_ADDRESS("lima.host.address", t("lima.config.host.address.label"), diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index 02fe187..ff0a87a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaMain; import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.LimaSwingConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.ui.account.AccountView; import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer; @@ -487,8 +488,8 @@ public class MainViewHandler { } public void loadURI(MainView ui) { - int port = LimaMain.getHttpServerService().getHttpPort(); - String address = LimaSwingConfig.getInstance().getHostAdress(); + int port = LimaMain.getHttpServerService().getHttpPort(); + String address = LimaBusinessConfig.getInstance().getHostAddress(); String url = "http://" + address + ":" + port + "/"; if (log.isDebugEnabled()) { diff --git a/lima-swing/src/main/resources/lima-config.properties b/lima-swing/src/main/resources/lima-swing.config similarity index 100% rename from lima-swing/src/main/resources/lima-config.properties rename to lima-swing/src/main/resources/lima-swing.config diff --git a/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java b/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java index 33f58a5..3bae008 100644 --- a/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java +++ b/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java @@ -145,7 +145,7 @@ public abstract class AbstractLimaTest { protected Properties getTestConfiguration() { // do not call parse() method (don't read /etc...) - // load file manually (lima-config.properties) + // load file manually (lima-business.config) Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); diff --git a/lima-web/src/main/resources/i18n/lima-web_en_GB.properties b/lima-web/src/main/resources/i18n/lima-web_en_GB.properties deleted file mode 100644 index 32f9a50..0000000 --- a/lima-web/src/main/resources/i18n/lima-web_en_GB.properties +++ /dev/null @@ -1,60 +0,0 @@ -lima-business.document.account= -lima-business.document.accountnumber= -lima-business.document.address= -lima-business.document.addressMore= -lima-business.document.adress= -lima-business.document.adresssuite= -lima-business.document.amount= -lima-business.document.amounts= -lima-business.document.amountsperiod= -lima-business.document.balance= -lima-business.document.businessnumber= -lima-business.document.city= -lima-business.document.classificationcode= -lima-business.document.credit= -lima-business.document.date= -lima-business.document.date.begin= -lima-business.document.date.end= -lima-business.document.dateformat= -lima-business.document.debit= -lima-business.document.description= -lima-business.document.entrybook= -lima-business.document.entrybooks= -lima-business.document.financialstatement= -lima-business.document.generalentrybook= -lima-business.document.grossamount= -lima-business.document.label= -lima-business.document.ledger= -lima-business.document.monthformat= -lima-business.document.movementcredit= -lima-business.document.movementdebit= -lima-business.document.netamount= -lima-business.document.period1= -lima-business.document.period1format= -lima-business.document.period2= -lima-business.document.period2format= -lima-business.document.provisiondeprecationamount= -lima-business.document.society= -lima-business.document.solde= -lima-business.document.soldecredit= -lima-business.document.soldedebit= -lima-business.document.vat= -lima-business.document.vatnumber= -lima-business.document.voucher= -lima-business.document.zipcode= -lima.financialtransaction.account= -lima.fiscalperiod.fiscalperiod= -lima.reports.account.noAccount= -lima.reports.account.noAccountTitle= -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= -lima.reports.accounts= -lima.table.credit= -lima.table.date= -lima.table.debit= -lima.table.description= -lima.table.entryBook= -lima.table.entrybook= -lima.table.letter= -lima.table.number= -lima.table.voucher= diff --git a/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties b/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties deleted file mode 100644 index 32f9a50..0000000 --- a/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties +++ /dev/null @@ -1,60 +0,0 @@ -lima-business.document.account= -lima-business.document.accountnumber= -lima-business.document.address= -lima-business.document.addressMore= -lima-business.document.adress= -lima-business.document.adresssuite= -lima-business.document.amount= -lima-business.document.amounts= -lima-business.document.amountsperiod= -lima-business.document.balance= -lima-business.document.businessnumber= -lima-business.document.city= -lima-business.document.classificationcode= -lima-business.document.credit= -lima-business.document.date= -lima-business.document.date.begin= -lima-business.document.date.end= -lima-business.document.dateformat= -lima-business.document.debit= -lima-business.document.description= -lima-business.document.entrybook= -lima-business.document.entrybooks= -lima-business.document.financialstatement= -lima-business.document.generalentrybook= -lima-business.document.grossamount= -lima-business.document.label= -lima-business.document.ledger= -lima-business.document.monthformat= -lima-business.document.movementcredit= -lima-business.document.movementdebit= -lima-business.document.netamount= -lima-business.document.period1= -lima-business.document.period1format= -lima-business.document.period2= -lima-business.document.period2format= -lima-business.document.provisiondeprecationamount= -lima-business.document.society= -lima-business.document.solde= -lima-business.document.soldecredit= -lima-business.document.soldedebit= -lima-business.document.vat= -lima-business.document.vatnumber= -lima-business.document.voucher= -lima-business.document.zipcode= -lima.financialtransaction.account= -lima.fiscalperiod.fiscalperiod= -lima.reports.account.noAccount= -lima.reports.account.noAccountTitle= -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= -lima.reports.accounts= -lima.table.credit= -lima.table.date= -lima.table.debit= -lima.table.description= -lima.table.entryBook= -lima.table.entrybook= -lima.table.letter= -lima.table.number= -lima.table.voucher= diff --git a/pom.xml b/pom.xml index ce83f9b..5c2cfa0 100644 --- a/pom.xml +++ b/pom.xml @@ -138,8 +138,10 @@ <module>lima-callao</module> <module>lima-business-api</module> <module>lima-business</module> + <module>lima-report</module> + <module>lima-server</module> <module>lima-swing</module> - <module>lima-web</module> + </modules> <scm> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.