- Coser-commits - mailman.cloud.codelutin.com

r1116 - trunk
by echatellier＠users.forge.codelutin.com 11 Dec '13

11 Dec '13

Author: echatellier Date: 2013-12-11 12:35:33 +0100 (Wed, 11 Dec 2013) New Revision: 1116 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1116 Log: fixes #3961: Update struts Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-19 06:56:02 UTC (rev 1115) +++ trunk/pom.xml 2013-12-11 11:35:33 UTC (rev 1116) @@ -349,7 +349,7 @@  <jaxx.version>2.5.9</jaxx.version> <i18n.version>2.5</i18n.version> - <struts.version>2.3.8</struts.version> + <struts.version>2.3.16</struts.version> </properties> <scm>

1 0

r1115 - in trunk: . coser-web
by tchemit＠users.forge.codelutin.com 19 Oct '13

19 Oct '13

Author: tchemit Date: 2013-10-19 08:56:02 +0200 (Sat, 19 Oct 2013) New Revision: 1115 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1115 Log: fixes #3545: Updates mavenpom to 4.1 Modified: trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) +++ trunk/coser-web/pom.xml 2013-10-19 06:56:02 UTC (rev 1115) @@ -83,6 +83,10 @@ <properties> <license.licenseName>agpl_v3</license.licenseName> <redmine.releaseFiles>target/coser-${project.version}.war</redmine.releaseFiles> + <deployFiles>target/coser-${project.version}.war</deployFiles> + +  + <skipPostRelease>false</skipPostRelease> </properties> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) +++ trunk/pom.xml 2013-10-19 06:56:02 UTC (rev 1115) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>4.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1114 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 10 Apr '13

10 Apr '13

Author: maven-release Date: 2013-04-10 14:44:32 +0200 (Wed, 10 Apr 2013) New Revision: 1114 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1114 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2013-04-10 12:44:24 UTC (rev 1113) +++ trunk/coser-business/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2013-04-10 12:44:24 UTC (rev 1113) +++ trunk/coser-ui/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-04-10 12:44:24 UTC (rev 1113) +++ trunk/coser-web/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-10 12:44:24 UTC (rev 1113) +++ trunk/pom.xml 2013-04-10 12:44:32 UTC (rev 1114) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2</version> + <version>1.4.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.2</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.2</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4.2</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1113 - tags
by maven-release＠users.forge.codelutin.com 10 Apr '13

10 Apr '13

Author: maven-release Date: 2013-04-10 14:44:24 +0200 (Wed, 10 Apr 2013) New Revision: 1113 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1113 Log: [maven-release-plugin] copy for tag coser-1.4.2 Added: tags/coser-1.4.2/

1 0

r1112 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 10 Apr '13

10 Apr '13

Author: maven-release Date: 2013-04-10 14:44:15 +0200 (Wed, 10 Apr 2013) New Revision: 1112 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1112 Log: [maven-release-plugin] prepare release coser-1.4.2 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2013-04-10 12:35:43 UTC (rev 1111) +++ trunk/coser-business/pom.xml 2013-04-10 12:44:15 UTC (rev 1112) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2013-04-10 12:35:43 UTC (rev 1111) +++ trunk/coser-ui/pom.xml 2013-04-10 12:44:15 UTC (rev 1112) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-04-10 12:35:43 UTC (rev 1111) +++ trunk/coser-web/pom.xml 2013-04-10 12:44:15 UTC (rev 1112) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-10 12:35:43 UTC (rev 1111) +++ trunk/pom.xml 2013-04-10 12:44:15 UTC (rev 1112) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.2</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.2</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.2</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4.2</url> </scm> <build>

1 0

r1111 - in trunk/coser-business/src/main/java/fr/ifremer/coser: services util
by echatellier＠users.forge.codelutin.com 10 Apr '13

10 Apr '13

Author: echatellier Date: 2013-04-10 14:35:43 +0200 (Wed, 10 Apr 2013) New Revision: 1111 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1111 Log: fixes #2280: POST request must have a Content-Length header Added: trunk/coser-business/src/main/java/fr/ifremer/coser/util/InputStreamKnownSizeBody.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-03-05 16:56:50 UTC (rev 1110) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-04-10 12:35:43 UTC (rev 1111) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2013 Ifremer, 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 @@ -76,7 +76,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.mime.HttpMultipartMode; import org.apache.http.entity.mime.MultipartEntity; -import org.apache.http.entity.mime.content.InputStreamBody; import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.DefaultHttpClient; import org.nuiton.util.FileUtil; @@ -99,6 +98,7 @@ import fr.ifremer.coser.storage.DataStorage; import fr.ifremer.coser.storage.MemoryDataStorage; import fr.ifremer.coser.util.DataType; +import fr.ifremer.coser.util.InputStreamKnownSizeBody; import fr.ifremer.coser.util.ProgressMonitor; import fr.ifremer.coser.util.ProgressStream; import freemarker.cache.ClassTemplateLoader; @@ -456,7 +456,8 @@ // file param ProgressStream stream = new ProgressStream(new FileInputStream(prepareZip), progress); - InputStreamBody fileBody = new InputStreamBody(stream, "application/zip", prepareZip.getName()); + InputStreamKnownSizeBody fileBody = new InputStreamKnownSizeBody(stream, prepareZip.length(), + "application/zip", prepareZip.getName()); reqEntity.addPart("resultFile", fileBody); HttpPost httppost = new HttpPost(config.getWebUploadURL()); Added: trunk/coser-business/src/main/java/fr/ifremer/coser/util/InputStreamKnownSizeBody.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/InputStreamKnownSizeBody.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/InputStreamKnownSizeBody.java 2013-04-10 12:35:43 UTC (rev 1111) @@ -0,0 +1,67 @@ +/* + * #%L + * Coser :: Business + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 Ifremer, 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 fr.ifremer.coser.util; + +import java.io.InputStream; + +import org.apache.http.entity.mime.content.InputStreamBody; + +/** + * Override of apache httpcomponent's InputStreamBody to fix content length of + * input stream. + * + * Otherwize, this result in request blocked by modsecurity. + * + * See : http://www.radomirml.com/blog/2009/02/13/file-upload-with-httpcomponents-su… + * + * @author echatellier + * @since 1.4.2 + */ +public class InputStreamKnownSizeBody extends InputStreamBody { + + /** Input stream length. */ + private long lenght; + + /** + * Constructor with length. + * + * @param in input stream + * @param lenght length + * @param mimeType mime type + * @param filename file name + */ + public InputStreamKnownSizeBody(InputStream in, long lenght, String mimeType, String filename) { + super(in, mimeType, filename); + this.lenght = lenght; + } + + /** + * {@inheritDoc} + */ + @Override + public long getContentLength() { + return this.lenght; + } +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/util/InputStreamKnownSizeBody.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1110 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: echatellier Date: 2013-03-05 17:56:50 +0100 (Tue, 05 Mar 2013) New Revision: 1110 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1110 Log: Fix deprecated import Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2013-02-11 12:38:17 UTC (rev 1109) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2013-03-05 16:56:50 UTC (rev 1110) @@ -25,8 +25,7 @@ package fr.ifremer.coser.services; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test;

1 0

r1109 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 13:38:17 +0100 (Mon, 11 Feb 2013) New Revision: 1109 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1109 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2013-02-11 12:38:10 UTC (rev 1108) +++ trunk/coser-business/pom.xml 2013-02-11 12:38:17 UTC (rev 1109) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2013-02-11 12:38:10 UTC (rev 1108) +++ trunk/coser-ui/pom.xml 2013-02-11 12:38:17 UTC (rev 1109) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-02-11 12:38:10 UTC (rev 1108) +++ trunk/coser-web/pom.xml 2013-02-11 12:38:17 UTC (rev 1109) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-11 12:38:10 UTC (rev 1108) +++ trunk/pom.xml 2013-02-11 12:38:17 UTC (rev 1109) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.1</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1108 - tags
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 13:38:10 +0100 (Mon, 11 Feb 2013) New Revision: 1108 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1108 Log: [maven-release-plugin] copy for tag coser-1.4.1 Added: tags/coser-1.4.1/

1 0

r1107 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 13:38:02 +0100 (Mon, 11 Feb 2013) New Revision: 1107 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1107 Log: [maven-release-plugin] prepare release coser-1.4.1 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2013-02-08 16:59:04 UTC (rev 1106) +++ trunk/coser-business/pom.xml 2013-02-11 12:38:02 UTC (rev 1107) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2013-02-08 16:59:04 UTC (rev 1106) +++ trunk/coser-ui/pom.xml 2013-02-11 12:38:02 UTC (rev 1107) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-02-08 16:59:04 UTC (rev 1106) +++ trunk/coser-web/pom.xml 2013-02-11 12:38:02 UTC (rev 1107) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-08 16:59:04 UTC (rev 1106) +++ trunk/pom.xml 2013-02-11 12:38:02 UTC (rev 1107) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4.1</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4.1</url> </scm> <build>

1 0