[nuiton-web] branch develop updated (66a2f39 -> 238196d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git from 66a2f39 fixes #3563 [Nuiton-struts2] create an interceptor overriding ExecuteAndWaitInterceptor to copy the uploaded file new 238196d add missing dependency + licenses The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 238196dfe3bf0757f7e8acceb192bafb2e9646a7 Author: Kevin Morin <morin@codelutin.com> Date: Sun Nov 2 20:38:25 2014 +0100 add missing dependency + licenses Summary of changes: nuiton-struts2/pom.xml | 5 +++++ .../web/struts2/interceptor/HasUploadedFile.java | 22 ++++++++++++++++++++ .../UploadExecuteAndWaitInterceptor.java | 24 +++++++++++++++++++++- pom.xml | 16 +++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit 238196dfe3bf0757f7e8acceb192bafb2e9646a7 Author: Kevin Morin <morin@codelutin.com> Date: Sun Nov 2 20:38:25 2014 +0100 add missing dependency + licenses --- nuiton-struts2/pom.xml | 5 +++++ .../web/struts2/interceptor/HasUploadedFile.java | 22 ++++++++++++++++++++ .../UploadExecuteAndWaitInterceptor.java | 24 +++++++++++++++++++++- pom.xml | 16 +++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/nuiton-struts2/pom.xml b/nuiton-struts2/pom.xml index 16e72ae..365928f 100644 --- a/nuiton-struts2/pom.xml +++ b/nuiton-struts2/pom.xml @@ -67,6 +67,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/HasUploadedFile.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/HasUploadedFile.java index cdfb2a2..01b4afb 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/HasUploadedFile.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/HasUploadedFile.java @@ -1,5 +1,27 @@ package org.nuiton.web.struts2.interceptor; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * %% + * Copyright (C) 2010 - 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 + * 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% + */ + import java.io.File; /** diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/UploadExecuteAndWaitInterceptor.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/UploadExecuteAndWaitInterceptor.java index c61bd08..001724d 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/UploadExecuteAndWaitInterceptor.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/UploadExecuteAndWaitInterceptor.java @@ -1,5 +1,27 @@ package org.nuiton.web.struts2.interceptor; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * %% + * Copyright (C) 2010 - 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 + * 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% + */ + import com.opensymphony.xwork2.ActionInvocation; import org.apache.commons.io.FileUtils; import org.apache.struts2.interceptor.BackgroundProcess; @@ -35,7 +57,7 @@ public class UploadExecuteAndWaitInterceptor extends ExecuteAndWaitInterceptor { throw new RuntimeException("Error copying uploaded file", ex); } bgProcess = new UploadBackgroundProcess(name + "BackgroundThread", actionInvocation, threadPriority); - + } else { bgProcess = super.getNewBackgroundProcess(name, actionInvocation, threadPriority); } diff --git a/pom.xml b/pom.xml index d80d916..2b036d4 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,16 @@ License along with this program. If not, see <role>Développeur</role> </roles> </developer> + <developer> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> <modules> @@ -158,6 +168,12 @@ License along with this program. If not, see </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.2</version> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm