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

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

r1106 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 08 Feb '13

08 Feb '13

Author: echatellier Date: 2013-02-08 17:59:04 +0100 (Fri, 08 Feb 2013) New Revision: 1106 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1106 Log: Fix pdf name (invalid characters). 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-02-08 16:04:54 UTC (rev 1105) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-02-08 16:59:04 UTC (rev 1106) @@ -2878,7 +2878,10 @@ Document document = CoserUtils.parseDocument(htmlContent.toString()); // render template output as pdf + // remove accents and strange characters from zone display name String zoneDisplay = getZoneFullName(zone); + zoneDisplay = StringUtils.stripAccents(zoneDisplay); + zoneDisplay = zoneDisplay.replaceAll("[^\\w- ]", "_"); File pdfFile = new File(directory, zoneDisplay + ".pdf"); os = new FileOutputStream(pdfFile);

1 0

r1105 - trunk/coser-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com 08 Feb '13

08 Feb '13

Author: echatellier Date: 2013-02-08 17:04:54 +0100 (Fri, 08 Feb 2013) New Revision: 1105 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1105 Log: Replace intranet link Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2013-01-29 15:13:11 UTC (rev 1104) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2013-02-08 16:04:54 UTC (rev 1105) @@ -234,7 +234,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits5" /></a></li> - <li><a href="https://w3.ifremer.fr/archimer/doc/00117/22783/ " target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits6" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits6" /></a></li> </ul> </p> @@ -251,7 +251,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits5" /></a></li> - <li><a href="https://w3.ifremer.fr/archimer/doc/00117/22783/ " target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits6" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits6" /></a></li> </ul> </p> </body>

1 0