- Lima-commits - mailman.cloud.codelutin.com

r3318 - in trunk/lima-business/src: main/java/org/chorem/lima/business main/java/org/chorem/lima/business/accountingrules main/java/org/chorem/lima/business/ejbinterface test/java/org/chorem/lima/business test/java/org/chorem/lima/business/accountingrules test/resources
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 18:57:53 +0100 (Thu, 12 Jan 2012) New Revision: 3318 Url: http://chorem.org/repositories/revision/lima/3318 Log: Begin test refactoring. Added: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java trunk/lima-business/src/test/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,16 +39,16 @@ /** * Service for localized rules * - * @author joe + * @author jpepin */ public interface AccountingRules { /** - * Accounts rules + * Account rule : check create account. * - * @param masterAccount - * @param account - * @throws LimaException + * @param masterAccount parent account + * @param account new account + * @throws LimaException if rule validation fails */ void createAccountRules(Account masterAccount, Account account) throws LimaException; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -56,16 +56,20 @@ /** * Defaults rules, if no localized rules classes is instantiated - * this default class contain the strict minimum rules to check the data integrity + * this default class contain the strict minimum rules to check the data integrity. + * + * Rule specialization should override this class. * - * @author joe + * @author jpepin */ public class DefaultAccountingRules implements AccountingRules { protected static final Log log = LogFactory.getLog(DefaultAccountingRules.class); - /** Rules to check before create accounts */ + /** + * Rules to check before create accounts. + */ @Override public void createAccountRules(Account masterAccount, Account account) throws LimaException { @@ -85,8 +89,8 @@ throw new LimaBusinessException(_("lima-business.defaultaccountingrules.invalidaccountnumber", account.getAccountNumber())); } - //check if parentaccount have no subaccount - if (masterAccount.getSubAccounts().size() > 0) { + // check if parentaccount have no subaccount + if (masterAccount.getSubAccounts().isEmpty()) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.subledgererror")); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,7 +40,6 @@ * Last update : $Date$ * By : $Author$ */ - @Remote public interface AccountService { @@ -74,7 +73,6 @@ * @param account account * @throws LimaException */ - //EJB Remote void createAccount(Account masterAccount, Account account) throws LimaException; @@ -90,6 +88,5 @@ List<Account> getAllChildrenAccounts(Account masterAccount, List<Account> accounts) throws LimaException; - //EJB Remote et local List<Account> getChildrenAccounts(Account masterAccount) throws LimaException; } Added: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -0,0 +1,77 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.AccountServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class AccountServiceRuleFrTest extends AccountServiceImplTest { + + @BeforeClass + public static void installFrenchRule() { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans + */ + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } + + /** + * Création d'un compte dans le plan comptable. + * + * @throws LimaException + */ + @Test(expected=LimaException.class) + @Override + public void testCreateAccountWrongNumber() throws LimaException { + Account myAccount = new AccountImpl(); + myAccount.setAccountNumber("42"); + accountService.createAccount(null, myAccount); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/resources/log4j.properties =================================================================== --- trunk/lima-business/src/test/resources/log4j.properties 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/test/resources/log4j.properties 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -31,4 +31,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file +#log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file

1 0

r3317 - trunk/lima-business/src/main/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 16:29:21 +0100 (Thu, 12 Jan 2012) New Revision: 3317 Url: http://chorem.org/repositories/revision/lima/3317 Log: Fix i18n init Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 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 2012-01-12 11:27:48 UTC (rev 3316) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 15:29:21 UTC (rev 3317) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,6 +40,7 @@ import java.io.File; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * Configuration pour le business. @@ -79,9 +80,11 @@ } /** - * instancie la bonne classe de nationalite en fonction du fichier de configuration + * Instancie la bonne classe de nationalite en fonction du fichier de configuration. * - * @return + * L'instance est conservée en cache. + * + * @return l'instance de rule */ public AccountingRules getAccountingRules() { @@ -103,6 +106,10 @@ return accountingRules; } + public void setAccountingRule(String accountingRule) { + setOption(Option.RULES_NATIONALTY.key, accountingRule); + } + public File getDataDir() { File datadir = getOptionAsFile(Option.DATA_DIR.getKey()); return datadir; @@ -170,14 +177,14 @@ */ public enum Option implements OptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima.properties", String.class, true, true), - DATA_DIR("lima.data.dir", _("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), - REPORTS_DIR("lima.reports.dir", _("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), - RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), - HTTP_PORT("lima.httpport", _("lima.config.httpport.description"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", _("lima.config.serveraddress.description"), "", String.class, false, false), - SCALE("lima.scale", _("lima.config.scale.description"), "2", String.class, false, false), - VAT_PDF_URL("lima.report.vatpdfurl", _("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); + CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.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), + HTTP_PORT("lima.httpport", n_("lima.config.httpport.description"), "5462", String.class, false, false), + SERVER_ADRESS("lima.serveraddress", n_("lima.config.serveraddress.description"), "", String.class, false, false), + SCALE("lima.scale", n_("lima.config.scale.description"), "2", String.class, false, false), + VAT_PDF_URL("lima.report.vatpdfurl", n_("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); private final String key; @@ -233,7 +240,7 @@ @Override public String getDescription() { - return description; + return _(description); } @Override

1 0

r3316 - trunk/lima-business/src/main/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 12:27:48 +0100 (Thu, 12 Jan 2012) New Revision: 3316 Url: http://chorem.org/repositories/revision/lima/3316 Log: Fix load default options Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 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 2012-01-12 11:19:12 UTC (rev 3315) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:27:48 UTC (rev 3316) @@ -61,12 +61,8 @@ protected AccountingRules accountingRules; public LimaConfig() { - // set defaut option (included configuration file name : important) - for (Option o : Option.values()) { - if (o.getDefaultValue() != null) { - setDefaultOption(o.key, o.defaultValue); - } - } + // load default options + super(Option.class, null, null, null); setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); setOption(TopiaMigrationService.MIGRATION_CALLBACK, DatabaseMigrationClass.class.getName());

1 0

r3315 - in trunk/lima-business/src: main/java/org/chorem/lima/business test/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 12:19:12 +0100 (Thu, 12 Jan 2012) New Revision: 3315 Url: http://chorem.org/repositories/revision/lima/3315 Log: Fix appconfig Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 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 2012-01-10 14:01:43 UTC (rev 3314) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:19:12 UTC (rev 3315) @@ -48,9 +48,9 @@ * * @author chatellier * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ + * <p/> + * Last update : $Date$ + * By : $Author$ */ public class LimaConfig extends ApplicationConfig { @@ -58,14 +58,14 @@ protected static LimaConfig instance; - protected static final String CONFIGFILE = "lima.properties"; - protected AccountingRules accountingRules; public LimaConfig() { // set defaut option (included configuration file name : important) for (Option o : Option.values()) { - setDefaultOption(o.key, o.defaultValue); + if (o.getDefaultValue() != null) { + setDefaultOption(o.key, o.defaultValue); + } } setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); @@ -77,7 +77,7 @@ public static LimaConfig getInstance() { if (instance == null) { instance = new LimaConfig(); - instance.loadConfiguration(CONFIGFILE); + instance.loadConfiguration(); } return instance; } @@ -96,8 +96,10 @@ } else { try { accountingRules = (AccountingRules) accountingRulesClass.newInstance(); - } catch (Exception e) { - log.error("Can't instantiate accounting rules", e); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't instantiate accounting rules", ex); + } } } } @@ -151,8 +153,7 @@ * * @param configFileName file name to read */ - protected void loadConfiguration(String configFileName) { - instance.setConfigFileName(configFileName); + protected void loadConfiguration() { try { instance.parse(); } catch (ArgumentsParserException ex) { @@ -173,7 +174,7 @@ */ public enum Option implements OptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima-config.properties", String.class, true, true), + CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima.properties", String.class, true, true), DATA_DIR("lima.data.dir", _("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), REPORTS_DIR("lima.reports.dir", _("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-10 14:01:43 UTC (rev 3314) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-12 11:19:12 UTC (rev 3315) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -50,10 +50,11 @@ public static LimaConfig getInstance() { if (instance == null) { instance = new LimaTestConfig(); - // do not call parse() method (don't read /etc... - + + // do not call parse() method (don't read /etc...) + // load file manually (lima.properties) Properties testProperties = new Properties(); - InputStream stream = LimaTestConfig.class.getResourceAsStream("/" + CONFIGFILE); + InputStream stream = LimaTestConfig.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); try { testProperties.load(stream);

1 0

r3314 - trunk
by echatellier＠users.chorem.org 10 Jan '12

10 Jan '12

Author: echatellier Date: 2012-01-10 15:01:43 +0100 (Tue, 10 Jan 2012) New Revision: 3314 Url: http://chorem.org/repositories/revision/lima/3314 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) +++ trunk/pom.xml 2012-01-10 14:01:43 UTC (rev 3314) @@ -311,13 +311,13 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.5</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <slf4jVersion>1.6.4</slf4jVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3313 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 10 Jan '12

10 Jan '12

Author: echatellier Date: 2012-01-10 14:59:55 +0100 (Tue, 10 Jan 2012) New Revision: 3313 Url: http://chorem.org/repositories/revision/lima/3313 Log: #390 : Update to jetty 8.0.4.v20111024 Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -39,15 +39,10 @@ <artifactId>pdfbox</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> 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 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-10 13:59:55 UTC (rev 3313) @@ -25,6 +25,26 @@ package org.chorem.lima.business.ejb; +import static org.nuiton.i18n.I18n._; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.time.DateUtils; import org.chorem.lima.business.LimaConfig; @@ -34,33 +54,15 @@ import org.chorem.lima.business.ejbinterface.HttpServerServiceLocal; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler.Context; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; import org.hibernate.exception.GenericJDBCException; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import static org.nuiton.i18n.I18n._; - - @Stateless public class HttpServerServiceImpl extends AbstractLimaService implements HttpServerService, HttpServerServiceLocal { @@ -80,7 +82,6 @@ port = LimaConfig.getInstance().getHttpPort(); } - /** start the server */ @Override public void start() { @@ -91,8 +92,10 @@ server = new Server(port); - Context root = new Context(server, "/", Context.NO_SESSIONS); - root.addServlet(new ServletHolder((Servlet) new MainServlet()), "/"); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); + context.addServlet(new ServletHolder(new MainServlet()),"/"); + server.setHandler(context); server.start(); log.info("Web server are running on port: " + port); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -199,16 +199,10 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.25</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>8.0.4.v20111024</version> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5-6.0.1</version> - <scope>runtime</scope> - </dependency>  <dependency>

1 0

r3312 - trunk
by echatellier＠users.chorem.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:49:33 +0100 (Mon, 09 Jan 2012) New Revision: 3312 Url: http://chorem.org/repositories/revision/lima/3312 Log: svn:ignore Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.log target bin .classpath .project *.ipr *.iws *.iml + *.log target bin .classpath .project *.ipr *.iws *.iml .settings

1 0

r3311 - in trunk: . lima-business lima-callao
by echatellier＠users.chorem.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:49:05 +0100 (Mon, 09 Jan 2012) New Revision: 3311 Url: http://chorem.org/repositories/revision/lima/3311 Log: Clean poms Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) +++ trunk/lima-business/pom.xml 2012-01-09 10:49:05 UTC (rev 3311) @@ -120,20 +120,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <showDeprecation>false</showDeprecation> - <showWarnings>true</showWarnings> - -  - <excludes> - <exclude>**/*CSV*.java</exclude> - <exclude>**/*XML*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) +++ trunk/lima-callao/pom.xml 2012-01-09 10:49:05 UTC (rev 3311) @@ -15,10 +15,6 @@ <artifactId>lima-callao</artifactId> <dependencies> -  <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -106,4 +102,3 @@ </build> </project> - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) +++ trunk/pom.xml 2012-01-09 10:49:05 UTC (rev 3311) @@ -106,18 +106,6 @@ <version>3.6.9.Final</version> </dependency> -  -  <dependency> <groupId>org.apache.openejb</groupId> @@ -223,7 +211,6 @@ </dependency>  - <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> @@ -337,9 +324,6 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion> <slf4jVersion>1.6.1</slf4jVersion> -  -   <license.licenseName>gpl_v3</license.licenseName>

1 0

r3310 - in trunk: . lima-business lima-callao lima-swing
by echatellier＠users.chorem.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 10:52:52 +0100 (Mon, 09 Jan 2012) New Revision: 3310 Url: http://chorem.org/repositories/revision/lima/3310 Log: T?\195?\162che #457: Updates to nuiton-utils 2.4.1 T?\195?\162che #458: Updates to topia 2.6.5 T?\195?\162che #464: Update to eugene 2.4.2 T?\195?\162che #465: Update opencsv to 2.3 T?\195?\162che #466: Update to h2 1.3.163 T?\195?\162che #467: Update to pdfbox 1.6.0 Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-01-04 17:21:25 UTC (rev 3309) +++ trunk/lima-business/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-01-04 17:21:25 UTC (rev 3309) +++ trunk/lima-callao/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-01-04 17:21:25 UTC (rev 3309) +++ trunk/lima-swing/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:21:25 UTC (rev 3309) +++ trunk/pom.xml 2012-01-09 09:52:52 UTC (rev 3310) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -96,14 +96,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.155</version> + <version>1.3.163</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> + <version>3.6.9.Final</version> </dependency>  - <nuitonUtilsVersion>2.3</nuitonUtilsVersion> - <eugenePluginVersion>2.4</eugenePluginVersion> - <topiaVersion>2.6.2</topiaVersion> + <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <eugenePluginVersion>2.4.2</eugenePluginVersion> + <topiaVersion>2.6.5</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion>

1 0

r3309 - trunk
by maven-release＠users.chorem.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:21:25 +0100 (Wed, 04 Jan 2012) New Revision: 3309 Url: http://chorem.org/repositories/revision/lima/3309 Log: Update mavenpom4redmine to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 22:23:00 UTC (rev 3308) +++ trunk/pom.xml 2012-01-04 17:21:25 UTC (rev 3309) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>org.chorem</groupId>

1 0