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

r995 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: maven-release Date: 2012-03-26 18:18:13 +0200 (Mon, 26 Mar 2012) New Revision: 995 Url: http://forge.codelutin.com/repositories/revision/coser/995 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 2012-03-26 16:18:06 UTC (rev 994) +++ trunk/coser-business/pom.xml 2012-03-26 16:18:13 UTC (rev 995) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5</version> + <version>1.2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-26 16:18:06 UTC (rev 994) +++ trunk/coser-ui/pom.xml 2012-03-26 16:18:13 UTC (rev 995) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5</version> + <version>1.2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-03-26 16:18:06 UTC (rev 994) +++ trunk/coser-web/pom.xml 2012-03-26 16:18:13 UTC (rev 995) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5</version> + <version>1.2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-26 16:18:06 UTC (rev 994) +++ trunk/pom.xml 2012-03-26 16:18:13 UTC (rev 995) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5</version> + <version>1.2.6-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.2.5</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.5</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.5</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

r994 - tags
by maven-release＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: maven-release Date: 2012-03-26 18:18:06 +0200 (Mon, 26 Mar 2012) New Revision: 994 Url: http://forge.codelutin.com/repositories/revision/coser/994 Log: [maven-release-plugin] copy for tag coser-1.2.5 Added: tags/coser-1.2.5/

1 0

r993 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: maven-release Date: 2012-03-26 18:17:59 +0200 (Mon, 26 Mar 2012) New Revision: 993 Url: http://forge.codelutin.com/repositories/revision/coser/993 Log: [maven-release-plugin] prepare release coser-1.2.5 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 2012-03-26 16:06:26 UTC (rev 992) +++ trunk/coser-business/pom.xml 2012-03-26 16:17:59 UTC (rev 993) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5-SNAPSHOT</version> + <version>1.2.5</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-26 16:06:26 UTC (rev 992) +++ trunk/coser-ui/pom.xml 2012-03-26 16:17:59 UTC (rev 993) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5-SNAPSHOT</version> + <version>1.2.5</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-03-26 16:06:26 UTC (rev 992) +++ trunk/coser-web/pom.xml 2012-03-26 16:17:59 UTC (rev 993) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5-SNAPSHOT</version> + <version>1.2.5</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-26 16:06:26 UTC (rev 992) +++ trunk/pom.xml 2012-03-26 16:17:59 UTC (rev 993) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.5-SNAPSHOT</version> + <version>1.2.5</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.2.5</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.5</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.5</url> </scm> <build>

1 0

r992 - trunk
by echatellier＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: echatellier Date: 2012-03-26 18:06:26 +0200 (Mon, 26 Mar 2012) New Revision: 992 Url: http://forge.codelutin.com/repositories/revision/coser/992 Log: Update mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-26 14:15:38 UTC (rev 991) +++ trunk/pom.xml 2012-03-26 16:06:26 UTC (rev 992) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r991 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: echatellier Date: 2012-03-26 16:15:38 +0200 (Mon, 26 Mar 2012) New Revision: 991 Url: http://forge.codelutin.com/repositories/revision/coser/991 Log: fixes #1026 : Ajouter le fichier reftaxSpecies.csv dans le fichier zip de t?\195?\169l?\195?\169chargement des sources Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.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 2012-03-01 11:22:35 UTC (rev 990) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-03-26 14:15:38 UTC (rev 991) @@ -2121,6 +2121,12 @@ } FileUtils.copyFile(dechargePDF, new File(archiveDir, filename)); + // ajout du reftax dans le zip + File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); + File projectDirectory = new File(projectsDirectory, project.getName()); + File reftaxFile = new File(projectDirectory, CoserConstants.Category.REFTAX_SPECIES.getStorageFileName()); + FileUtils.copyFileToDirectory(reftaxFile, archiveDir); + // make zip resultZip = File.createTempFile("coserresultzip-", ".zip"); resultZip.deleteOnExit(); @@ -2131,7 +2137,7 @@ } catch (IOException ex) { throw new CoserBusinessException("Can't create zip file", ex); } - + return resultZip; } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-03-01 11:22:35 UTC (rev 990) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-03-26 14:15:38 UTC (rev 991) @@ -191,6 +191,8 @@ tempDir = FileUtil.createTempDirectory("coser", ".tmp"); ZipUtil.uncompress(zip, tempDir); Assert.assertTrue(new File(tempDir, "RSUFI_DATA_projet1" + File.separator + "DechargeDonnees.pdf").isFile()); + // test que le reftax est dans le zip + Assert.assertTrue(new File(tempDir, "RSUFI_DATA_projet1" + File.separator + "reftaxSpecies.csv").isFile()); FileUtils.deleteDirectory(tempDir); }

1 0

r990 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: maven-release Date: 2012-03-01 12:22:35 +0100 (Thu, 01 Mar 2012) New Revision: 990 Url: http://forge.codelutin.com/repositories/revision/coser/990 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 2012-03-01 11:22:34 UTC (rev 989) +++ trunk/coser-business/pom.xml 2012-03-01 11:22:35 UTC (rev 990) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-01 11:22:34 UTC (rev 989) +++ trunk/coser-ui/pom.xml 2012-03-01 11:22:35 UTC (rev 990) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-03-01 11:22:34 UTC (rev 989) +++ trunk/coser-web/pom.xml 2012-03-01 11:22:35 UTC (rev 990) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-01 11:22:34 UTC (rev 989) +++ trunk/pom.xml 2012-03-01 11:22:35 UTC (rev 990) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4</version> + <version>1.2.5-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.2.4</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.4</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.4</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

r989 - tags
by maven-release＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: maven-release Date: 2012-03-01 12:22:34 +0100 (Thu, 01 Mar 2012) New Revision: 989 Url: http://forge.codelutin.com/repositories/revision/coser/989 Log: [maven-release-plugin] copy for tag coser-1.2.4 Added: tags/coser-1.2.4/

1 0

r988 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: maven-release Date: 2012-03-01 12:22:33 +0100 (Thu, 01 Mar 2012) New Revision: 988 Url: http://forge.codelutin.com/repositories/revision/coser/988 Log: [maven-release-plugin] prepare release coser-1.2.4 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 2012-03-01 10:51:12 UTC (rev 987) +++ trunk/coser-business/pom.xml 2012-03-01 11:22:33 UTC (rev 988) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-01 10:51:12 UTC (rev 987) +++ trunk/coser-ui/pom.xml 2012-03-01 11:22:33 UTC (rev 988) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-03-01 10:51:12 UTC (rev 987) +++ trunk/coser-web/pom.xml 2012-03-01 11:22:33 UTC (rev 988) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-01 10:51:12 UTC (rev 987) +++ trunk/pom.xml 2012-03-01 11:22:33 UTC (rev 988) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</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.2.4</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.2.4</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.2.4</url> </scm> <build>

1 0

r987 - trunk/coser-ui
by echatellier＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: echatellier Date: 2012-03-01 11:51:12 +0100 (Thu, 01 Mar 2012) New Revision: 987 Url: http://forge.codelutin.com/repositories/revision/coser/987 Log: Update mavenpom and webstart plugin Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-01 10:33:46 UTC (rev 986) +++ trunk/coser-ui/pom.xml 2012-03-01 10:51:12 UTC (rev 987) @@ -369,7 +369,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin>

1 0

r986 - trunk/coser-ui
by echatellier＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: echatellier Date: 2012-03-01 11:33:46 +0100 (Thu, 01 Mar 2012) New Revision: 986 Url: http://forge.codelutin.com/repositories/revision/coser/986 Log: Update mavenpom and webstart plugin Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-03-01 10:28:48 UTC (rev 985) +++ trunk/coser-ui/pom.xml 2012-03-01 10:33:46 UTC (rev 986) @@ -294,7 +294,7 @@ </plugin> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> @@ -313,7 +313,7 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <configuration> <libPath>lib</libPath>

1 0