Author: dcosse Date: 2014-06-12 10:35:38 +0200 (Thu, 12 Jun 2014) New Revision: 3831 Url: http://forge.chorem.org/projects/lima/repository/revisions/3831 Log: #934 refactorin sur LimaConfig Added: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java trunk/lima-business/src/test/resources/lima-test.properties trunk/lima-business/src/test/resources/log4j.properties trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.accountingrules.DefaultAccountingRules; import org.chorem.lima.business.accountingrules.FranceAccountingRules; import org.chorem.lima.business.migration.DatabaseMigrationClass; import org.chorem.lima.entity.LimaCallaoEntityEnum; @@ -56,21 +55,31 @@ */ public class LimaConfig extends ApplicationConfig { - private static final Log log = LogFactory.getLog(LimaConfig.class); + protected static final Log log = LogFactory.getLog(LimaConfig.class); protected static LimaConfig instance; - protected AccountingRules accountingRules; + protected static AccountingRules accountingRules; + protected static ApplicationConfig config; + + protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties"; + public LimaConfig() { - // load default options - super(Option.class, null, null, null); + try { + setOption("topia.service.migration", TopiaMigrationEngine.class.getName()); + setOption("topia.service.migration.callback", DatabaseMigrationClass.class.getName()); - setOption("topia.service.migration", TopiaMigrationEngine.class.getName()); - setOption("topia.service.migration.callback", DatabaseMigrationClass.class.getName()); + setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); + setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); - setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); - setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); + config = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); + config.loadDefaultOptions(ServiceConfigOption.values()); + config.parse(); + + } catch (ArgumentsParserException ex) { + throw new LimaException("Can't read configuration", ex); + } } public static LimaConfig getInstance() { @@ -81,19 +90,26 @@ return instance; } + public ApplicationConfig getConfig() { + return config; + } + /** * Instancie la bonne classe de nationalite en fonction du fichier de configuration. * * L'instance est conservée en cache. - * + * * @return l'instance de rule */ - public AccountingRules getAccountingRules() { + public static AccountingRules getAccountingRules() { if (accountingRules == null) { - Class<?> accountingRulesClass = getOptionAsClass(Option.RULES_NATIONALTY.key); + Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key); if (accountingRulesClass == null) { - accountingRules = new DefaultAccountingRules(); + if (log.isErrorEnabled()) { + log.error("No accounting rules defined for:" + accountingRulesClass); + } + accountingRules = new FranceAccountingRules(); } else { try { accountingRules = (AccountingRules) accountingRulesClass.newInstance(); @@ -101,6 +117,7 @@ if (log.isErrorEnabled()) { log.error("Can't instantiate accounting rules", ex); } + } } } @@ -108,50 +125,50 @@ return accountingRules; } - public void setAccountingRule(String accountingRule) { + public static void setAccountingRule(String accountingRule) { accountingRules = null; // clear cache - setOption(Option.RULES_NATIONALTY.key, accountingRule); + config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); } - public File getDataDir() { - File datadir = getOptionAsFile(Option.DATA_DIR.getKey()); + public static File getDataDir() { + File datadir = config.getOptionAsFile(ServiceConfigOption.DATA_DIR.getKey()); return datadir; } - public File getReportsDir() { - File reportsDir = getOptionAsFile(Option.REPORTS_DIR.getKey()); + public static File getReportsDir() { + File reportsDir = config.getOptionAsFile(ServiceConfigOption.REPORTS_DIR.getKey()); return reportsDir; } - public String getAddressServer() { - String serverAddress = getOption(Option.SERVER_ADRESS.getKey()); + public static String getAddressServer() { + String serverAddress = config.getOption(ServiceConfigOption.SERVER_ADRESS.getKey()); return serverAddress; } - public int getHttpPort() { - String httpPort = getOption(Option.HTTP_PORT.getKey()); + public static int getHttpPort() { + String httpPort = config.getOption(ServiceConfigOption.HTTP_PORT.getKey()); Integer port = Integer.valueOf(httpPort); return port; } - public String getScale() { - String scale = getOption(Option.SCALE.getKey()); + public static String getScale() { + String scale = config.getOption(ServiceConfigOption.SCALE.getKey()); return scale; } - public void setScale(String locale) { - setOption(Option.SCALE.key, locale); - saveForUser(); + public static void setScale(String locale) { + config.setOption(ServiceConfigOption.SCALE.key, locale); + config.saveForUser(); } - public String getVatPDFUrl() { - String vatPDFUrl = getOption(Option.VAT_PDF_URL.getKey()); + public static String getVatPDFUrl() { + String vatPDFUrl = config.getOption(ServiceConfigOption.VAT_PDF_URL.getKey()); return vatPDFUrl; } - public void setVatPDFUrl(String url) { - setOption(Option.VAT_PDF_URL.key, url); - saveForUser(); + public static void setVatPDFUrl(String url) { + config.setOption(ServiceConfigOption.VAT_PDF_URL.key, url); + config.saveForUser(); } /** @@ -159,14 +176,14 @@ */ protected void loadConfiguration() { try { - instance.parse(); + config.parse(); } catch (ArgumentsParserException ex) { if (log.isErrorEnabled()) { log.error("Can't read configuration", ex); } } - instance.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, + config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); } @@ -177,9 +194,9 @@ * information for jaxx configuration frame ({@code #type}, * {@code #transientBoolean}, {@code #finalBoolean}...) */ - public enum Option implements ConfigOptionDef { + public enum ServiceConfigOption implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, n("lima.config.configFileName.description"), "lima.properties", String.class, true, true), + CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), REPORTS_DIR("lima.reports.dir", n("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), RULES_NATIONALTY("lima.rules", n("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), @@ -200,8 +217,8 @@ private boolean finalBoolean; - Option(String key, String description, String defaultValue, - Class<?> type, boolean transientBoolean, boolean finalBoolean) { + ServiceConfigOption(String key, String description, String defaultValue, + Class<?> type, boolean transientBoolean, boolean finalBoolean) { this.key = key; this.description = description; this.defaultValue = defaultValue; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -39,6 +39,7 @@ import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; +import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.persistence.TopiaApplicationContextCache; import com.google.common.base.Function; @@ -93,8 +94,9 @@ context.getTarget().getClass() + "#" + context.getMethod().getName()); } - LimaConfig config = LimaConfig.getInstance(); + ApplicationConfig config = LimaConfig.getInstance().getConfig(); + LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext(config.getFlatOptions(), CREATE_CONTEXT_FUNCTION); LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -81,7 +81,7 @@ public Account createAccount(Account account) throws LimaException { // check rules before create the account - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); accountingRules.createAccountRules(account); Account result; @@ -208,7 +208,7 @@ @Override public void removeAccount(Account account) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { @@ -237,7 +237,7 @@ @Override public Account updateAccount(Account account) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); Account result; try { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -101,7 +101,7 @@ protected String path; public DocumentServiceImpl() { - path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); + path = LimaConfig.getReportsDir().getAbsolutePath(); if (log.isDebugEnabled()) { log.debug("Path : " + path); @@ -722,7 +722,7 @@ String filePath = path + File.separator + DocumentsEnum.VAT.getFileName() + ".pdf"; - String path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); + String path = LimaConfig.getReportsDir().getAbsolutePath(); String filePathDefault = path + File.separator + DocumentsEnum.VAT.getFileName() + "_default.pdf"; @@ -730,7 +730,7 @@ PDDocument doc; InputStream reportsStream; - String vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl(); + String vatPDFUrl = LimaConfig.getVatPDFUrl(); if (vatPDFUrl.equals("default")) { reportsStream = DocumentServiceImpl.class Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -141,7 +141,7 @@ public void removeEntryBook(EntryBook entryBook) throws LimaException { // check rule - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); accountingRules.removeEntryBookRules(entryBook); try { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -122,7 +122,7 @@ @Override public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); ClosedPeriodicEntryBook result; try { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -101,7 +101,7 @@ public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { FinancialTransaction result; - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { //check if the financial period is blocked @@ -476,7 +476,7 @@ @Override public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { @@ -504,7 +504,7 @@ public void removeFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { // check if the financial period is blocked - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction); try { @@ -527,7 +527,7 @@ @Override public Entry createEntry(Entry entry) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); Entry newEntry; try { @@ -550,7 +550,7 @@ @Override public void updateEntry(Entry entry) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); @@ -576,7 +576,7 @@ @Override public void removeEntry(Entry entry) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { FinancialTransaction financialTransaction = entry.getFinancialTransaction(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -111,7 +111,7 @@ ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); // fix begin date at midnight and end date at 23:59:59.999 Date beginDate = fiscalPeriod.getBeginDate(); @@ -237,7 +237,7 @@ @Override public FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); FiscalPeriod result; try { @@ -500,7 +500,7 @@ public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaConfig.getAccountingRules(); try { try { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -91,8 +91,8 @@ private static final SimpleDateFormat DATEFORMAT = new SimpleDateFormat("yyyy-MM-dd"); public HttpServerServiceImpl() { - path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); - port = LimaConfig.getInstance().getHttpPort(); + path = LimaConfig.getReportsDir().getAbsolutePath(); + port = LimaConfig.getHttpPort(); } /** start the server */ @@ -131,7 +131,7 @@ public class MainServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private String serverAddressConfig = LimaConfig.getInstance().getAddressServer(); + private String serverAddressConfig = LimaConfig.getAddressServer(); @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -270,7 +270,7 @@ + ":" + req.getServerPort(); } else { serverAdress += serverAddressConfig + ":" - + LimaConfig.getInstance().getHttpPort(); + + LimaConfig.getHttpPort(); } Calendar calendar = Calendar.getInstance(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -730,7 +730,7 @@ PDDocument doc = null; try { - String path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); + String path = LimaConfig.getReportsDir().getAbsolutePath(); String filePathDefault = path + File.separator + DocumentsEnum.VAT.getFileName() + "_default.pdf"; @@ -760,7 +760,7 @@ //sets the new pdf url to be used as pdf document edited for reports if (setMode) { - LimaConfig.getInstance().setVatPDFUrl(datas); + LimaConfig.setVatPDFUrl(datas); } } catch (IOException ex) { log.error("Can't read vat pdf", ex); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -39,8 +39,8 @@ protected String vatPDFUrl; public OptionsServiceImpl() { - scale = LimaConfig.getInstance().getScale(); - vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl(); + scale = LimaConfig.getScale(); + vatPDFUrl = LimaConfig.getVatPDFUrl(); } public int getScale() { @@ -52,7 +52,7 @@ } public void setScale(String scale) { - LimaConfig.getInstance().setScale(scale); + LimaConfig.setScale(scale); } public String getVatPDFUrl() { @@ -60,7 +60,7 @@ } public void setVatPDFUrl(String url) { - LimaConfig.getInstance().setVatPDFUrl(url); + LimaConfig.setVatPDFUrl(url); } } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-06-12 08:35:38 UTC (rev 3831) @@ -116,6 +116,7 @@ lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address +lima.configFileName.description= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-06-12 08:35:38 UTC (rev 3831) @@ -117,6 +117,7 @@ lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur +lima.configFileName.description= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -23,22 +23,10 @@ package org.chorem.lima.business; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.ParseException; -import java.util.Locale; -import java.util.Properties; -import java.util.UUID; - +import com.google.common.base.Function; import com.google.common.collect.Lists; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaConfig.Option; import org.chorem.lima.business.accountingrules.TestAccountingRules; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; @@ -63,13 +51,20 @@ import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.chorem.lima.service.LimaServiceFactory; +import org.hibernate.cfg.Environment; import org.junit.After; import org.junit.Before; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.topia.persistence.TopiaApplicationContextCache; -import com.google.common.base.Function; +import java.io.File; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.util.Locale; +import java.util.Properties; +import java.util.UUID; /** * Common initialization code for all lima tests. @@ -103,18 +98,22 @@ protected NewImportService newImportService; protected NewExportService newExportService; + protected LimaCallaoTopiaApplicationContext context; + /** * This is a before class method, but junit will fail to run inherited * BeforeClass methods if there is one. - * + * * @throws Exception */ @Before public void initAbstractTest() throws Exception { setUpLocale(); - setUpTestConfig(); - setUpDefaultRule(); - initServices(); + + Properties options = getTestConfiguration(); + LimaConfig config = new LimaTestsConfig("/lima-test.properties", options); + initServices(config); + context = getTestContext(options); } protected void setUpLocale() throws Exception { @@ -123,10 +122,11 @@ /** * Init services after i18n#init(). - * @throws IOException + * @throws java.io.IOException */ - protected void initServices() throws IOException { + protected void initServices(LimaConfig config) throws IOException { if(accountService == null) { + LimaServiceFactory.initFactory(config.getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); entryBookService = LimaServiceFactory.getService(EntryBookService.class); financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); @@ -144,107 +144,76 @@ /** * Return a new instance of configuration defined on a new database at * each call. - * + * * @return single test config */ - protected LimaConfig getTestConfiguration() { - LimaConfig instance = new LimaConfig(); + protected Properties getTestConfiguration() { // do not call parse() method (don't read /etc...) // load file manually (lima.properties) Properties testProperties = new Properties(); - InputStream streamMain = null; - InputStream streamTest = null; - - try { - streamMain = AbstractLimaTest.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); - testProperties.load(streamMain); - streamMain.close(); - - streamTest = AbstractLimaTest.class.getResourceAsStream("/lima-test.properties"); - testProperties.load(streamTest); - streamTest.close(); - } catch (IOException ex) { - throw new RuntimeException("Can't init test configuration", ex); - } finally { - IOUtils.closeQuietly(streamMain); - IOUtils.closeQuietly(streamTest); - } - // override somes + testProperties.setProperty(LimaConfig.ServiceConfigOption.CONFIG_FILE.getKey(), "/lima-test.properties"); String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); - testProperties.setProperty(Option.DATA_DIR.getKey(), testDir); - testProperties.setProperty("hibernate.connection.url", "jdbc:h2:file:" + testDir + File.separator + "data"); - testProperties.setProperty("hibernate.hbm2ddl.auto", "update"); + testProperties.setProperty(LimaConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); + testProperties.setProperty(Environment.HBM2DDL_AUTO, "update"); + testProperties.setProperty(Environment.DIALECT, "org.hibernate.dialect.H2Dialect"); + testProperties.setProperty(Environment.DRIVER, "org.h2.Driver"); - instance.setOptions(testProperties); - instance.setOption("topia.persistence.classes", LimaCallaoEntityEnum.getImplementationClassesAsString()); + testProperties.setProperty(Environment.URL, "jdbc:h2:file:" + testDir + File.separator + "data"); + testProperties.setProperty(Environment.USER, "sa"); + testProperties.setProperty(Environment.PASS, ""); + testProperties.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); - if (log.isDebugEnabled()) { - log.debug("Using test configuration" + instance.getFlatOptions()); - } - return instance; - } - protected void setUpTestConfig() throws Exception { - LimaConfig.instance = getTestConfiguration(); - LimaServiceFactory.initFactory(LimaConfig.getInstance()); + testProperties.setProperty("topia.persistence.classes", LimaCallaoEntityEnum.getImplementationClassesAsString()); + testProperties.setProperty(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), TestAccountingRules.class.getName()); + return testProperties; } @After public void cleanDatabase() throws Exception { - LimaConfig config = LimaConfig.getInstance(); - FileUtils.deleteDirectory(config.getDataDir()); + //context.dropSchema(); } /** - * Default rule configuration should stay in France rule. - * - * But test will run without a specific rule during normal tests - * and france rule will be re-enabled for specifics tests. - * @throws Exception - */ - protected static void setUpDefaultRule() throws Exception { - LimaConfig config = LimaConfig.getInstance(); - config.setAccountingRule(TestAccountingRules.class.getName()); - } - - /** * Method to use only for class that need a context to be tester. * Only for DOA for now. * * @return a topia context */ - protected LimaCallaoTopiaApplicationContext getTestContext() { - LimaConfig config = LimaConfig.getInstance(); - Properties options = config.getFlatOptions(); + protected LimaCallaoTopiaApplicationContext getTestContext(Properties options) { + log.info("Opening context to database : " + options.getProperty("hibernate.connection.url")); - if (log.isDebugEnabled()) { - log.debug("Opening context to database : " + options.getProperty("hibernate.connection.url")); - } LimaCallaoTopiaApplicationContext result = TopiaApplicationContextCache.getContext(options, CREATE_CONTEXT_FUNCTION); return result; } + protected LimaCallaoTopiaApplicationContext createNewTestContext() { + Properties options = getTestConfiguration(); + LimaCallaoTopiaApplicationContext result = getTestContext(options); + return result; + } + /** * Create a basic database. - * + * * Not called by default (<code>@Before</code>) to allow init test with * CSV or EBP import. - * - * @throws LimaException - * @throws ParseException + * + * @throws org.chorem.lima.business.LimaException + * @throws java.text.ParseException */ protected void initTestDatabase() throws Exception { - getTestContext().createSchema(); + context.createSchema(); } /** * Create a basic account plan. * - * @throws org.chorem.lima.business.LimaException + * @throws LimaException * @throws java.text.ParseException */ protected void initTestWithAccounts() throws Exception { @@ -289,8 +258,8 @@ /** * Create some EntryBooks. * - * @throws LimaException - * @throws ParseException + * @throws org.chorem.lima.business.LimaException + * @throws java.text.ParseException */ protected void initTestWithEntryBooks() throws Exception { // creation d'un journal @@ -314,8 +283,8 @@ /** * Create a FiscalPeriod with an EntryBook. * - * @throws LimaException - * @throws ParseException + * @throws org.chorem.lima.business.LimaException + * @throws java.text.ParseException */ protected void initTestWithFiscalPeriod() throws Exception { initTestWithAccounts(); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -109,7 +109,7 @@ public void deleteNonUsedEntryBookTest() throws LimaException { EntryBook myEntryBook = new EntryBookImpl(); - myEntryBook.setCode("JRN"); + myEntryBook.setCode("JRN2"); myEntryBook.setLabel("MyJournal"); myEntryBook = entryBookService.createEntryBook(myEntryBook); int nbEntryBooks = entryBookService.getAllEntryBooks().size(); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -62,20 +62,20 @@ initTestWithFinancialTransaction(); // find one closed to close - LimaCallaoTopiaPersistenceContext context = getTestContext().newPersistenceContext(); - ClosedPeriodicEntryBookTopiaDao dao = context.getClosedPeriodicEntryBookDao(); + LimaCallaoTopiaPersistenceContext tcontext = context.newPersistenceContext(); + ClosedPeriodicEntryBookTopiaDao dao = tcontext.getClosedPeriodicEntryBookDao(); ClosedPeriodicEntryBook closedPeriodic = dao.findAll().get(0); - context.close(); + tcontext.close(); // block it Assert.assertFalse(closedPeriodic.isLocked()); financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); // check it's blocked - context = getTestContext().newPersistenceContext(); - dao = context.getClosedPeriodicEntryBookDao(); + tcontext = context.newPersistenceContext(); + dao = tcontext.getClosedPeriodicEntryBookDao(); closedPeriodic = dao.findAll().get(0); - context.close(); + tcontext.close(); Assert.assertFalse(closedPeriodic.isLocked()); } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -140,7 +140,7 @@ */ @Test public void testImportCSVPCG() throws Exception { - getTestContext().createSchema(); + createNewTestContext().createSchema(); String pcg = IOUtils.toString(ImportServiceImplTest.class.getResourceAsStream("/import/pcg_base.csv")); importService.importAsCSV(pcg, ImportExportEntityEnum.ACCOUNT); @@ -153,7 +153,7 @@ */ @Test public void testImportCSVEb() throws Exception { - getTestContext().createSchema(); + createNewTestContext().createSchema(); String pcg = IOUtils.toString(ImportServiceImplTest.class.getResourceAsStream("/import/eb_default.csv")); importService.importAsCSV(pcg, ImportExportEntityEnum.ENTRYBOOK); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -44,7 +44,7 @@ */ @Test public void testDefaultRule() { - Assert.assertFalse(LimaConfig.getInstance().getAccountingRules() + Assert.assertFalse(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } Added: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -0,0 +1,36 @@ +package org.chorem.lima.business; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; + +import java.util.Properties; + +/** + * Created by davidcosse on 11/06/14. + */ +public class LimaTestsConfig extends LimaConfig { + + public LimaTestsConfig(String configFileName, Properties properties) { + try { + accountingRules = null; + ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); + defaultConfig.loadDefaultOptions(ServiceConfigOption.values()); + defaultConfig.parse(); + if (StringUtils.isNotBlank(configFileName)) { + Properties flatOptions = defaultConfig.getFlatOptions(false); + flatOptions.putAll(properties); + config = new ApplicationConfig(flatOptions, configFileName); + config.parse(); + } else { + if (log.isWarnEnabled()) { + log.warn("No specific configuration provided, using the default one"); + } + config = defaultConfig; + } + instance = this; + } catch (ArgumentsParserException ex) { + throw new LimaException("Can't read configuration", ex); + } + } +} Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -51,7 +51,7 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -60,7 +60,7 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -47,7 +47,7 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -56,6 +56,6 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -47,7 +47,7 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -56,6 +56,6 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -47,7 +47,7 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -56,6 +56,6 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -47,7 +47,7 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -56,6 +56,6 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -23,13 +23,14 @@ package org.chorem.lima.business.accountingrules; +import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.ImportServiceImplTest; import org.chorem.lima.business.LimaConfig; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; +import java.util.Properties; + /** * Add configuration to add specific test on French rules set. * @@ -45,9 +46,11 @@ */ public class ImportServiceRuleFrTest extends ImportServiceImplTest { - @Before - public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + protected Properties getTestConfiguration() { + Properties config = super.getTestConfiguration(); + config.remove(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey()); + config.put(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), FranceAccountingRules.class.getName()); + return config; } /** @@ -55,7 +58,8 @@ * elle peut être mise en cache dans {@link LimaConfig}. */ @Test - public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + public void testRuleInstance() throws Exception { + AccountingRules accountingRules = LimaConfig.getAccountingRules(); + Assert.assertTrue("accountingRules:" + accountingRules,accountingRules instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -50,7 +50,7 @@ @BeforeClass public static void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaConfig.setAccountingRule(FranceAccountingRules.class.getName()); } /** @@ -59,6 +59,6 @@ */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -53,11 +53,9 @@ */ @Test public void testStringToListAccounts() throws Exception { - LimaCallaoTopiaPersistenceContext context = getTestContext().newPersistenceContext(); - initTestWithAccounts(); - AccountTopiaDao accountDAO = context.getAccountDao(); + AccountTopiaDao accountDAO = context.newPersistenceContext().getAccountDao(); List<Account> accounts = accountDAO.stringToListAccounts("50..511", false); Assert.assertEquals(5, accounts.size()); Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-06-12 08:35:38 UTC (rev 3831) @@ -60,8 +60,8 @@ FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - LimaCallaoTopiaPersistenceContext context = getTestContext().newPersistenceContext(); - FinancialTransactionTopiaDao ftDAO = context.getFinancialTransactionDao(); + LimaCallaoTopiaPersistenceContext tcontext = context.newPersistenceContext(); + FinancialTransactionTopiaDao ftDAO = tcontext.getFinancialTransactionDao(); Assert.assertFalse(ftDAO.isExistUnbalancedTransaction( financialPeriod.getBeginDate(), financialPeriod.getEndDate(), Modified: trunk/lima-business/src/test/resources/lima-test.properties =================================================================== --- trunk/lima-business/src/test/resources/lima-test.properties 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/resources/lima-test.properties 2014-06-12 08:35:38 UTC (rev 3831) @@ -26,3 +26,8 @@ # Embedded mode lima.openejb.remotemode=false java.naming.factory.initial=org.openejb.client.LocalInitialContextFactory +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.hbm2ddl.auto=update Modified: trunk/lima-business/src/test/resources/log4j.properties =================================================================== --- trunk/lima-business/src/test/resources/log4j.properties 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/lima-business/src/test/resources/log4j.properties 2014-06-12 08:35:38 UTC (rev 3831) @@ -31,6 +31,6 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.lima=INFO +log4j.logger.org.chorem.lima=DEBUG log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-11 09:16:17 UTC (rev 3830) +++ trunk/pom.xml 2014-06-12 08:35:38 UTC (rev 3831) @@ -170,7 +170,7 @@ <nuitonCsvVersion>3.0-rc-1</nuitonCsvVersion> <eugeneVersion>2.10</eugeneVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-5</topiaVersion> <swinglabsVersion>3.0.4</swinglabsVersion> <h2Version>1.3.176</h2Version>