This is an automated email from the git hooks/post-receive script. New commit to branch release/0.8.2 in repository lima. See http://git.chorem.org/lima.git commit 078cd837d5caa709e4a4a86f13b897c77c960e51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 20 23:03:44 2015 +0100 utilisation d'un package org.chorem.lima et pas d'un répertoire nommé org.chorem.lima SuperLol --- lima-server/pom.xml | 5 +---- .../chorem/lima}/server/FormatsEnum.java | 13 +++++++------ .../chorem/lima}/server/HttpServerService.java | 12 +++++------- .../chorem/lima/server}/LimaServer.java | 17 ++++++++--------- .../chorem/lima}/server/LimaServerConfig.java | 0 lima-swing/src/main/java/org/chorem/lima/LimaMain.java | 1 + 6 files changed, 22 insertions(+), 26 deletions(-) diff --git a/lima-server/pom.xml b/lima-server/pom.xml index 829ea11..b6524a3 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -32,9 +32,6 @@ <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - </properties> <dependencies> @@ -169,7 +166,7 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>org.chorem.lima.LimaServer</mainClass> + <mainClass>org.chorem.lima.server.LimaServer</mainClass> </manifest> </archive> </configuration> diff --git a/lima-server/src/main/java/org.chorem.lima/server/FormatsEnum.java b/lima-server/src/main/java/org/chorem/lima/server/FormatsEnum.java similarity index 94% rename from lima-server/src/main/java/org.chorem.lima/server/FormatsEnum.java rename to lima-server/src/main/java/org/chorem/lima/server/FormatsEnum.java index 16b834f..0aec3c0 100644 --- a/lima-server/src/main/java/org.chorem.lima/server/FormatsEnum.java +++ b/lima-server/src/main/java/org/chorem/lima/server/FormatsEnum.java @@ -1,26 +1,27 @@ +package org.chorem.lima.server; + /* * #%L - * Lima :: business API + * Lima :: Server * %% * Copyright (C) 2008 - 2010 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package org.chorem.lima.server; public enum FormatsEnum { diff --git a/lima-server/src/main/java/org.chorem.lima/server/HttpServerService.java b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java similarity index 99% rename from lima-server/src/main/java/org.chorem.lima/server/HttpServerService.java rename to lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java index aac5a73..e259b5f 100644 --- a/lima-server/src/main/java/org.chorem.lima/server/HttpServerService.java +++ b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java @@ -2,7 +2,7 @@ package org.chorem.lima.server; /* * #%L - * Lima :: report + * Lima :: Server * %% * Copyright (C) 2008 - 2014 CodeLutin * %% @@ -22,6 +22,7 @@ package org.chorem.lima.server; * #L% */ +import com.google.common.base.Strings; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -29,12 +30,12 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.OptionsService; -import org.chorem.lima.report.DocumentsEnum; import org.chorem.lima.entity.Account; -import org.chorem.lima.report.service.GeneratedReport; +import org.chorem.lima.report.DocumentsEnum; import org.chorem.lima.report.service.DocumentService; -import org.chorem.lima.business.LimaServiceFactory; +import org.chorem.lima.report.service.GeneratedReport; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -45,7 +46,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -57,8 +57,6 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import com.google.common.base.Strings; - import static org.nuiton.i18n.I18n.t; public class HttpServerService { diff --git a/lima-server/src/main/java/org.chorem.lima/LimaServer.java b/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java similarity index 94% rename from lima-server/src/main/java/org.chorem.lima/LimaServer.java rename to lima-server/src/main/java/org/chorem/lima/server/LimaServer.java index 04c716d..5785664 100644 --- a/lima-server/src/main/java/org.chorem.lima/LimaServer.java +++ b/lima-server/src/main/java/org/chorem/lima/server/LimaServer.java @@ -1,35 +1,34 @@ +package org.chorem.lima.server; + /* * #%L - * Lima :: business + * Lima :: Server * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package org.chorem.lima; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaBusinessConfig; -import org.chorem.lima.report.LimaReportConfig; -import org.chorem.lima.server.HttpServerService; -import org.chorem.lima.server.LimaServerConfig; import org.chorem.lima.business.LimaServiceFactory; +import org.chorem.lima.report.LimaReportConfig; import org.nuiton.config.ApplicationConfig; import javax.naming.Context; diff --git a/lima-server/src/main/java/org.chorem.lima/server/LimaServerConfig.java b/lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java similarity index 100% rename from lima-server/src/main/java/org.chorem.lima/server/LimaServerConfig.java rename to lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java 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 e82e82d..d39ab37 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.LimaServiceFactory; +import org.chorem.lima.server.LimaServer; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; import org.chorem.lima.ui.opening.OpeningView; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.