This is an automated email from the git hooks/post-receive script. New commit to branch feature/1190-encodage-path in repository lima. See http://git.chorem.org/lima.git commit 139b85e31afa3e25e5e1427be7469df2013a6dc8 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu Mar 12 14:08:27 2015 +0100 refs #1190 Revue de code : -renommage LimaServiceConfig en LimaBusinessConfig ; -correction des Lima*Config pour la définition du nom de la propriété de conf, ainsi que le nom du fichier de conf par défaut (lima-config.properties) --- lima-business/README.txt | 12 ++++--- .../src/main/java/org/chorem/lima/LimaServer.java | 8 ++++- ...aServiceConfig.java => LimaBusinessConfig.java} | 26 +++++++------- .../org/chorem/lima/business/LimaInterceptor.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 8 ++--- .../lima/business/ejb/EntryBookServiceImpl.java | 7 ++-- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +-- .../ejb/FinancialTransactionServiceImpl.java | 16 ++++----- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 8 ++--- .../lima/business/ejb/OptionsServiceImpl.java | 40 +++++++++++----------- .../lima/business/utils/BigDecimalToString.java | 4 +-- .../org/chorem/lima/business/AbstractLimaTest.java | 6 ++-- .../org/chorem/lima/business/LimaMiscTest.java | 4 +-- .../org/chorem/lima/business/LimaTestsConfig.java | 4 +-- .../accountingrules/AccountServiceRuleFrTest.java | 8 ++--- .../EntryBookServiceRuleFrTest.java | 8 ++--- .../FinancialPeriodServiceRuleFrTest.java | 8 ++--- .../FinancialTransactionServiceRuleFrTest.java | 8 ++--- .../FiscalPeriodServiceRuleFrTest.java | 8 ++--- .../accountingrules/ImportServiceRuleFrTest.java | 8 ++--- .../accountingrules/ReportServiceRuleFrTest.java | 8 ++--- .../src/main/java/org/chorem/lima/LimaMain.java | 4 +-- .../chorem/lima/LimaSwingApplicationContext.java | 4 +-- .../main/java/org/chorem/lima/LimaSwingConfig.java | 6 ++-- .../java/org/chorem/lima/ui/AbstractLimaTest.java | 8 ++--- .../java/org/chorem/lima/ui/LimaTestsConfig.java | 6 ++-- .../org/chorem/lima/web/action/ReportBuilder.java | 4 +-- .../chorem/lima/web/service/DocumentService.java | 4 +-- .../chorem/lima/web/service/HttpServerService.java | 14 ++++---- 29 files changed, 129 insertions(+), 126 deletions(-) diff --git a/lima-business/README.txt b/lima-business/README.txt index 5971651..ea7d020 100644 --- a/lima-business/README.txt +++ b/lima-business/README.txt @@ -1,6 +1,8 @@ -Configurer le client pour se connecter au serveur via le fichier de configuration : -UNIX LIKE:$HOME/.config/lima.properties -7 et +: C:\Users\USER_NAME\AppData\Roaming\lima.properties +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 -java.naming.factory.initial=org.apache.openejb.client.RemoteInitialContextFactory -java.naming.provider.url=ejbd://192.168.99.9:4201 \ No newline at end of file +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/src/main/java/org/chorem/lima/LimaServer.java b/lima-business/src/main/java/org/chorem/lima/LimaServer.java index 3df474e..ed07e6f 100644 --- a/lima-business/src/main/java/org/chorem/lima/LimaServer.java +++ b/lima-business/src/main/java/org/chorem/lima/LimaServer.java @@ -22,6 +22,8 @@ package org.chorem.lima; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.openejb.core.LocalInitialContextFactory; import javax.naming.Context; @@ -42,6 +44,8 @@ import java.util.Properties; */ public class LimaServer { + private static final Log log = LogFactory.getLog(LimaServer.class); + /** * Lima server. * @@ -71,6 +75,8 @@ public class LimaServer { } } - System.out.println("Server shutdown"); + if (log.isInfoEnabled()) { + log.info("LimaServer shutdown"); + } } } diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java similarity index 96% rename from lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java rename to lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java index bca00dd..f255180 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java @@ -57,23 +57,21 @@ import static org.nuiton.i18n.I18n.t; * Last update : $Date$ * By : $Author$ */ -public class LimaServiceConfig { +public class LimaBusinessConfig { - protected static final Log log = LogFactory.getLog(LimaServiceConfig.class); + protected static final Log log = LogFactory.getLog(LimaBusinessConfig.class); protected static AccountingRules accountingRules; - protected static final String CONFIG_FILE_NAME = "lima.properties"; - protected ApplicationConfig config; protected Properties rootContextProperties; - protected static volatile LimaServiceConfig instance; + protected static volatile LimaBusinessConfig instance; - private LimaServiceConfig(String configFileName) { + private LimaBusinessConfig(String configFileName) { try { - ApplicationConfig defaultConfig = new ApplicationConfig(ServiceConfigOption.CONFIG_FILE.defaultValue); + ApplicationConfig defaultConfig = new ApplicationConfig(ServiceConfigOption.CONFIG_FILE.getDefaultValue()); defaultConfig.loadDefaultOptions(ServiceConfigOption.values()); defaultConfig.parse(); @@ -121,16 +119,16 @@ public class LimaServiceConfig { this.rootContextProperties = rootContextProperties; } - public synchronized static LimaServiceConfig getInstance(String configFileName) { + public synchronized static LimaBusinessConfig getInstance(String configFileName) { if (instance == null) { - instance= new LimaServiceConfig(configFileName); + instance= new LimaBusinessConfig(configFileName); } return instance; } - public static LimaServiceConfig getInstance() { + public static LimaBusinessConfig getInstance() { if (instance == null) { - instance= new LimaServiceConfig(null); + instance= new LimaBusinessConfig(null); } return instance; } @@ -187,7 +185,7 @@ public class LimaServiceConfig { } public void setConfigFile(String configFile) { - LimaServiceConfig.getInstance().config.setOption(ServiceConfigOption.CONFIG_FILE.key, configFile); + LimaBusinessConfig.getInstance().config.setOption(ServiceConfigOption.CONFIG_FILE.key, configFile); } public String getApplicationVersion() { @@ -195,7 +193,7 @@ public class LimaServiceConfig { } public void setAccountingRule(String accountingRule) { - LimaServiceConfig.getInstance().config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); + LimaBusinessConfig.getInstance().config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); // clear cache loadAccountingRules(); } @@ -505,7 +503,7 @@ public class LimaServiceConfig { */ public enum ServiceConfigOption implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima-config.properties", String.class, true, true), 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), diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java b/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java index 2060b46..8681c41 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java @@ -80,7 +80,7 @@ public class LimaInterceptor { } LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext( - LimaServiceConfig.getRootContextProperties(), + LimaBusinessConfig.getRootContextProperties(), LimaConfigurationHelper.getCreateTopiaContextFunction()); LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java index f31c240..fa33638 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java @@ -24,7 +24,7 @@ package org.chorem.lima.business.ejb; import org.apache.commons.lang.StringUtils; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; @@ -107,7 +107,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe protected Account createNewAccount(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException, NotAllowedLabelException { // check rules before create the account - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); accountingRules.createAccountRules(account); // force uppercase account number @@ -191,7 +191,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe @Override public void removeAccount(Account account) throws UsedAccountException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); // Check rules for account if have entries accountingRules.removeAccountRules(account); @@ -214,7 +214,7 @@ public class AccountServiceImpl extends AbstractLimaService implements AccountSe @Override public Account updateAccount(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); // DAO AccountTopiaDao accountDao = getDaoHelper().getAccountDao(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java index 048ffa7..fbdff26 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java @@ -23,9 +23,9 @@ package org.chorem.lima.business.ejb; import com.google.common.collect.Lists; -import org.apache.commons.lang3.StringUtils; + import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.UsedEntryBookException; @@ -34,7 +34,6 @@ import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.ClosedPeriodicEntryBookTopiaDao; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookTopiaDao; -import org.chorem.lima.entity.EntryTopiaDao; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodTopiaDao; import org.nuiton.util.beans.Binder; @@ -149,7 +148,7 @@ public class EntryBookServiceImpl extends AbstractLimaService implements EntryBo public void removeEntryBook(EntryBook entryBook) throws UsedEntryBookException { // check rule - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); accountingRules.removeEntryBookRules(entryBook); // re-attach to current transaction diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java index 6767275..8e62747 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.exceptions.NotLockedClosedPeriodicEntryBooksException; import org.chorem.lima.business.exceptions.UnbalancedFinancialTransactionsException; @@ -92,7 +92,7 @@ public class FinancialPeriodServiceImpl extends AbstractLimaService implements F @Override public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws UnbalancedFinancialTransactionsException, UnfilledEntriesException, WithoutEntryBookFinancialTransactionsException, NotLockedClosedPeriodicEntryBooksException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); ClosedPeriodicEntryBook result; // check rules before create the account diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index 9e82fb4..73a5959 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.FinancialTransactionCondition; import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; @@ -111,7 +111,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction, Boolean validAccountingRules) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); if (validAccountingRules) { //check if the financial period is blocked @@ -321,7 +321,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); //check rules accountingRules.addLetter(oldEntries); @@ -489,7 +489,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException, LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); FinancialTransaction financialTransactionOld = transactionTopiaDao.forTopiaIdEquals(financialTransaction.getTopiaId()).findUnique(); @@ -510,7 +510,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme throws LockedFinancialPeriodException, LockedEntryBookException { // check if the financial period is blocked - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction); FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); @@ -527,7 +527,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme @Override public Entry createEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( @@ -545,7 +545,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme @Override public void updateEntry(Entry entry) throws LockedEntryBookException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); @@ -567,7 +567,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme @Override public void removeEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); FinancialTransaction financialTransaction = entry.getFinancialTransaction(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java index 5699b98..840ff7d 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -112,7 +112,7 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); // fix begin date at midnight and end date at 23:59:59.999 Date beginDate = fiscalPeriod.getBeginDate(); @@ -233,7 +233,7 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc public FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws AlreadyLockedFiscalPeriodException, LastUnlockedFiscalPeriodException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); if (fiscalPeriod.isLocked()) { throw new AlreadyLockedFiscalPeriodException(fiscalPeriod); @@ -494,7 +494,7 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc @Override public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws NoEmptyFiscalPeriodException { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); //get entities with TopiaDao FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); 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 f29706a..00e4204 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 @@ -21,7 +21,7 @@ */ package org.chorem.lima.business.ejb; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.OptionsService; import org.chorem.lima.business.utils.BigDecimalToString; @@ -37,8 +37,8 @@ public class OptionsServiceImpl extends AbstractLimaService implements OptionsSe protected String vatPDFUrl; public OptionsServiceImpl() { - scale = LimaServiceConfig.getInstance().getScale(); - vatPDFUrl = LimaServiceConfig.getInstance().getVatPDFUrl(); + scale = LimaBusinessConfig.getInstance().getScale(); + vatPDFUrl = LimaBusinessConfig.getInstance().getVatPDFUrl(); BigDecimalToString.generateDecimalFormat(); } @@ -49,86 +49,86 @@ public class OptionsServiceImpl extends AbstractLimaService implements OptionsSe @Override public void setScale(String scale) { - LimaServiceConfig.getInstance().setScale(scale); + LimaBusinessConfig.getInstance().setScale(scale); BigDecimalToString.generateDecimalFormat(); } @Override public void setThousandSeparator(String thousandSeparator) { - LimaServiceConfig.getInstance().setThousandSeparator(thousandSeparator); + LimaBusinessConfig.getInstance().setThousandSeparator(thousandSeparator); BigDecimalToString.generateDecimalFormat(); } @Override public void setCurrency(boolean currency) { - LimaServiceConfig.getInstance().setCurrency(Boolean.toString(currency)); + LimaBusinessConfig.getInstance().setCurrency(Boolean.toString(currency)); BigDecimalToString.generateDecimalFormat(); } @Override public void setDecimalSeparator(String decimalSeparator) { - LimaServiceConfig.getInstance().setDecimalSeparator(decimalSeparator); + LimaBusinessConfig.getInstance().setDecimalSeparator(decimalSeparator); BigDecimalToString.generateDecimalFormat(); } @Override public void setReportsDir(String path) { - LimaServiceConfig.getInstance().setReportsModelDir(path); + LimaBusinessConfig.getInstance().setReportsModelDir(path); } @Override public void setAccountReportPath(String path) { - LimaServiceConfig.getInstance().setAccountReportModelPath(path); + LimaBusinessConfig.getInstance().setAccountReportModelPath(path); } @Override public void setBalanceReportPath(String path) { - LimaServiceConfig.getInstance().setBalanceDocumentReportModelPath(path); + LimaBusinessConfig.getInstance().setBalanceDocumentReportModelPath(path); } @Override public void setBalanceReportAccountReportPath(String path) { - LimaServiceConfig.getInstance().setBalanceAccountReportModelPath(path); + LimaBusinessConfig.getInstance().setBalanceAccountReportModelPath(path); } @Override public void setBalanceSubAccountReportPath(String path) { - LimaServiceConfig.getInstance().setBalanceSubAccountReportModelPath(path); + LimaBusinessConfig.getInstance().setBalanceSubAccountReportModelPath(path); } @Override public void setGeneralEntryBookEntryBookMainReportPath(String path) { - LimaServiceConfig.getInstance().setGeneralEntryBookDocumentReportModelPath(path); + LimaBusinessConfig.getInstance().setGeneralEntryBookDocumentReportModelPath(path); } @Override public void setGeneralEntryBookPeriodReportPath(String path) { - LimaServiceConfig.getInstance().setGeneralEntryBookReportModelPath(path); + LimaBusinessConfig.getInstance().setGeneralEntryBookReportModelPath(path); } @Override public void setGeneralEntryBookGeneralEntryBookReportPath(String path) { - LimaServiceConfig.getInstance().setGeneralEntryBookEntryReportModelPath(path); + LimaBusinessConfig.getInstance().setGeneralEntryBookEntryReportModelPath(path); } @Override public void setProvisionalEntryBookEntryBookMainReportPath(String path) { - LimaServiceConfig.getInstance().setEntryBookDocumentReportModelPath(path); + LimaBusinessConfig.getInstance().setEntryBookDocumentReportModelPath(path); } @Override public void setProvisionalEntryBookEntryBookReportPath(String path) { - LimaServiceConfig.getInstance().setEntryBookEntryBookReportModelPath(path); + LimaBusinessConfig.getInstance().setEntryBookEntryBookReportModelPath(path); } @Override public void setProvisionalEntryBookFinancialPeriodReportPath(String path) { - LimaServiceConfig.getInstance().setEntryBookFinancialPeriodReportModelPath(path); + LimaBusinessConfig.getInstance().setEntryBookFinancialPeriodReportModelPath(path); } @Override public void setProvisionalEntryBookTransactionReportPath(String path) { - LimaServiceConfig.getInstance().setEntryBookTransactionReportModelPath(path); + LimaBusinessConfig.getInstance().setEntryBookTransactionReportModelPath(path); } public String getVatPDFUrl() { @@ -136,7 +136,7 @@ public class OptionsServiceImpl extends AbstractLimaService implements OptionsSe } public void setVatPDFUrl(String url) { - LimaServiceConfig.getInstance().setVatPDFUrl(url); + LimaBusinessConfig.getInstance().setVatPDFUrl(url); } } diff --git a/lima-business/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java b/lima-business/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java index 76f20c3..bf9ede1 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java +++ b/lima-business/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java @@ -22,7 +22,7 @@ package org.chorem.lima.business.utils; * #L% */ -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -35,7 +35,7 @@ public class BigDecimalToString { protected static DecimalFormat decimalFormat; public static void generateDecimalFormat() { - LimaServiceConfig config = LimaServiceConfig.getInstance(); + LimaBusinessConfig config = LimaBusinessConfig.getInstance(); StringBuilder scale = new StringBuilder(); for (int i = 0; i < config.getScale(); i++) { scale.append("0"); 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 dab04ce..0578446 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 @@ -130,7 +130,7 @@ public abstract class AbstractLimaTest { */ protected void initServices() throws IOException { if(accountService == null) { - LimaServiceFactory.initFactory(LimaServiceConfig.getInstance().getConfig()); + LimaServiceFactory.initFactory(LimaBusinessConfig.getInstance().getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); entryBookService = LimaServiceFactory.getService(EntryBookService.class); financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); @@ -160,7 +160,7 @@ public abstract class AbstractLimaTest { Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); - testProperties.setProperty(LimaServiceConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); + testProperties.setProperty(LimaBusinessConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); testProperties.setProperty(Environment.URL, "jdbc:h2:file:" + testDir + File.separator + "data"); testProperties.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); testProperties.setProperty("topia.persistence.classes", LimaCallaoEntityEnum.getImplementationClassesAsString()); @@ -187,7 +187,7 @@ public abstract class AbstractLimaTest { } protected LimaCallaoTopiaApplicationContext createNewTestApplicationContext() { - Properties options = LimaServiceConfig.getInstance().getFlatOptions(); + Properties options = LimaBusinessConfig.getInstance().getFlatOptions(); LimaCallaoTopiaApplicationContext result = getTestApplicationContext(options); return result; } diff --git a/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java b/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java index 7f0b310..27ef0d5 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java @@ -41,7 +41,7 @@ public class LimaMiscTest extends AbstractLimaTest { protected Properties getTestConfiguration() { Properties config = super.getTestConfiguration(); - config.setProperty(LimaServiceConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), DefaultAccountingRules.class.getName()); + config.setProperty(LimaBusinessConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), DefaultAccountingRules.class.getName()); return config; } /** @@ -50,7 +50,7 @@ public class LimaMiscTest extends AbstractLimaTest { */ @Test public void testDefaultRule() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof DefaultAccountingRules); } diff --git a/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java b/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java index 9a78cef..a7f3277 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java +++ b/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java @@ -38,7 +38,7 @@ import java.util.Properties; public class LimaTestsConfig { public LimaTestsConfig(String configFileName, Properties limaTestConfig) { - LimaServiceConfig instance = LimaServiceConfig.getInstance(configFileName); + LimaBusinessConfig instance = LimaBusinessConfig.getInstance(configFileName); Properties standardLimaConfig = instance.getConfig().getFlatOptions(); for (Map.Entry<Object, Object> entry : limaTestConfig.entrySet()) { @@ -49,7 +49,7 @@ public class LimaTestsConfig { setRootContextProperties(instance); } - protected void setRootContextProperties(LimaServiceConfig instance) { + protected void setRootContextProperties(LimaBusinessConfig instance) { Properties result = instance.getFlatOptions(); // add persistence classes from generated code result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java index d39ef27..0364afa 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.AccountServiceImplTest; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,16 +45,16 @@ public class AccountServiceRuleFrTest extends AccountServiceImplTest { @Before public void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java index 495a3f6..00c87f1 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.EntryBookServiceImplTest; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,15 +45,15 @@ public class EntryBookServiceRuleFrTest extends EntryBookServiceImplTest { @Before public void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java index 8dd980e..af39338 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.EntryBookServiceImplTest; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,15 +45,15 @@ public class FinancialPeriodServiceRuleFrTest extends EntryBookServiceImplTest { @Before public void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java index 66372b5..01ef657 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.FinancialTransactionServiceImplTest; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,15 +45,15 @@ public class FinancialTransactionServiceRuleFrTest extends FinancialTransactionS @Before public void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java index 9d1eccf..995b57f 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.FiscalPeriodServiceImplTest; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,15 +45,15 @@ public class FiscalPeriodServiceRuleFrTest extends FiscalPeriodServiceImplTest { @Before public void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java index 3933dba..8ad9ecf 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.AbstractLimaTest; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.junit.Assert; import org.junit.Test; @@ -47,17 +47,17 @@ public class ImportServiceRuleFrTest extends AbstractLimaTest { protected Properties getTestConfiguration() { Properties config = super.getTestConfiguration(); - config.setProperty(LimaServiceConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), FranceAccountingRules.class.getName()); + config.setProperty(LimaBusinessConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), FranceAccountingRules.class.getName()); return config; } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() throws Exception { - AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); Assert.assertTrue("accountingRules:" + accountingRules,accountingRules instanceof FranceAccountingRules); } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java index 941082e..aca54ef 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java @@ -22,7 +22,7 @@ package org.chorem.lima.business.accountingrules; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.ReportServiceImplTest; import org.junit.Assert; import org.junit.BeforeClass; @@ -49,15 +49,15 @@ public class ReportServiceRuleFrTest extends ReportServiceImplTest { @BeforeClass public static void installFrenchRule() throws Exception { - LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaBusinessConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaBusinessConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaBusinessConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } 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 42a1c2a..00cf568 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -25,7 +25,7 @@ package org.chorem.lima; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; @@ -203,7 +203,7 @@ public class LimaMain { public static HttpServerService getHttpServerService() { if (httpServerService == null) { - LimaServiceConfig serviceConfig = LimaServiceConfig.getInstance(); + LimaBusinessConfig serviceConfig = LimaBusinessConfig.getInstance(); LimaSwingConfig swingConfig = LimaSwingConfig.getInstance(); // TODO DCossé 02/03/15 Ceci ne devrait pas être fait ainsi 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 4334b8d..2c17b11 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java @@ -27,7 +27,7 @@ import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.ui.LimaDecoratorProvider; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; @@ -87,7 +87,7 @@ public class LimaSwingApplicationContext extends DefaultApplicationContext { } protected static void initApplicationContext() { - LimaServiceConfig.getInstance(); + LimaBusinessConfig.getInstance(); } /** 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 02e64da..e29b80d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -68,8 +68,6 @@ public class LimaSwingConfig extends ApplicationConfig { private static LimaSwingConfig instance; - private static final String CONFIG_FILE_NAME = "lima-config"; - protected OptionsService optionsService; /** La version du logiciel. */ @@ -444,10 +442,10 @@ public class LimaSwingConfig extends ApplicationConfig { */ public enum Option implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, t("lima.config.configFileName.label"), n("lima.config.configFileName.description"), - "lima.properties", + "lima-config.properties", String.class, true, true), DATA_DIR("lima.data.dir", 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 8a57215..eba32f9 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 @@ -25,7 +25,7 @@ package org.chorem.lima.ui; import com.google.common.base.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.EntryService; @@ -119,7 +119,7 @@ public abstract class AbstractLimaTest { */ protected void initServices() throws IOException { if(accountService == null) { - LimaServiceFactory.initFactory(LimaServiceConfig.getInstance().getConfig()); + LimaServiceFactory.initFactory(LimaBusinessConfig.getInstance().getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); entryBookService = LimaServiceFactory.getService(EntryBookService.class); financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); @@ -149,7 +149,7 @@ public abstract class AbstractLimaTest { Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); - testProperties.setProperty(LimaServiceConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); + testProperties.setProperty(LimaBusinessConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); testProperties.setProperty(Environment.URL, "jdbc:h2:file:" + testDir + File.separator + "data"); testProperties.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); testProperties.setProperty("topia.persistence.classes", LimaCallaoEntityEnum.getImplementationClassesAsString()); @@ -170,7 +170,7 @@ public abstract class AbstractLimaTest { } protected LimaCallaoTopiaApplicationContext createNewTestApplicationContext() { - Properties options = LimaServiceConfig.getInstance().getFlatOptions(); + Properties options = LimaBusinessConfig.getInstance().getFlatOptions(); LimaCallaoTopiaApplicationContext result = getTestApplicationContext(options); return result; } diff --git a/lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java b/lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java index 15c942a..2f6ab45 100644 --- a/lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java +++ b/lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java @@ -23,7 +23,7 @@ package org.chorem.lima.ui; */ import com.google.common.collect.Maps; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.flyway.TopiaFlywayService; @@ -39,7 +39,7 @@ import java.util.Properties; public class LimaTestsConfig { public LimaTestsConfig(String configFileName, Properties limaTestConfig) { - LimaServiceConfig instance = LimaServiceConfig.getInstance(configFileName); + LimaBusinessConfig instance = LimaBusinessConfig.getInstance(configFileName); Properties standardLimaConfig = instance.getConfig().getFlatOptions(); for (Map.Entry<Object, Object> entry : limaTestConfig.entrySet()) { @@ -50,7 +50,7 @@ public class LimaTestsConfig { setRootContextProperties(instance); } - protected void setRootContextProperties(LimaServiceConfig instance) { + protected void setRootContextProperties(LimaBusinessConfig instance) { Properties result = instance.getFlatOptions(); // add persistence classes from generated code result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java b/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java index 2a2ee93..75423d1 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java +++ b/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.beans.DocumentReport; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.utils.DocumentReportTypes; import org.chorem.lima.business.utils.DocumentsEnum; @@ -80,7 +80,7 @@ public class ReportBuilder { */ public ReportBuilder() { - LimaServiceConfig config = LimaServiceConfig.getInstance(); + LimaBusinessConfig config = LimaBusinessConfig.getInstance(); // compile phase balanceDocumentReport = createReport(config.getReportModelUrl(DocumentReportTypes.BALANCE)); diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java index d7aef7f..f8c8cd1 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java @@ -31,7 +31,7 @@ import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.beans.FinancialStatementAmounts; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; import org.chorem.lima.business.api.EntryService; @@ -93,7 +93,7 @@ public class DocumentService { protected AccountService accountService; - protected String path = LimaServiceConfig.getInstance().getReportsModelDir().getAbsolutePath(); + protected String path = LimaBusinessConfig.getInstance().getReportsModelDir().getAbsolutePath(); protected final String BALANCE_FILE_PATH = path + File.separator + DocumentsEnum.BALANCE.getFileName() + ".pdf"; protected final String GENERAL_ENTRY_BOOK_REPORT_PDF_FILE_PATH = path + File.separator + DocumentsEnum.GENERAL_ENTRY_BOOK.getFileName() + ".pdf"; diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java index e4831ac..3f0e3f5 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; @@ -81,7 +81,7 @@ public class HttpServerService { public HttpServerService() { //File reportDir = (File) props.get("REPORTS_MODEL_DIR"); //path = reportDir.getAbsolutePath(); - port = LimaServiceConfig.getInstance().getHttpPort(); + port = LimaBusinessConfig.getInstance().getHttpPort(); accountService = LimaServiceFactory.getService(AccountService.class); documentService = new DocumentService(); reportBuilder = new ReportBuilder(); @@ -91,7 +91,7 @@ public class HttpServerService { public void start() { if (server == null) { try { - LimaServiceConfig config = LimaServiceConfig.getInstance(); + LimaBusinessConfig config = LimaBusinessConfig.getInstance(); File reportDir = config.getReportsModelDir(); FileUtil.createDirectoryIfNecessary(reportDir); @@ -105,7 +105,7 @@ public class HttpServerService { server.start(); if (log.isInfoEnabled()) { - log.info("Web server are running on port: " + port); + log.info("Web server running on port: " + port); } } catch (Exception eee) { @@ -124,7 +124,7 @@ public class HttpServerService { public class MainServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private String serverAddressConfig = LimaServiceConfig.getInstance().getAddressServer(); + private String serverAddressConfig = LimaBusinessConfig.getInstance().getAddressServer(); @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -198,7 +198,7 @@ public class HttpServerService { } IOUtils.write(report, out, Charsets.UTF_8); } else { - LimaServiceConfig config = LimaServiceConfig.getInstance(); + LimaBusinessConfig config = LimaBusinessConfig.getInstance(); File reportDir = config.getReportsModelDir(); String path = reportDir.getAbsolutePath(); URL doc = new URL("file:" + path + File.separator + model + ".pdf"); @@ -230,7 +230,7 @@ public class HttpServerService { + ":" + req.getServerPort(); } else { serverAddress += serverAddressConfig + ":" - + LimaServiceConfig.getInstance().getHttpPort(); + + LimaBusinessConfig.getInstance().getHttpPort(); } Calendar calendar = Calendar.getInstance(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.