This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 6ca340726310b5e7d4cc2f7193f0da84c20ffdc3 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Dec 2 16:57:22 2014 +0100 refs #2397: Update to struts 2.3.16.3 refs #2398: Update to struts2-jquery-plugin 3.7.1 refs #2399: Update to shiro 1.2.3 refs #2400: Update to tika 1.6 refs #2401: Update to nuiton-utils 3.0-rc-8 refs #2402: Update to nuiton-i18n 3.3 refs #2403: Update to nuiton-struts2 1.17 refs #2404: Update to svnkit 1.8.5 refs #2430: Update to nuitonpom 1.6 --- .gitignore | 5 +- changelog.txt | 1 - pom.xml | 55 +++++++++++----------- .../java/org/nuiton/scmwebeditor/ScmSession.java | 2 +- src/main/java/org/nuiton/scmwebeditor/ScmUser.java | 2 +- .../ScmWebEditorApplicationListener.java | 2 +- .../scmwebeditor/ScmWebEditorBaseAction.java | 12 +++-- .../nuiton/scmwebeditor/ScmWebEditorConfig.java | 6 +-- .../scmwebeditor/ScmWebEditorConfigOption.java | 8 ++-- .../org/nuiton/scmwebeditor/SvnConnection.java | 2 +- .../nuiton/scmwebeditor/actions/LogoutAction.java | 2 +- .../nuiton/scmwebeditor/actions/PreviewAction.java | 7 +-- .../nuiton/scmwebeditor/actions/ResetAction.java | 2 +- .../scmwebeditor/urlResolver/ScmUrlResolver.java | 2 +- .../urlResolver/ScmUrlResolverEngine.java | 2 +- src/main/webapp/WEB-INF/web.xml | 34 ++++++------- 16 files changed, 74 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 340ab47..ce95043 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ /*.iml /*.iws /*~ -/*~ \ No newline at end of file +/*~ +/.settings/ +/.classpath +/.project diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index d173390..0000000 --- a/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -just a test diff --git a/pom.xml b/pom.xml index ed99d34..e3d3d25 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.5</version> + <version>1.6</version> </parent> <artifactId>scmwebeditor</artifactId> @@ -41,23 +41,25 @@ <role>Developer</role> </roles> </developer> - <developer> + + </developers> + + <contributors> + <contributor> <name>Geoffroy Lorieux</name> - <id>glorieux</id> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> - </developer> - <developer> + </contributor> + <contributor> <name>Kevin Cardineaud</name> - <id>kcardineaud</id> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> - </developer> - </developers> + </contributor> + </contributors> <scm> <connection>scm:git:http://git.nuiton.org/scmwebeditor.git</connection> @@ -79,11 +81,11 @@ <!--Multilanguage maven-site --> <locales>fr,en</locales> - <struts2Version>2.3.4.1</struts2Version> - <struts2jqueryVersion>3.4.0</struts2jqueryVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> - <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> + <struts2Version>2.3.16.3</struts2Version> + <struts2jqueryVersion>3.7.1</struts2jqueryVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> + <nuitonWebVersion>1.17</nuitonWebVersion> <!-- <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action</scmwebeditorUrl> --> @@ -174,7 +176,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.6</version> + <version>1.8.5</version> </dependency> <dependency> @@ -183,6 +185,13 @@ <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-rc-2</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton.jrst</groupId> @@ -204,22 +213,16 @@ <scope>compile</scope> </dependency> - <!--dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency--> - <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>1.2</version> + <version>1.6</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.2.1</version> + <version>1.2.3</version> </dependency> @@ -315,7 +318,6 @@ <plugins> <plugin> - <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> @@ -327,12 +329,12 @@ </goals> </execution> </executions> - </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> + <version>9.2.4.v20141103</version> <configuration> <webAppConfig> <contextPath>/${project.artifactId}</contextPath> @@ -340,7 +342,6 @@ </configuration> </plugin> - </plugins> </build> diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmSession.java b/src/main/java/org/nuiton/scmwebeditor/ScmSession.java index f8b8009..cd9773f 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmSession.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmSession.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmUser.java b/src/main/java/org/nuiton/scmwebeditor/ScmUser.java index 9a79710..1f625d9 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmUser.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmUser.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java index 19f04b7..b47d526 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java index 637fdb5..c78bdc5 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -244,6 +244,7 @@ public class ScmWebEditorBaseAction extends BaseAction { /** * @param svnSess * @param checkoutdir + * @param numVersion * @throws SVNException */ public void checkout(SvnConnection svnSess, File checkoutdir, String numVersion) throws SVNException { @@ -287,12 +288,12 @@ public class ScmWebEditorBaseAction extends BaseAction { /** - * @param svnFile - * @param username + * @param address + * @param login * @param password * @return * @throws SVNException - * @throws IOException + * @throws IllegalArgumentException */ public String getHeadRevision(String address, String login, String password) throws SVNException, IllegalArgumentException { @@ -495,6 +496,7 @@ public class ScmWebEditorBaseAction extends BaseAction { * * @param file le fichier contenant les propriétés * @return un objet Properties contenant les propriétés du fichier + * @throws IOException */ public static Properties loadProperties(String file) throws IOException { Properties properties = new Properties(); @@ -514,6 +516,8 @@ public class ScmWebEditorBaseAction extends BaseAction { * * @param inStream le fichier contenant les propriétés * @return un objet Properties contenant les propriétés du fichier + * @throws IOException + * @throws NullPointerException */ public static Properties loadProperties(InputStream inStream) throws IOException, NullPointerException { Properties properties = new Properties(); diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java index b73a7e2..fa6a489 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -23,8 +23,8 @@ package org.nuiton.scmwebeditor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import java.util.List; diff --git a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java index 2705aba..1e0d3f3 100644 --- a/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java +++ b/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,10 +21,10 @@ */ package org.nuiton.scmwebeditor; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfig.OptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; -public enum ScmWebEditorConfigOption implements OptionDef { +public enum ScmWebEditorConfigOption implements ConfigOptionDef { CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, "The file name", "scmwebeditor.properties", String.class, false, false), EDITABLESFILES("editableFiles", "description", "Files types that are editable", String.class, true, true), diff --git a/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java b/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java index 7ce781b..34621a1 100644 --- a/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java +++ b/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java b/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java index 2749784..526af94 100644 --- a/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java +++ b/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java b/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java index 61ec505..ef1273f 100644 --- a/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java +++ b/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,7 +21,6 @@ */ package org.nuiton.scmwebeditor.actions; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; @@ -32,9 +31,7 @@ import javax.servlet.http.HttpServletRequest; public class PreviewAction extends ScmWebEditorBaseAction implements ServletRequestAware { - /** - * - */ + /** serialVersionUID. */ private static final long serialVersionUID = -2388759298175611718L; private static final Log log = LogFactory.getLog(PreviewAction.class); diff --git a/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java b/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java index 84a0de2..d924320 100644 --- a/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java +++ b/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java b/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java index eadeecb..42a491c 100644 --- a/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java +++ b/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java b/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java index ff593f5..39325de 100644 --- a/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java +++ b/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java @@ -2,7 +2,7 @@ * #%L * ScmWebEditor * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2014 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 21ed14a..4cdb6bb 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ #%L ScmWebEditor %% - Copyright (C) 2009 - 2011 CodeLutin + Copyright (C) 2009 - 2014 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -21,28 +21,28 @@ #L% --> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd"> - - +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5" + metadata-complete="false"> + <filter> - <filter-name>struts2</filter-name> - <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter - </filter-class> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> </filter> <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>/*</url-pattern> + <filter-name>struts2</filter-name> + <url-pattern>/*</url-pattern> </filter-mapping> - - + <welcome-file-list> - <welcome-file>/WEB-INF/content/index.jsp</welcome-file> + <welcome-file>/WEB-INF/content/index.jsp</welcome-file> </welcome-file-list> - + <listener> - <description>Init</description> - <listener-class>org.nuiton.scmwebeditor.ScmWebEditorApplicationListener</listener-class> + <description>Init</description> + <listener-class>org.nuiton.scmwebeditor.ScmWebEditorApplicationListener</listener-class> </listener> - + </web-app> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.