This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit 7874dd6b238860e5be4e6d12d89e869840bcd488 Author: dcosse <cosse@codelutin.com> Date: Sat Apr 11 17:51:05 2015 +0200 refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur --- lima-business-api/pom.xml | 13 ----------- .../chorem/lima/business/LimaServiceFactory.java | 8 ------- .../chorem/lima/business/api/OptionsService.java | 2 +- .../chorem/lima/business/LimaBusinessConfig.java | 26 ++++++++++++++-------- .../lima/business/ejb/OptionsServiceImpl.java | 6 ++--- .../resources/i18n/lima-business_en_GB.properties | 3 +++ .../resources/i18n/lima-business_fr_FR.properties | 9 ++++---- lima-server/README.txt | 16 +++++++++++-- lima-server/pom.xml | 1 - .../org/chorem/lima/server/HttpServerService.java | 5 +++-- .../java/org/chorem/lima/server/LimaServer.java | 13 ++++++++--- .../org/chorem/lima/server/LimaServerConfig.java | 11 +++++++-- lima-swing/README.txt | 4 ++-- .../main/java/org/chorem/lima/LimaSwingConfig.java | 13 +---------- .../java/org/chorem/lima/ui/MainViewHandler.java | 16 ++++--------- .../resources/i18n/lima-swing_en_GB.properties | 8 ++----- .../resources/i18n/lima-swing_fr_FR.properties | 2 ++ 17 files changed, 76 insertions(+), 80 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 7dc9469..993ea43 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -25,17 +25,8 @@ <artifactId>javaee-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <scope>compile</scope> - </dependency> <!-- for remote mode only --> <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-client</artifactId> - </dependency> - <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> </dependency> @@ -44,10 +35,6 @@ <artifactId>nuiton-config</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java b/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java index e3c4b20..f5396c1 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/LimaServiceFactory.java @@ -24,11 +24,8 @@ package org.chorem.lima.business; import com.google.common.base.Preconditions; 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.apache.openejb.core.LocalInitialContextFactory; import org.nuiton.config.ApplicationConfig; import javax.ejb.embeddable.EJBContainer; @@ -79,11 +76,6 @@ public class LimaServiceFactory { props.putAll(config.getOptionStartsWith("java.naming")); props.putAll(config.getOptionStartsWith("ejbd")); props.putAll(config.getOptionStartsWith("openejb")); - if (StringUtils.isBlank(config.getOption(Context.PROVIDER_URL)) || Boolean.valueOf(config.getOption("openejb.embedded.remotable"))) { - props.put(Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName()); - } else { - 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-api/src/main/java/org/chorem/lima/business/api/OptionsService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/OptionsService.java index 1902938..f64a540 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/OptionsService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/OptionsService.java @@ -54,7 +54,7 @@ public interface OptionsService extends BigDecimalToString.Config { LimaConfigOptionDef getThousandSeparatorOption(); - String getLimaHttpHost(); + String getLimaHostAddress(); int getLimaHttpPort(); 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 6463992..9af6496 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 @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; 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.LimaTechnicalException; import org.chorem.lima.business.accountingrules.FranceAccountingRules; import org.chorem.lima.business.config.LimaConfigOptionDef; @@ -36,6 +37,7 @@ import org.nuiton.config.ArgumentsParserException; import org.nuiton.topia.flyway.TopiaFlywayService; import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import javax.naming.Context; import java.io.File; import java.util.Map; import java.util.Properties; @@ -264,23 +266,28 @@ public class LimaBusinessConfig { config.saveForUser(); } - public String getHttpHost() { - String host = config.getOption(BusinessConfigOption.HTTP_HOST.getKey()); + public String getHostAddress() { + String host = config.getOption(BusinessConfigOption.HOST_ADDRESS.getKey()); return host; } - public void setHttpHost(String serverAddress) { - config.setOption(BusinessConfigOption.HTTP_HOST.key, serverAddress); + public void setHostAddress(String serverAddress) { + config.setOption(BusinessConfigOption.HOST_ADDRESS.key, serverAddress); config.saveForUser(); } - public int getHttpPort() { - int port = config.getOptionAsInt(BusinessConfigOption.HTTP_PORT.getKey()); + public int getHostEjbPort() { + int port = config.getOptionAsInt(BusinessConfigOption.HOST_EJB_PORT.getKey()); + return port; + } + + public int getHostHttpPort() { + int port = config.getOptionAsInt(BusinessConfigOption.HOST_HTTP_PORT.getKey()); return port; } public void setHttpPort(int port) { - config.setOption(BusinessConfigOption.HTTP_PORT.key, String.valueOf(port)); + config.setOption(BusinessConfigOption.HOST_HTTP_PORT.key, String.valueOf(port)); config.saveForUser(); } @@ -306,8 +313,9 @@ public class LimaBusinessConfig { DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), RULES_NATIONALTY("lima.rules", n("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), - HTTP_HOST("lima.serveraddress", n("lima.config.serveraddress.description"), "localhost", String.class, false, false), - HTTP_PORT("lima.httpport", n("lima.config.httpport.description"), "5462", Integer.class, false, false), + HOST_ADDRESS("lima.host.address", n("lima.host.address.description"), "localhost", String.class, false, false), + HOST_EJB_PORT("ejbd.port", n("lima.host.ejb.port.description"), "4202", Integer.class, false, false), + HOST_HTTP_PORT("lima.host.http.port", n("lima.host.http.port.description"), "5462", Integer.class, false, false), SCALE("lima.data.bigDecimal.scale", t("lima.config.scale.label"), n("lima.config.scale.description"), "2", String.class, false, false), CURRENCY("lima.config.currency", t("lima.config.currency.label"), n("lima.config.currency.description"), "false", Boolean.class, false, false), diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java index 13d10d6..a70a5e0 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java @@ -93,13 +93,13 @@ public class OptionsServiceImpl extends AbstractLimaService implements OptionsSe } @Override - public String getLimaHttpHost() { - return LimaBusinessConfig.getInstance().getHttpHost(); + public String getLimaHostAddress() { + return LimaBusinessConfig.getInstance().getHostAddress(); } @Override public int getLimaHttpPort() { - return LimaBusinessConfig.getInstance().getHttpPort(); + return LimaBusinessConfig.getInstance().getHostHttpPort(); } } 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 64a3eef..75bd611 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 @@ -82,6 +82,9 @@ lima.config.thousandSeparator.label= lima.configFileName.description=Descriontion lima.financialtransaction.account=Account lima.fiscalperiod.fiscalperiod=Fiscal period +lima.host.address.description= +lima.host.ejb.port.description= +lima.host.http.port.description= lima.importexport.import.alreadyExistFinancialStatement=Same financial statement exists lima.lettering.accountRegularization=Regulatory account lima.reports.account.noAccount=Any account present 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 e754859..9a1c334 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 @@ -72,23 +72,24 @@ 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.host.address.description=Adresse du serveur LIMA +lima.config.host.http.port.description=Port HTTP lima.config.reports.dir.description=Dossier des rapports lima.config.reportvatpdfurl.description=Chemin du raport lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.scale.label= -lima.config.serveraddress.description=Addresse serveur lima.config.thousandSeparator.description= lima.config.thousandSeparator.label= lima.configFileName.description= lima.financialtransaction.account=compte lima.fiscalperiod.fiscalperiod=Période fiscale +lima.host.address.description=Addresse serveur +lima.host.ejb.port.description=Port pour connexion du client au serveur +lima.host.http.port.description=Port du serveur web de Lima lima.importexport.import.alreadyExistFinancialStatement=Transaction financière exitante lima.lettering.accountRegularization=Compte de régulation lima.reports.account.noAccount=Aucun compte présent -lima.reports.account.noAccountTitle=Aucun compte lima.reports.accounts=Comptes lima.table.credit=Credit lima.table.date=Date diff --git a/lima-server/README.txt b/lima-server/README.txt index a211aa1..a24302b 100644 --- a/lima-server/README.txt +++ b/lima-server/README.txt @@ -1,7 +1,19 @@ +****************** Configuration du serveur ****************** + +Éditez le fichier de configuration (lima-server.config) qui se trouve ici : +Unix-like : $HOME/.config/lima-server.config +Windows 7 et + : C:\Users\USER_NAME\AppData\Roaming\lima-server.config +Mac OS : $HOME/Library/Application Support/lima-server.config + +Ajoutez la ligne suivantes sur en remplaçant l'IP en exemple (192.168.1.37) par celle du serveur : +lima.host.address=192.168.1.37 + +****************** Configuration du client ****************** + Pour configurer le client pour se connecter au serveur, éditez le fichier de configuration (lima-swing.config) qui se trouve ici : Unix-like : $HOME/.config/lima-swing.config Windows 7 et + : C:\Users\USER_NAME\AppData\Roaming\lima-swing.config Mac OS : $HOME/Library/Application Support/lima-swing.config -Ajoutez la ligne suivantes sur en remplaçant l'IP par celle du serveur : - java.naming.provider.url=ejbd://192.168.99.9:4201 +Ajoutez la ligne suivantes sur en remplaçant l'IP en exemple (192.168.1.37) par celle du serveur : +lima.host.address=192.168.1.37 \ No newline at end of file diff --git a/lima-server/pom.xml b/lima-server/pom.xml index bc0a00d..15ab3a4 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -72,7 +72,6 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> - <scope>runtime</scope> </dependency> <dependency> diff --git a/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java index e259b5f..dfea242 100644 --- a/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java +++ b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java @@ -89,7 +89,8 @@ public class HttpServerService { server.start(); if (log.isInfoEnabled()) { - log.info("Web server running on port: " + limaHttpPort); + String urlFormat = "http://%s:%d"; + log.info(String.format("Web server running on :" + urlFormat, limaHttpHost, limaHttpPort)); } } catch (Exception eee) { @@ -102,7 +103,7 @@ public class HttpServerService { OptionsService optionsService = LimaServiceFactory.getService(OptionsService.class); - limaHttpHost = optionsService.getLimaHttpHost(); + limaHttpHost = optionsService.getLimaHostAddress(); limaHttpPort = optionsService.getLimaHttpPort(); documentService = new DocumentService(); } diff --git a/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java b/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java index a2aa1b2..ba7418b 100644 --- a/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java +++ b/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java @@ -30,6 +30,7 @@ import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.report.LimaReportConfig; import org.nuiton.config.ApplicationConfig; +import org.apache.openejb.client.RemoteInitialContextFactory; import javax.naming.Context; import javax.naming.NamingException; @@ -49,6 +50,7 @@ import java.util.Properties; public class LimaServer { private static final Log log = LogFactory.getLog(LimaServer.class); + public static final String EJB_URL = "ejbd://%s:%d"; /** http serveur */ protected static HttpServerService httpServerService; @@ -69,7 +71,6 @@ public class LimaServer { LimaServerConfig serverConfig = LimaServerConfig.getInstance(accountabilityName); Properties properties = serverConfig.getFlatOptions(); - properties.put("openejb.embedded.remotable", "true"); launch(serverConfig.getConfig()); @@ -91,8 +92,8 @@ public class LimaServer { public static void launch(ApplicationConfig moduleConfig) { - boolean mustStartServer = StringUtils.isBlank(moduleConfig.getOption(Context.PROVIDER_URL)) || - moduleConfig.getOptionAsBoolean("openejb.embedded.remotable"); + boolean mustStartServer = StringUtils.isBlank(moduleConfig.getOption(LimaBusinessConfig.BusinessConfigOption.HOST_ADDRESS.getKey())) || + moduleConfig.getOptionAsBoolean(LimaServerConfig.ServerConfigOption.EJB_REMOTABLE.getKey()); ApplicationConfig initConfig = moduleConfig; @@ -101,6 +102,12 @@ public class LimaServer { initConfig = LimaServerConfig.getInstance(initConfig).getConfig(); initConfig = LimaBusinessConfig.getInstance(initConfig).getConfig(); initConfig = LimaReportConfig.getInstance(initConfig).getConfig(); + } else { + LimaBusinessConfig config = LimaBusinessConfig.getInstance(initConfig); + initConfig = config.getConfig(); + String url = String.format(EJB_URL, config.getHostAddress(), config.getHostEjbPort()); + initConfig.setOption(Context.PROVIDER_URL, url); + initConfig.setOption(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName()); } // start EJB container (either local or remote) diff --git a/lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java b/lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java index 04020ac..54680a5 100644 --- a/lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java +++ b/lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java @@ -124,14 +124,21 @@ public class LimaServerConfig { } + public Integer getHostEjbPort() { + Integer port = Integer.parseInt(getConfig().getOption(ServerConfigOption.EJB_PORT.key)); + return port; + } + + public void setHostPort(String host) { + getConfig().setOption(ServerConfigOption.EJB_PORT.key, host); + } + public enum ServerConfigOption implements ConfigOptionDef { EJB_INITIAL_CONTEXT_FACTORY(Context.INITIAL_CONTEXT_FACTORY, "", LocalInitialContextFactory.class.getName(), String.class, false, true), EJB_REMOTABLE("openejb.embedded.remotable", "", "true", Boolean.class, false, true), EJB_PORT("ejbd.port", "", "4202", Integer.class, false, false), EJB_BIND("ejbd.bind", "", "0.0.0.0", String.class, false, false); - - private final String key; private final String description; diff --git a/lima-swing/README.txt b/lima-swing/README.txt index e27b3df..4ff3572 100644 --- a/lima-swing/README.txt +++ b/lima-swing/README.txt @@ -25,5 +25,5 @@ Unix-like : $HOME/.config/lima-swing.config Windows 7 et + : C:\Users\USER_NAME\AppData\Roaming\lima-swing.config Mac OS : $HOME/Library/Application Support/lima-swing.config -Ajoutez la ligne suivantes sur en remplaçant l'IP par celle du serveur : - java.naming.provider.url=ejbd://192.168.99.9:4201 \ No newline at end of file +Ajoutez la ligne suivantes sur en remplaçant l'IP en exemple (192.168.1.37) par celle du serveur : +lima.host.address=192.168.1.37 \ No newline at end of file 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 4c4f2bb..5f02b0e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -28,15 +28,13 @@ import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.actions.MiscAction; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.OptionsService; import org.chorem.lima.business.config.LimaConfigOptionDef; import org.chorem.lima.business.utils.BigDecimalToString; -import org.chorem.lima.entity.LimaCallaoEntityEnum; -import org.chorem.lima.business.LimaServiceFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.converter.ConverterUtil; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.util.version.Version; import org.nuiton.util.version.VersionBuilder; @@ -324,9 +322,6 @@ public class LimaSwingConfig extends ApplicationConfig implements BigDecimalToSt return result; } - public String getHostAdress() { - return getOption(Option.LIMA_HOST_ADDRESS.key); - } public void setColorSelectionFocus(String color) { setOption(Option.COLOR_SELECTION_FOCUS.key, color); @@ -422,12 +417,6 @@ public class LimaSwingConfig extends ApplicationConfig implements BigDecimalToSt "false", String.class, false, false), - LIMA_HOST_ADDRESS("lima.host.address", - t("lima.config.host.address.label"), - n("lima.config.host.address.description"), - "localhost", - String.class, false, false), - LIMA_STATE_FILE("lima.ui.state.file", t("lima.config.state.file.label"), n("lima.config.state.file.description"), 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 6612a25..4d3eacf 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 @@ -29,9 +29,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.LimaSwingConfig; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.OptionsService; import org.chorem.lima.enums.ImportExportEnum; -import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.ui.account.AccountView; import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer; import org.chorem.lima.ui.celleditor.NumberSeparatorTableCellRenderer; @@ -50,19 +50,12 @@ import org.chorem.lima.ui.vatchart.VatChartView; import org.nuiton.util.DesktopUtil; import org.nuiton.widget.SwingSession; -import javax.swing.DefaultCellEditor; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JEditorPane; -import javax.swing.JScrollPane; -import javax.swing.JTabbedPane; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.plaf.BorderUIResource; -import java.awt.Component; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -70,7 +63,6 @@ import java.net.URI; import java.net.URL; import java.util.Locale; -import static org.nuiton.i18n.I18n.setDefaultLocale; import static org.nuiton.i18n.I18n.t; /** @@ -507,7 +499,7 @@ public class MainViewHandler { OptionsService optionsService = LimaServiceFactory.getService(OptionsService.class); - String host = optionsService.getLimaHttpHost(); + String host = optionsService.getLimaHostAddress(); int port = optionsService.getLimaHttpPort(); String url; diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 3bdaec0..1644207 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -89,15 +89,11 @@ lima.config.currency.description=Show currency symbol lima.config.currency.label=currency lima.config.data.dir.description=LIMA data directory lima.config.data.dir.label=Data directory -lima.config.decimalSeparator.description=Decimal separator lima.config.decimalSeparator.label=Decimal separator lima.config.documentReport.account.documentReportModelPath.description= lima.config.documentReport.balance.balanceAccountReportModelPath.description= lima.config.documentReport.balance.balanceSubAccountReportModelPath.description= lima.config.documentReport.balance.documentReportModelPath.description= -lima.config.documentReport.balanceReportAccount.description= -lima.config.documentReport.bigDecimalFormat.description= -lima.config.documentReport.bigDecimalFormat.label= lima.config.documentReport.entrybook.documentReportModelPath.description= lima.config.documentReport.entrybook.entryBookModelPath.description= lima.config.documentReport.entrybook.financialPeriodModelPath.description= @@ -105,8 +101,8 @@ lima.config.documentReport.entrybook.transactionReportModelPath.description= lima.config.documentReport.generalEntrybook.documentReportModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description= -lima.config.host.address.description=Host address -lima.config.host.address.label=Host +lima.config.host.address.description=LIMA host address +lima.config.host.http.port.description=HTTP port lima.config.i18n.dir.description=Translation directory lima.config.i18n.dir.label=Translation directory lima.config.locale.description=Localization used by LIMA diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 73550e7..aa31b6b 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -111,6 +111,8 @@ lima.config.documentReport.generalLedger.documentReportModelPath.description=fic 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=Adresse du serveur distant lima.config.host.address.label=Serveur +lima.config.host.port.description= +lima.config.host.port.label= lima.config.i18n.dir.description=Dossier contenant les traduction de lima lima.config.i18n.dir.label=dossier de traduction lima.config.locale.description=Paramétres local utilisés par l'application -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.