Coser-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- 1259 discussions
r1172 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 22 Apr '14
by maven-release＠users.forge.codelutin.com 22 Apr '14
22 Apr '14
Author: maven-release
Date: 2014-04-22 22:44:33 +0200 (Tue, 22 Apr 2014)
New Revision: 1172
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1172
Log:
[maven-release-plugin] prepare release coser-1.5-alpha-3
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 2014-04-22 20:40:58 UTC (rev 1171)
+++ trunk/coser-business/pom.xml 2014-04-22 20:44:33 UTC (rev 1172)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-3</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
+++ trunk/coser-ui/pom.xml 2014-04-22 20:44:33 UTC (rev 1172)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-3</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
+++ trunk/coser-web/pom.xml 2014-04-22 20:44:33 UTC (rev 1172)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-3</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
+++ trunk/pom.xml 2014-04-22 20:44:33 UTC (rev 1172)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,7 +10,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-3</version>
<packaging>pom</packaging>
<name>Coser</name>
@@ -60,9 +59,9 @@
</modules>
<scm>
- <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection>
- <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url>
+ <connection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-3</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-3</developerConnection>
+ <url>https://forge.codelutin.com/repositories/browse/coser/tags/coser-1.5-alpha-3</url>
</scm>
<distributionManagement>
<site>
1
0
r1171 - in trunk: . coser-ui coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/resources/i18n coser-web coser-web/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 22 Apr '14
by tchemit＠users.forge.codelutin.com 22 Apr '14
22 Apr '14
Author: tchemit
Date: 2014-04-22 22:40:58 +0200 (Tue, 22 Apr 2014)
New Revision: 1171
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1171
Log:
fixes #4986
reformat poms at last
Modified:
trunk/coser-ui/pom.xml
trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java
trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties
trunk/coser-web/pom.xml
trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties
trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties
trunk/pom.xml
Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-ui/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
@@ -1,458 +1,459 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>fr.ifremer</groupId>
- <artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>fr.ifremer</groupId>
+ <artifactId>coser</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </parent>
- <groupId>fr.ifremer.coser</groupId>
- <artifactId>coser-ui</artifactId>
- <packaging>jar</packaging>
+ <groupId>fr.ifremer.coser</groupId>
+ <artifactId>coser-ui</artifactId>
+ <packaging>jar</packaging>
- <name>Coser :: UI</name>
- <description>Coser ui module</description>
- <licenses>
- <license>
- <name>GNU General Public License</name>
- <url>http://www.gnu.org/licenses/gpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <name>Coser :: UI</name>
+ <description>Coser ui module</description>
+ <licenses>
+ <license>
+ <name>GNU General Public License</name>
+ <url>http://www.gnu.org/licenses/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <properties>
- <maven.jar.main.class>fr.ifremer.coser.Coser</maven.jar.main.class>
- <license.licenseName>gpl_v3</license.licenseName>
+ <properties>
+ <maven.jar.main.class>fr.ifremer.coser.Coser</maven.jar.main.class>
+ <license.licenseName>gpl_v3</license.licenseName>
- <!-- i18n configuration -->
- <i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName>
+ <!-- i18n configuration -->
+ <i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName>
- <redmine.releaseFiles>target/coser-${project.version}-bin.zip</redmine.releaseFiles>
- </properties>
+ <redmine.releaseFiles>target/coser-${project.version}-bin.zip</redmine.releaseFiles>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>coser-business</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.matrix</groupId>
- <artifactId>nuiton-matrix</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.matrix</groupId>
- <artifactId>nuiton-matrix-gui</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets-extra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.swinglabs.swingx</groupId>
- <artifactId>swingx-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fifesoft</groupId>
- <artifactId>rsyntaxtextarea</artifactId>
- </dependency>
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>jxlayer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
- <artifactId>jfreechart</artifactId>
- </dependency>
- <dependency>
- <groupId>com.bbn</groupId>
- <artifactId>openmap</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>coser-business</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.matrix</groupId>
+ <artifactId>nuiton-matrix</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.matrix</groupId>
+ <artifactId>nuiton-matrix-gui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-widgets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-widgets-extra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.swinglabs.swingx</groupId>
+ <artifactId>swingx-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fifesoft</groupId>
+ <artifactId>rsyntaxtextarea</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>jxlayer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.bbn</groupId>
+ <artifactId>openmap</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>coser.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>coser.properties</exclude>
- </excludes>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>coser.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>coser.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <configuration>
- <generateBundle>true</generateBundle>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <configuration>
+ <generateBundle>true</generateBundle>
+ </configuration>
+ </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>./lib/</classpathPrefix>
- <useUniqueVersions>false</useUniqueVersions>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>./lib/</classpathPrefix>
+ <useUniqueVersions>false</useUniqueVersions>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>coser-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>coser-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-maven-plugin</artifactId>
+ <configuration>
+ <addProjectClassPath>true</addProjectClassPath>
+ <extraImportList>org.jdesktop.swingx.*,java.beans.*</extraImportList>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <entries>
+ <entry>
+ <basedir>${maven.gen.dir}/java/</basedir>
+ </entry>
+ </entries>
+ </configuration>
+ <goals>
+ <goal>parserJava</goal>
+ <goal>parserValidation</goal>
+ <goal>gen</goal>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <silent>true</silent>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <!-- <properties>
+ <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase>
+ </properties> -->
+ <build>
<plugins>
- <plugin>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
+ <artifactId>launch4j-plugin</artifactId>
+ <version>1.5.0.0</version>
+ <executions>
+ <execution>
+ <id>launch4j</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>launch4j</goal>
+ </goals>
<configuration>
- <addProjectClassPath>true</addProjectClassPath>
- <extraImportList>org.jdesktop.swingx.*,java.beans.*</extraImportList>
+ <icon>src/main/resources/icons/coser.ico</icon>
+ <dontWrapJar>true</dontWrapJar>
+ <headerType>gui</headerType>
+ <outfile>target/coser.exe</outfile>
+ <jar>coser.jar</jar>
+ <errTitle>${project.name}</errTitle>
+ <jre>
+ <minVersion>1.6.0</minVersion>
+ <maxHeapSize>1024</maxHeapSize>
+ </jre>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <entries>
- <entry>
- <basedir>${maven.gen.dir}/java/</basedir>
- </entry>
- </entries>
- </configuration>
- <goals>
- <goal>parserJava</goal>
- <goal>parserValidation</goal>
- <goal>gen</goal>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- <silent>true</silent>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-assemblies</id>
+ <phase>verify</phase>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
+ </build>
+ </profile>
+ <profile>
+ <id>jnlp-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <!-- <properties>
+ <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase>
+ </properties> -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>get-keystore</id>
+ <goals>
+ <goal>share-server-secret</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <serverId>codelutin-keystore</serverId>
+ <privateKeyOut>keystorepath</privateKeyOut>
+ <passwordOut>keystorepass</passwordOut>
+ <usernameOut>keyalias</usernameOut>
+ <passphraseOut>keypass</passphraseOut>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <configuration>
+ <libPath>lib</libPath>
+ <makeArchive>false</makeArchive>
+ <verbose>false</verbose>
- <profiles>
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <!-- <properties>
- <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase>
- </properties> -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
- <artifactId>launch4j-plugin</artifactId>
- <version>1.5.0.0</version>
- <executions>
- <execution>
- <id>launch4j</id>
- <phase>verify</phase>
- <goals>
- <goal>launch4j</goal>
- </goals>
- <configuration>
- <icon>src/main/resources/icons/coser.ico</icon>
- <dontWrapJar>true</dontWrapJar>
- <headerType>gui</headerType>
- <outfile>target/coser.exe</outfile>
- <jar>coser.jar</jar>
- <errTitle>${project.name}</errTitle>
- <jre>
- <minVersion>1.6.0</minVersion>
- <maxHeapSize>1024</maxHeapSize>
- </jre>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-assemblies</id>
- <phase>verify</phase>
- <configuration>
- <attach>false</attach>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jnlp-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <!-- <properties>
- <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase>
- </properties> -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>get-keystore</id>
- <goals>
- <goal>share-server-secret</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <serverId>codelutin-keystore</serverId>
- <privateKeyOut>keystorepath</privateKeyOut>
- <passwordOut>keystorepass</passwordOut>
- <usernameOut>keyalias</usernameOut>
- <passphraseOut>keypass</passphraseOut>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
- <configuration>
- <libPath>lib</libPath>
- <makeArchive>false</makeArchive>
- <verbose>false</verbose>
+ <jnlp>
+ <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath>
+ <inputTemplate>src/main/jnlp/coser-jnlp.vm</inputTemplate>
+ <mainClass>${maven.jar.main.class}</mainClass>
+ <allPermissions>true</allPermissions>
+ <offlineAllowed>true</offlineAllowed>
+ <j2seVersion>1.6+</j2seVersion>
+ </jnlp>
- <jnlp>
- <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath>
- <inputTemplate>src/main/jnlp/coser-jnlp.vm</inputTemplate>
- <mainClass>${maven.jar.main.class}</mainClass>
- <allPermissions>true</allPermissions>
- <offlineAllowed>true</offlineAllowed>
- <j2seVersion>1.6+</j2seVersion>
- </jnlp>
+ <!-- Add some extensions for the already signed libs -->
+ <jnlpExtensions>
+ <jnlpExtension>
+ <name>jxlayer</name>
+ <title>Swing labs JXLayer</title>
+ <vendor>Swing Labs</vendor>
+ <includes>
+ <include>org.swinglabs:jxlayer</include>
+ </includes>
+ </jnlpExtension>
+ <!--jnlpExtension>
+ <name>bouncycastle</name>
+ <title>BouncyCastle</title>
+ <vendor>BouncyCastle</vendor>
+ <includes>
+ <include>bouncycastle:bcmail-jdk14</include>
+ <include>bouncycastle:bcprov-jdk14</include>
+ </includes>
+ </jnlpExtension-->
+ </jnlpExtensions>
- <!-- Add some extensions for the already signed libs -->
- <jnlpExtensions>
- <jnlpExtension>
- <name>jxlayer</name>
- <title>Swing labs JXLayer</title>
- <vendor>Swing Labs</vendor>
- <includes>
- <include>org.swinglabs:jxlayer</include>
- </includes>
- </jnlpExtension>
- <!--jnlpExtension>
- <name>bouncycastle</name>
- <title>BouncyCastle</title>
- <vendor>BouncyCastle</vendor>
- <includes>
- <include>bouncycastle:bcmail-jdk14</include>
- <include>bouncycastle:bcprov-jdk14</include>
- </includes>
- </jnlpExtension-->
- </jnlpExtensions>
+ <sign>
+ <keystore>${keystorepath}</keystore>
+ <storepass>${keystorepass}</storepass>
+ <alias>${keyalias}</alias>
+ <keypass>${keypass}</keypass>
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
- <sign>
- <keystore>${keystorepath}</keystore>
- <storepass>${keystorepass}</storepass>
- <alias>${keyalias}</alias>
- <keypass>${keypass}</keypass>
- <verify>true</verify>
- <keystoreConfig>
- <delete>false</delete>
- <gen>false</gen>
- </keystoreConfig>
- </sign>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-jnlp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <version>${webstartPluginVersion}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
- </configuration>
- <executions>
- <execution>
- <id>generate-jnlp</id>
- <phase>package</phase>
- <goals>
- <goal>jnlp-inline</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
- <version>${webstartPluginVersion}</version>
- </plugin>
- </plugins>
- </reporting>
- </profile>
+ <profile>
+ <id>reporting</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
- <profile>
- <id>reporting</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
+ <reporting>
+ <plugins>
- <reporting>
- <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${projectInfoReportsPluginVersion}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${projectInfoReportsPluginVersion}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-maven-report-plugin</artifactId>
+ <version>${nuitonReportPluginVersion}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>config-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <i18nBundleName>${coserI18nBundle}</i18nBundleName>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-maven-report-plugin</artifactId>
- <version>${nuitonReportPluginVersion}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>config-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <i18nBundleName>${coserI18nBundle}</i18nBundleName>
- </configuration>
- </plugin>
+ </plugins>
+ </reporting>
- </plugins>
- </reporting>
-
- </profile>
- </profiles>
+ </profile>
+ </profiles>
</project>
Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2014-04-22 20:40:58 UTC (rev 1171)
@@ -45,6 +45,13 @@
private static final Log log = LogFactory.getLog(CoserConfig.class);
+ static {
+ //FIXME This in jaxx
+ n("numbereditor.cleanAll");
+ n("numbereditor.cleanOne");
+ n("numbereditor.dot");
+ n("numbereditor.sign");
+ }
public CoserConfig() {
// init configuration with default options
loadDefaultOptions(CoserOption.values());
Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
===================================================================
--- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2014-04-22 20:40:58 UTC (rev 1171)
@@ -42,12 +42,12 @@
coser.ui.control.globalErrorMenuSelectAll=Select all lines
coser.ui.control.graph.species=Species \:
coser.ui.control.progressStep=Step %d/%d \: %s
-coser.ui.control.project.requiredauthor=
-coser.ui.control.project.requiredcatchFile=
-coser.ui.control.project.requiredhaulFile=
-coser.ui.control.project.requiredlengthFile=
-coser.ui.control.project.requiredname=
-coser.ui.control.project.requiredstrataFile=
+coser.ui.control.project.requiredauthor=Project author required
+coser.ui.control.project.requiredcatchFile=Project catch file required
+coser.ui.control.project.requiredhaulFile=Project haul file required
+coser.ui.control.project.requiredlengthFile=Project length file required
+coser.ui.control.project.requiredname=Project name required
+coser.ui.control.project.requiredstrataFile=Project strat file required
coser.ui.control.replace.find=Find \:
coser.ui.control.replace.inField=In field \:
coser.ui.control.replace.replace=Replace \:
@@ -173,10 +173,10 @@
coser.ui.result.otherDataFile=Other files \:
coser.ui.result.publiableResult=Publiable \:
coser.ui.result.removeOtherDataFile=Remove file
-coser.ui.result.requiredestComIndPath=
-coser.ui.result.requiredestPopIndPath=
-coser.ui.result.requiredname=
-coser.ui.result.requiredrsufiVersion=
+coser.ui.result.requiredestComIndPath=community indicators required
+coser.ui.result.requiredestPopIndPath=population indicators required
+coser.ui.result.requiredname=name required
+coser.ui.result.requiredrsufiVersion=rsufi version required
coser.ui.result.resultName=Result name \:
coser.ui.result.resultTitle=Result
coser.ui.result.rsufiVersion=RSufi version \:
@@ -215,7 +215,7 @@
coser.ui.selection.details.selectAllSpeciesTip=Select all
coser.ui.selection.details.selectedSpecies=L1 \: Selected species (%d/%d) \:
coser.ui.selection.details.showMapTip=Display strata map
-coser.ui.selection.details.showSpeciesTip=
+coser.ui.selection.details.showSpeciesTip=Show species lists
coser.ui.selection.details.speciesDataDescription=Haul count by strata and year \:
coser.ui.selection.details.speciescontextmenu=For more options, use species lists contextual menu
coser.ui.selection.details.strata=Strata (%d/%d) \:
@@ -267,8 +267,8 @@
coser.ui.selection.replay.selectioninfos=Selection information \:
coser.ui.selection.rsufidataextracted=RSufi data extracted.
coser.ui.selection.saveError=Save error
-coser.ui.selection.selection.requiredDescription=
-coser.ui.selection.selection.requiredName=
+coser.ui.selection.selection.requiredDescription=description required
+coser.ui.selection.selection.requiredName=name required
coser.ui.selection.selectionCreated=Selection created.
coser.ui.selection.selectionFilterDescription=Coser selection (*.selection)
coser.ui.selection.selectionSaved=Selection saved.
@@ -322,3 +322,7 @@
coser.ui.validators.saveValidator=Save control
coser.ui.validators.title=Controls
coser.ui.validators.validators=Validators \:
+numbereditor.cleanAll=C
+numbereditor.cleanOne=CE
+numbereditor.dot=.
+numbereditor.sign=-
Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties
===================================================================
--- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2014-04-22 20:40:58 UTC (rev 1171)
@@ -42,12 +42,12 @@
coser.ui.control.globalErrorMenuSelectAll=Sélectionner toutes les lignes
coser.ui.control.graph.species=Espèces \:
coser.ui.control.progressStep=Étape %d/%d \: %s
-coser.ui.control.project.requiredauthor=
-coser.ui.control.project.requiredcatchFile=
-coser.ui.control.project.requiredhaulFile=
-coser.ui.control.project.requiredlengthFile=
-coser.ui.control.project.requiredname=
-coser.ui.control.project.requiredstrataFile=
+coser.ui.control.project.requiredauthor=Auteur obligatoire
+coser.ui.control.project.requiredcatchFile=Fichier de captures obligatoire
+coser.ui.control.project.requiredhaulFile=Fichier de traits obligatoire
+coser.ui.control.project.requiredlengthFile=Fichier de tailles obligatoire
+coser.ui.control.project.requiredname=Nom obligatoire
+coser.ui.control.project.requiredstrataFile=Fichier de strates obligatoire
coser.ui.control.replace.find=Chercher \:
coser.ui.control.replace.inField=Dans le champ \:
coser.ui.control.replace.replace=Remplacer \:
@@ -173,10 +173,10 @@
coser.ui.result.otherDataFile=Autre fichiers \:
coser.ui.result.publiableResult=Publiable \:
coser.ui.result.removeOtherDataFile=Supprimer le fichier
-coser.ui.result.requiredestComIndPath=
-coser.ui.result.requiredestPopIndPath=
-coser.ui.result.requiredname=
-coser.ui.result.requiredrsufiVersion=
+coser.ui.result.requiredestComIndPath=fichier d'indices de communauté obligatoire
+coser.ui.result.requiredestPopIndPath=fichier d'indices de population obligatoire
+coser.ui.result.requiredname=Nom obligatoire
+coser.ui.result.requiredrsufiVersion=Version de RSufi obligatoire
coser.ui.result.resultName=Nom du résultat \:
coser.ui.result.resultTitle=Résultat
coser.ui.result.rsufiVersion=Version de RSufi \:
@@ -267,8 +267,8 @@
coser.ui.selection.replay.selectioninfos=Information sur la sélection \:
coser.ui.selection.rsufidataextracted=Données RSufi extraites.
coser.ui.selection.saveError=Erreur de sauvegarde
-coser.ui.selection.selection.requiredDescription=
-coser.ui.selection.selection.requiredName=
+coser.ui.selection.selection.requiredDescription=description obligatoire
+coser.ui.selection.selection.requiredName=nom obligatoire
coser.ui.selection.selectionCreated=Sélection créée.
coser.ui.selection.selectionFilterDescription=Coser sélection (*.selection)
coser.ui.selection.selectionSaved=Sélection sauvée.
@@ -322,3 +322,7 @@
coser.ui.validators.saveValidator=Sauvegarder le contrôle
coser.ui.validators.title=Contrôles
coser.ui.validators.validators=Validateurs \:
+numbereditor.cleanAll=C
+numbereditor.cleanOne=CE
+numbereditor.dot=.
+numbereditor.sign=-
Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-web/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
@@ -1,233 +1,234 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>fr.ifremer</groupId>
- <artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>fr.ifremer</groupId>
+ <artifactId>coser</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </parent>
- <groupId>fr.ifremer.coser</groupId>
- <artifactId>coser-web</artifactId>
- <packaging>war</packaging>
+ <groupId>fr.ifremer.coser</groupId>
+ <artifactId>coser-web</artifactId>
+ <packaging>war</packaging>
- <name>Coser :: Web</name>
- <description>Coser web module</description>
- <licenses>
- <license>
- <name>GNU Affero General Public License</name>
- <url>http://www.gnu.org/licenses/agpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <name>Coser :: Web</name>
+ <description>Coser web module</description>
+ <licenses>
+ <license>
+ <name>GNU Affero General Public License</name>
+ <url>http://www.gnu.org/licenses/agpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <properties>
- <license.licenseName>agpl_v3</license.licenseName>
- <redmine.releaseFiles>target/coser-${project.version}.war</redmine.releaseFiles>
+ <properties>
+ <license.licenseName>agpl_v3</license.licenseName>
+ <redmine.releaseFiles>target/coser-${project.version}.war</redmine.releaseFiles>
- <!-- dev Mode (pass to false at release time) -->
- <devMode>true</devMode>
+ <!-- dev Mode (pass to false at release time) -->
+ <devMode>true</devMode>
- <!-- i18n configuration -->
- <i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName>
+ <!-- i18n configuration -->
+ <i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName>
- <!-- deploy configuration -->
- <deployFiles>target/coser-${project.version}.war</deployFiles>
+ <!-- deploy configuration -->
+ <deployFiles>target/coser-${project.version}.war</deployFiles>
- <!-- Post Release configuration -->
- <skipPostRelease>false</skipPostRelease>
- </properties>
+ <!-- Post Release configuration -->
+ <skipPostRelease>false</skipPostRelease>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>coser-business</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuiton.web</groupId>
- <artifactId>nuiton-struts2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.xwork</groupId>
- <artifactId>xwork-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-convention-plugin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-sitemesh-plugin</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-json-plugin</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>coser-business</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuiton.web</groupId>
+ <artifactId>nuiton-struts2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-convention-plugin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-sitemesh-plugin</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-json-plugin</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <finalName>coser-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>coserweb.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>coserweb.properties</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>parseJsp</id>
- <goals>
- <goal>parserStruts2</goal>
- </goals>
- <configuration>
- <acceptKeyFormat>^message\..*$</acceptKeyFormat>
- </configuration>
- </execution>
- <execution>
- <id>parseOthersAndGen</id>
- <goals>
- <goal>parserValidation</goal>
- <goal>parserJava</goal>
- <goal>gen</goal>
- </goals>
- <configuration>
- <userRulesFiles>
- <file>${basedir}/src/main/validationRules.txt</file>
- </userRulesFiles>
- </configuration>
- </execution>
- <execution>
- <id>bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <showEmpty>true</showEmpty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <finalName>coser-${project.version}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>coserweb.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>coserweb.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parseJsp</id>
+ <goals>
+ <goal>parserStruts2</goal>
+ </goals>
+ <configuration>
+ <acceptKeyFormat>^message\..*$</acceptKeyFormat>
+ </configuration>
+ </execution>
+ <execution>
+ <id>parseOthersAndGen</id>
+ <goals>
+ <goal>parserValidation</goal>
+ <goal>parserJava</goal>
+ <goal>gen</goal>
+ </goals>
+ <configuration>
+ <userRulesFiles>
+ <file>${basedir}/src/main/validationRules.txt</file>
+ </userRulesFiles>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <configuration>
+ <showEmpty>true</showEmpty>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <properties>
- <devMode>false</devMode>
- </properties>
- </profile>
+ <profiles>
+ <profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <devMode>false</devMode>
+ </properties>
+ </profile>
- <profile>
- <id>reporting</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
+ <profile>
+ <id>reporting</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
- <reporting>
- <plugins>
+ <reporting>
+ <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${projectInfoReportsPluginVersion}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${projectInfoReportsPluginVersion}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-maven-report-plugin</artifactId>
- <version>${nuitonReportPluginVersion}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>config-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <i18nBundleName>${coserI18nBundle}</i18nBundleName>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-maven-report-plugin</artifactId>
+ <version>${nuitonReportPluginVersion}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>config-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <i18nBundleName>${coserI18nBundle}</i18nBundleName>
+ </configuration>
+ </plugin>
- </plugins>
- </reporting>
+ </plugins>
+ </reporting>
- </profile>
+ </profile>
- </profiles>
+ </profiles>
</project>
Modified: trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties
===================================================================
--- trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2014-04-22 20:40:58 UTC (rev 1171)
@@ -36,7 +36,6 @@
message.common.selectfacade=Select an area
message.common.selectindicator=Select an indicator
message.common.selectnone=Unselect all
-message.common.selectpop=Select a population
message.common.selectspecies=Select a species
message.common.selectsurvey=Select a survey
message.common.selectzone=Select an area
@@ -93,14 +92,12 @@
message.layout.title=Population and community indices derived from scientific surveys carried out by Ifremer.
message.map.citation=Trenkel V.M., O. Berthelé, P. Lorance, J.A. Bertrand, A. Brind'Amour, M.L. Cochard, F. Coppin, J.P. Leauté, J.C. Mahé, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. Vérin, 2009. Grands invertébrés et poissons observés par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH \: 09-003. %1s. 100 p.
message.map.citationtitle=Citation
-message.map.downloadaspdf=Download as PDF
message.map.linkarchimer=Access atlas \: %1s
message.map.paragraph1=The objectif of these maps is to provide a rough indication of the spatial distribution of certain fish and shelfish species as provided by scientific surveys.
message.map.paragraph2=For each area a systematic grid was defined and the simple average density across years and hauls was calculated in numbers per km2. For mapping purposes, grid cells were coloured using a percentile scale\: blue\: species never observed, light yellow\: average density between [0- 25 %[; dark yellow\: [25-50 %[, orange \: [50-75 %[ and red \: [75-100 %]. Thus, cells with the highest average density are in red.
message.map.title=Distribution maps
message.map.warning=Warning
message.map.warningcontent=The maps should not be interpreted as biological distribution maps but as the areas where the species are caught during the scientific surveys. As the different surveys use different samplin gear and are carried out at different times of the year, there can be differences in catchability among surveys and consequently among areas.
-message.pop.downloadascsv=Download as CSV
message.pop.moredetailspdf=More details about computed population indices
message.pop.paragraph1=The presented indices have been selected with respect to their capacity to inform on the impact of fishing and for integration into indicator dashboards for exploited ecosystems.
message.pop.paragraph2=The data correspond to the value of each indicator. The information has been validated by an expert group within the framework of a holostic population and community indicator approach. The results are presented by geographic area or by species for all available data series. The user can select the geographic area, the season (for seasonal surveys), the species and the index. If data is available for a given selection, a figure is produced that shows the time series of the index, plus-minus one standard deviation. It is possible to extract the corresponding table with index values by year, standard deviations and coefficients of variation.
Modified: trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties
===================================================================
--- trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2014-04-22 20:40:58 UTC (rev 1171)
@@ -36,7 +36,6 @@
message.common.selectfacade=Sélectionnez une façade
message.common.selectindicator=Sélectionnez un indicateur
message.common.selectnone=Tout dé-sélectionner
-message.common.selectpop=Sélectionnez une population
message.common.selectspecies=Sélectionnez une espèce
message.common.selectsurvey=Sélectionnez une campagne
message.common.selectzone=Sélectionnez une zone
@@ -93,14 +92,12 @@
message.layout.title=Indices de populations et de communautés issus des campagnes de surveillance halieutique auxquelles participe l'Ifremer
message.map.citation=Trenkel V.M., O. Berthelé, P. Lorance, J.A. Bertrand, A. Brind'Amour, M.L. Cochard, F. Coppin, J.P. Leauté, J.C. Mahé, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. Vérin, 2009. Grands invertébrés et poissons observés par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH \: 09-003. %1$s. 100 p.
message.map.citationtitle=Citation
-message.map.downloadaspdf=Télécharger en PDF
message.map.linkarchimer=Accès à l'atlas \: %1$s
message.map.paragraph1=L'objectif de cet atlas est de donner un aperçu de la distribution spatiale des espèces de poissons et de certains invertébrés marins à partir des observations des campagnes de pêche scientifiques.
message.map.paragraph2=Pour chaque zone un quadrillage systématique a été défini, puis la densité moyenne par km² dans chaque cellule a été calculée en utilisant les observations de toute la période. Pour la représentation cartographique, les cellules avec des densités moyenne correspondant aux quartiles de densité ont reçu la même couleur \: bleu \: espèce jamais observée, jaune clair \: densité moyenne entre [0 et 25 %[; jaune foncé \: [25-50 %[, orange \: [50-75 %[ et rouge \: [75-100 %]. Donc, les zones où se trouvent les densités les plus élevées en moyenne sont représentées en rouge.
message.map.title=Cartes de distribution
message.map.warning=Avertissement
message.map.warningcontent=Les cartes présentées ne doivent pas être interprétées comme des cartes de distribution des espèces mais comme celle des zones où elles sont capturées lors des campagnes scientifiques. Les campagnes étant réalisées avec des chaluts différents et à différentes saisons, les espèces peuvent avoir des capturabilités très différentes entre les séries de campagnes, donc d'une zone à l'autre.
-message.pop.downloadascsv=Télécharger en CSV
message.pop.moredetailspdf=Plus d'informations sur les indices calculés des populations
message.pop.paragraph1=Les indices présentés ont été sélectionnés en référence à leur aptitude à renseigner sur l'impact de la pêche, en vue de leur intégration dans des tableaux de bord d'indicateurs d'évolution d'écosystèmes exploités par la pêche.
message.pop.paragraph2=Les données disponibles sur le site sont les valeurs de chaque indice. Les informations ont été validées par un groupe de travail dans une approche intégrative d'indicateurs de populations et de communautés. Les résultats sont donnés par zone géographique et par espèce pour l'ensemble de la série de données disponible. L'utilisateur peut sélectionner la zone géographique, la saison (dans le cas de séries saisonnières), l'espèce et l'indice. Pour les sélections pour lesquelles une information est disponible, le système produit un graphe présentant la distribution temporelle de l'indice, avec une représentation de l'écart-type. Il fournit la possibilité d'extraire la table des données correspondantes, incluant la valeur de l'indice par année, ainsi que son écart-type et son coefficient de variation.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-04-22 20:17:55 UTC (rev 1170)
+++ trunk/pom.xml 2014-04-22 20:40:58 UTC (rev 1171)
@@ -1,344 +1,345 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.nuiton</groupId>
- <artifactId>mavenpom4redmine</artifactId>
- <version>5.0.6</version>
- </parent>
+ <parent>
+ <groupId>org.nuiton</groupId>
+ <artifactId>mavenpom4redmine</artifactId>
+ <version>5.0.6</version>
+ </parent>
- <groupId>fr.ifremer</groupId>
- <artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>fr.ifremer</groupId>
+ <artifactId>coser</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Coser</name>
- <description>Contrôle et Sélection RSufi</description>
- <url>http://doc.codelutin.com/coser</url>
- <inceptionYear>2010</inceptionYear>
- <organization>
- <name>Ifremer</name>
- <url>http://www.ifremer.fr/</url>
- </organization>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <name>Coser</name>
+ <description>Contrôle et Sélection RSufi</description>
+ <url>http://doc.codelutin.com/coser</url>
+ <inceptionYear>2010</inceptionYear>
+ <organization>
+ <name>Ifremer</name>
+ <url>http://www.ifremer.fr/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <developers>
- <developer>
- <id>echatellier</id>
- <name>Eric Chatellier</name>
- <email>chatellier(a)codelutin.com</email>
- <organization>CodeLutin</organization>
- <roles>
- <role>Développeur</role>
- </roles>
- <timezone>Europe/Paris</timezone>
- </developer>
- <developer>
- <id>tchemit</id>
- <name>Tony Chemit</name>
- <email>chemit(a)codelutin.com</email>
- <organization>CodeLutin</organization>
- <roles>
- <role>Développeur</role>
- </roles>
- <timezone>Europe/Paris</timezone>
- </developer>
- </developers>
+ <developers>
+ <developer>
+ <id>echatellier</id>
+ <name>Eric Chatellier</name>
+ <email>chatellier(a)codelutin.com</email>
+ <organization>CodeLutin</organization>
+ <roles>
+ <role>Développeur</role>
+ </roles>
+ <timezone>Europe/Paris</timezone>
+ </developer>
+ <developer>
+ <id>tchemit</id>
+ <name>Tony Chemit</name>
+ <email>chemit(a)codelutin.com</email>
+ <organization>CodeLutin</organization>
+ <roles>
+ <role>Développeur</role>
+ </roles>
+ <timezone>Europe/Paris</timezone>
+ </developer>
+ </developers>
- <modules>
- <module>coser-business</module>
- <module>coser-ui</module>
- <module>coser-web</module>
- </modules>
+ <modules>
+ <module>coser-business</module>
+ <module>coser-ui</module>
+ <module>coser-web</module>
+ </modules>
- <scm>
- <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection>
- <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url>
- </scm>
- <distributionManagement>
- <site>
- <id>doc.${platform}</id>
- <url>${our.site.repository}/coser</url>
- </site>
- </distributionManagement>
+ <scm>
+ <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection>
+ <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url>
+ </scm>
+ <distributionManagement>
+ <site>
+ <id>doc.${platform}</id>
+ <url>${our.site.repository}/coser</url>
+ </site>
+ </distributionManagement>
- <properties>
- <projectId>coser</projectId>
- <platform>codelutin.com</platform>
+ <properties>
+ <projectId>coser</projectId>
+ <platform>codelutin.com</platform>
- <!-- license configuration -->
- <license.licenseName>lgpl_v3</license.licenseName>
- <license.organizationName>Ifremer, Codelutin</license.organizationName>
+ <!-- license configuration -->
+ <license.licenseName>lgpl_v3</license.licenseName>
+ <license.organizationName>Ifremer, Codelutin</license.organizationName>
- <!-- i18n configuration -->
- <i18n.bundles>fr_FR,en_GB</i18n.bundles>
- <i18n.silent>true</i18n.silent>
- <coserI18nBundle>coser-i18n</coserI18nBundle>
+ <!-- i18n configuration -->
+ <i18n.bundles>fr_FR,en_GB</i18n.bundles>
+ <i18n.silent>true</i18n.silent>
+ <coserI18nBundle>coser-i18n</coserI18nBundle>
- <!-- Release configuration -->
- <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain>
+ <!-- Release configuration -->
+ <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain>
- <!-- Versions -->
- <jaxxVersion>2.8.2</jaxxVersion>
- <nuitonI18nVersion>3.0</nuitonI18nVersion>
- <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion>
- <struts.version>2.3.16.1</struts.version>
- <nuitonReportPluginVersion>3.0-rc-1</nuitonReportPluginVersion>
+ <!-- Versions -->
+ <jaxxVersion>2.8.4</jaxxVersion>
+ <nuitonI18nVersion>3.0</nuitonI18nVersion>
+ <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion>
+ <strutsVersion>2.3.16.1</strutsVersion>
+ <nuitonReportPluginVersion>3.0-rc-1</nuitonReportPluginVersion>
- </properties>
+ </properties>
- <repositories>
- <repository>
- <id>coser-group</id>
- <url>https://nexus.nuiton.org/nexus/content/groups/coser-group</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>coser-group</id>
+ <url>https://nexus.nuiton.org/nexus/content/groups/coser-group</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
- <dependencyManagement>
- <dependencies>
+ <dependencyManagement>
+ <dependencies>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- <version>3.0-rc-2</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ <version>3.0-rc-2</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-config</artifactId>
- <version>3.0-alpha-2</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ <version>3.0-alpha-2</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- <version>3.0-rc-1</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-validator</artifactId>
+ <version>3.0-rc-1</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.matrix</groupId>
- <artifactId>nuiton-matrix</artifactId>
- <version>${nuitonMatrixVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.matrix</groupId>
- <artifactId>nuiton-matrix-gui</artifactId>
- <version>${nuitonMatrixVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.matrix</groupId>
+ <artifactId>nuiton-matrix</artifactId>
+ <version>${nuitonMatrixVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
- <version>${nuitonI18nVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.matrix</groupId>
+ <artifactId>nuiton-matrix-gui</artifactId>
+ <version>${nuitonMatrixVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.web</groupId>
- <artifactId>nuiton-struts2</artifactId>
- <version>1.16</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ <version>${nuitonI18nVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${jaxxVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.web</groupId>
+ <artifactId>nuiton-struts2</artifactId>
+ <version>1.16</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-validator</artifactId>
- <version>${jaxxVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-runtime</artifactId>
+ <version>${jaxxVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets-extra</artifactId>
- <version>${jaxxVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-validator</artifactId>
+ <version>${jaxxVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets</artifactId>
- <version>${jaxxVersion}</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-widgets-extra</artifactId>
+ <version>${jaxxVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.swinglabs.swingx</groupId>
- <artifactId>swingx-core</artifactId>
- <version>1.6.4</version>
- </dependency>
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-widgets</artifactId>
+ <version>${jaxxVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.3</version>
- </dependency>
+ <dependency>
+ <groupId>org.swinglabs.swingx</groupId>
+ <artifactId>swingx-core</artifactId>
+ <version>1.6.4</version>
+ </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.17</version>
- <exclusions>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jfree</groupId>
- <artifactId>jcommon</artifactId>
- <version>1.0.21</version>
- </dependency>
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>2.3</version>
+ </dependency>
- <dependency>
- <groupId>com.fifesoft</groupId>
- <artifactId>rsyntaxtextarea</artifactId>
- <version>2.0.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>com.bbn</groupId>
- <artifactId>openmap</artifactId>
- <version>5.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>jxlayer</artifactId>
- <version>3.0.4</version>
- </dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>${struts.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>1.0.21</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-convention-plugin</artifactId>
- <version>${struts.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-sitemesh-plugin</artifactId>
- <version>${struts.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.fifesoft</groupId>
+ <artifactId>rsyntaxtextarea</artifactId>
+ <version>2.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-json-plugin</artifactId>
- <version>${struts.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.bbn</groupId>
+ <artifactId>openmap</artifactId>
+ <version>5.0</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.struts.xwork</groupId>
- <artifactId>xwork-core</artifactId>
- <version>${struts.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>jxlayer</artifactId>
+ <version>3.0.4</version>
+ </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.18.1-GA</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${strutsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-convention-plugin</artifactId>
+ <version>${strutsVersion}</version>
+ </dependency>
- <dependency>
- <groupId>com.itextpdf</groupId>
- <artifactId>itextpdf</artifactId>
- <version>5.5.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-sitemesh-plugin</artifactId>
+ <version>${strutsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-json-plugin</artifactId>
+ <version>${strutsVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ <version>${strutsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.18.1-GA</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.xhtmlrenderer</groupId>
+ <artifactId>flying-saucer-pdf-itext5</artifactId>
+ <version>9.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.20</version>
+ </dependency>
+ </dependencies>
+
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-maven-plugin</artifactId>
+ <version>${jaxxVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <version>${nuitonI18nVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jettyPluginVersion}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <locales>fr,en</locales>
+ </configuration>
+ <dependencies>
<dependency>
- <groupId>org.xhtmlrenderer</groupId>
- <artifactId>flying-saucer-pdf-itext5</artifactId>
- <version>9.0.4</version>
+ <groupId>org.nuiton.jrst</groupId>
+ <artifactId>doxia-module-jrst</artifactId>
+ <version>${jrstPluginVersion}</version>
</dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.20</version>
- </dependency>
- </dependencies>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-maven-plugin</artifactId>
- <version>${jaxxVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <version>${nuitonI18nVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jettyPluginVersion}</version>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <locales>fr,en</locales>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.nuiton.jrst</groupId>
- <artifactId>doxia-module-jrst</artifactId>
- <version>${jrstPluginVersion}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<reporting>
<!-- par defaut pas de report pour les sites -->
@@ -349,6 +350,23 @@
<profiles>
<profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- to use prod config in struts.xml config file -->
+ <devMode>false</devMode>
+
+ <!-- make sure i18n is fully complete -->
+ <i18n.failsIfWarning>true</i18n.failsIfWarning>
+ </properties>
+ </profile>
+
+ <profile>
<id>reporting</id>
<activation>
<property>
1
0
r1170 - trunk/coser-business/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 22 Apr '14
by tchemit＠users.forge.codelutin.com 22 Apr '14
22 Apr '14
Author: tchemit
Date: 2014-04-22 22:17:55 +0200 (Tue, 22 Apr 2014)
New Revision: 1170
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1170
Log:
refs #4986
Modified:
trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2014-04-22 20:16:57 UTC (rev 1169)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2014-04-22 20:17:55 UTC (rev 1170)
@@ -1,26 +1,26 @@
-Can't\ create\ project=
-Can't\ find\ line\ %s\ for\ deletion=
-Can't\ find\ line\ %s\ for\ undeletion=
-Can't\ read\ file\ %s\ for\ category\ %s=
-Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=
-Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
-Creating\ matrix\ \:\ %d*%d*%d*%d=
-Missing\ file\ %s=
-Missing\ maturity\ attribute=
-Missing\ sex\ attribute=
-Missing\ species\ name=
-Missing\ stratum\ name=
-Missing\ survey\ name=
-Missing\ sweptSurface\ attribute=
-Project\ %s\ already\ exist=
-Project\ %s\ doesn't\ exists\ \!=
-Selection\ %s\ already\ exists=
-Selection\ %s\ doesn't\ exists\ \!=
+Can't\ create\ project=Can't create project
+Can't\ find\ line\ %s\ for\ deletion=Can't find line %s for deletion
+Can't\ find\ line\ %s\ for\ undeletion=Can't find line %s for undeletion
+Can't\ read\ file\ %s\ for\ category\ %s=Can't read file %s for category %s
+Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Can't read file '%s'. Check CSV file separator
+Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=Can't replace data value. Expected %s but was %s
+Creating\ matrix\ \:\ %d*%d*%d*%d=Creating matrix \: %d*%d*%d*%d
+Missing\ file\ %s=Missing file %s
+Missing\ maturity\ attribute=Missing maturity attribute
+Missing\ sex\ attribute=Missing sex attribute
+Missing\ species\ name=Missing species name
+Missing\ stratum\ name=Missing stratum name
+Missing\ survey\ name=Missing survey name
+Missing\ sweptSurface\ attribute=Missing sweptSurface attribute
+Project\ %s\ already\ exist=Project %s already exist
+Project\ %s\ doesn't\ exists\ \!=Project %s doesn't exists \!
+Selection\ %s\ already\ exists=Selection %s already exists
+Selection\ %s\ doesn't\ exists\ \!=Selection %s doesn't exists \!
Species\ %s\ already\ exists\ in\ current\ selection=Species %s already exists in current selection.\nYou have to perform merge with this species.
-Species\ %s\ doesn't\ exist\ in\ referential=
+Species\ %s\ doesn't\ exist\ in\ referential=Species %s doesn't exist in referential
Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s
Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s\nor\n\t%s
-age\ attribute\ is\ not\ a\ valid\ double=
+age\ attribute\ is\ not\ a\ valid\ double=age attribute is not a valid double
coser.business.category.catch=Catch
coser.business.category.haul=Haul
coser.business.category.length=Length
@@ -184,20 +184,20 @@
coser.config.web.properties.file.description=Web informations properties file
coser.config.web.uploadurl.description=Coser server upload result url
coser.config.web.zones.file.description=Zones match file
-depth\ attribute\ is\ not\ a\ valid\ double=
-haul\ name\ is\ not\ valid=
-lat\ attribute\ is\ not\ a\ valid\ double=
-lat\ must\ contain\ at\ least\ 4\ decimals=
-length\ attribute\ is\ not\ a\ valid\ double=
-length\ attribute\ must\ be\ positive=
-long\ attribute\ is\ not\ a\ valid\ double=
-long\ must\ contain\ at\ least\ 4\ decimals=
-month\ is\ not\ valid\ (2\ digits)=
-number\ attribute\ is\ not\ a\ valid\ double=
-surface\ attribute\ is\ not\ a\ valid\ double=
-surface\ attribute\ must\ be\ positive=
-sweptSurface\ attribute\ is\ not\ a\ valid\ double=
-sweptSurface\ attribute\ must\ be\ positive=
-sweptSurface\ must\ contain\ at\ least\ 3\ decimals=
-weight\ attribute\ is\ not\ a\ valid\ double=
-year\ is\ not\ valid\ (4\ digits.2\ digits)=
+depth\ attribute\ is\ not\ a\ valid\ double=depth attribute is not a valid double
+haul\ name\ is\ not\ valid=haul name is not valid
+lat\ attribute\ is\ not\ a\ valid\ double=lat attribute is not a valid double
+lat\ must\ contain\ at\ least\ 4\ decimals=lat must contain at least 4 decimals
+length\ attribute\ is\ not\ a\ valid\ double=length attribute is not a valid double
+length\ attribute\ must\ be\ positive=length attribute must be positive
+long\ attribute\ is\ not\ a\ valid\ double=long attribute is not a valid double
+long\ must\ contain\ at\ least\ 4\ decimals=long must contain at least 4 decimals
+month\ is\ not\ valid\ (2\ digits)=month is not valid (2 digits)
+number\ attribute\ is\ not\ a\ valid\ double=number attribute is not a valid double
+surface\ attribute\ is\ not\ a\ valid\ double=surface attribute is not a valid double
+surface\ attribute\ must\ be\ positive=surface attribute must be positive
+sweptSurface\ attribute\ is\ not\ a\ valid\ double=sweptSurface attribute is not a valid double
+sweptSurface\ attribute\ must\ be\ positive=sweptSurface attribute must be positive
+sweptSurface\ must\ contain\ at\ least\ 3\ decimals=sweptSurface must contain at least 3 decimals
+weight\ attribute\ is\ not\ a\ valid\ double=weight attribute is not a valid double
+year\ is\ not\ valid\ (4\ digits.2\ digits)=year is not valid (4 digits.2 digits)
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2014-04-22 20:16:57 UTC (rev 1169)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2014-04-22 20:17:55 UTC (rev 1170)
@@ -3,7 +3,7 @@
Can't\ find\ line\ %s\ for\ undeletion=Impossible de trouver la ligne %s a rétablir
Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la catégorie %s \!
Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de vérifier le séparateur utilisé est bien un point-virgule ';'
-Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
+Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=impossivle de remplacer la données. Attendu %s mais trouvé %s
Creating\ matrix\ \:\ %d*%d*%d*%d=Impossible de créer la matrice \: %d*%d*%d*%d
Missing\ file\ %s=Fichier manquant \: %s
Missing\ maturity\ attribute=Attribut maturité manquant
1
0
Author: tchemit
Date: 2014-04-22 22:16:57 +0200 (Tue, 22 Apr 2014)
New Revision: 1169
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1169
Log:
fixes #4987
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-26 08:01:15 UTC (rev 1168)
+++ trunk/pom.xml 2014-04-22 20:16:57 UTC (rev 1169)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>5.0.4</version>
+ <version>5.0.6</version>
</parent>
<groupId>fr.ifremer</groupId>
1
0
The Coser team is pleased to announce the coser-1.5-alpha-2 release!
Contrôle et Sélection RSufi
Documentation of the project can be found here:
http://doc.codelutin.com/coser
Changes
-------
Changes in this version include:
New features:
o Publier des résultats de type EchoBase et RSufi sur le site des indicateurs Issue: 4834. Thanks to Tony Chemit. Resolved by tchemit.
o Sélectionner les résultats echobase et les publier depuis le client Issue: 4833. Thanks to Tony Chemit. Resolved by tchemit.
Downloads
---------
For a manual installation, you can download files here:
https://forge.codelutin.com/projects/coser/files
* coser-1.5-alpha-2-bin.zip - https://forge.codelutin.com/attachments/download/1625
* coser-1.5-alpha-2.war - https://forge.codelutin.com/attachments/download/1626
Maven artifacts
---------------
Artifacts are deployed in nuiton maven repository
http://maven.nuiton.org/other-releases/
Have fun!
-Coser team
1
0
r1168 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 26 Mar '14
by maven-release＠users.forge.codelutin.com 26 Mar '14
26 Mar '14
Author: maven-release
Date: 2014-03-26 09:01:15 +0100 (Wed, 26 Mar 2014)
New Revision: 1168
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1168
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 2014-03-26 08:01:09 UTC (rev 1167)
+++ trunk/coser-business/pom.xml 2014-03-26 08:01:15 UTC (rev 1168)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-alpha-2</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml 2014-03-26 08:01:09 UTC (rev 1167)
+++ trunk/coser-ui/pom.xml 2014-03-26 08:01:15 UTC (rev 1168)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-alpha-2</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml 2014-03-26 08:01:09 UTC (rev 1167)
+++ trunk/coser-web/pom.xml 2014-03-26 08:01:15 UTC (rev 1168)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-alpha-2</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-26 08:01:09 UTC (rev 1167)
+++ trunk/pom.xml 2014-03-26 08:01:15 UTC (rev 1168)
@@ -10,7 +10,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-alpha-2</version>
+ <version>1.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Coser</name>
@@ -59,9 +59,9 @@
</modules>
<scm>
- <connection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-2</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-2</developerConnection>
- <url>https://forge.codelutin.com/repositories/browse/coser/tags/coser-1.5-alpha-2</url>
+ <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection>
+ <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url>
</scm>
<distributionManagement>
<site>
1
0
Author: maven-release
Date: 2014-03-26 09:01:09 +0100 (Wed, 26 Mar 2014)
New Revision: 1167
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1167
Log:
[maven-release-plugin] copy for tag coser-1.5-alpha-2
Added:
tags/coser-1.5-alpha-2/
1
0
r1166 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 26 Mar '14
by maven-release＠users.forge.codelutin.com 26 Mar '14
26 Mar '14
Author: maven-release
Date: 2014-03-26 09:00:52 +0100 (Wed, 26 Mar 2014)
New Revision: 1166
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1166
Log:
[maven-release-plugin] prepare release coser-1.5-alpha-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 2014-03-24 09:23:51 UTC (rev 1165)
+++ trunk/coser-business/pom.xml 2014-03-26 08:00:52 UTC (rev 1166)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-2</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml 2014-03-24 09:23:51 UTC (rev 1165)
+++ trunk/coser-ui/pom.xml 2014-03-26 08:00:52 UTC (rev 1166)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-2</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml 2014-03-24 09:23:51 UTC (rev 1165)
+++ trunk/coser-web/pom.xml 2014-03-26 08:00:52 UTC (rev 1166)
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-2</version>
</parent>
<groupId>fr.ifremer.coser</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-24 09:23:51 UTC (rev 1165)
+++ trunk/pom.xml 2014-03-26 08:00:52 UTC (rev 1166)
@@ -10,7 +10,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>coser</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5-alpha-2</version>
<packaging>pom</packaging>
<name>Coser</name>
@@ -59,9 +59,9 @@
</modules>
<scm>
- <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection>
- <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url>
+ <connection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-2</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/coser/tags/coser-1.5-alpha-2</developerConnection>
+ <url>https://forge.codelutin.com/repositories/browse/coser/tags/coser-1.5-alpha-2</url>
</scm>
<distributionManagement>
<site>
1
0
r1165 - in trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase: . command
by tchemit＠users.forge.codelutin.com 24 Mar '14
by tchemit＠users.forge.codelutin.com 24 Mar '14
24 Mar '14
Author: tchemit
Date: 2014-03-24 10:23:51 +0100 (Mon, 24 Mar 2014)
New Revision: 1165
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1165
Log:
fix echobase requests
Modified:
trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBasePredicates.java
trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java
trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/AbstractEchoBaseCommand.java
trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetCommunityIndicatorResultDataCommand.java
trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetSpeciesListForCommunityIndicatorResultCommand.java
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBasePredicates.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBasePredicates.java 2014-03-23 16:18:56 UTC (rev 1164)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBasePredicates.java 2014-03-24 09:23:51 UTC (rev 1165)
@@ -83,7 +83,7 @@
@Override
public boolean apply(String[] input) {
- String speciesCode = input[3];
+ String speciesCode = input[2];
boolean result = species.contains(speciesCode);
return result;
}
@@ -117,7 +117,7 @@
@Override
public boolean apply(String[] input) {
- String speciesCode = input[3];
+ String speciesCode = input[2];
boolean result = species.contains(speciesCode);
return result;
}
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java 2014-03-23 16:18:56 UTC (rev 1164)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java 2014-03-24 09:23:51 UTC (rev 1165)
@@ -195,15 +195,18 @@
public boolean matchExtractTypeList(CoserRequestExtractTypeListAware request) {
boolean result = false;
- if (isMapsResult()) {
- result = request.getExtractTypeList().contains(DataType.MAP);
- } else if (isIndicatorsResult()) {
- result = request.getExtractTypeList().contains(DataType.POPULATION) ||
- request.getExtractTypeList().contains(DataType.COMMUNITY);
+ List<DataType> extractTypeList = request.getExtractTypeList();
+ if (extractTypeList.contains(DataType.MAP)) {
+ result = isMapsResult();
}
- if (!result && isDataResult()) {
- result = request.getExtractTypeList().contains(DataType.SOURCE);
+
+ if (!result && (extractTypeList.contains(DataType.POPULATION) ||
+ extractTypeList.contains(DataType.COMMUNITY))) {
+ result = isIndicatorsResult();
}
+ if (!result && extractTypeList.contains(DataType.SOURCE)) {
+ result = isDataResult();
+ }
return result;
}
@@ -264,14 +267,14 @@
public DataStorage getPopulationIndicatorStorage() {
File file = project.getPopulationIndicatorsFile();
- // Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV
+ // Campagne;Indicateur;Espece;Strate;Annee;Estimation;EcartType;CV
DataStorage result = DataStorages.load(file);
return result;
}
public DataStorage getCommunityIndicatorStorage() {
File file = project.getCommunityIndicatorsFile();
- // Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV
+ // Campagne;Indicateur;Espece;Strate;Annee;Estimation;EcartType;CV
DataStorage result = DataStorages.load(file);
return result;
}
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/AbstractEchoBaseCommand.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/AbstractEchoBaseCommand.java 2014-03-23 16:18:56 UTC (rev 1164)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/AbstractEchoBaseCommand.java 2014-03-24 09:23:51 UTC (rev 1165)
@@ -118,7 +118,8 @@
return result;
}
- protected ExtractRawDataAndResultsResult newExtractRawDataAndResultsResult(MultiKeyMap<String, File> pdfMaps, MultiKeyMap<String, Pair<File, String>> pdfCharts) {
+ protected ExtractRawDataAndResultsResult newExtractRawDataAndResultsResult(MultiKeyMap<String, File> pdfMaps,
+ MultiKeyMap<String, Pair<File, String>> pdfCharts) {
ExtractRawDataAndResultsResult result = new ExtractRawDataAndResultsResult(
repository.getId(), pdfMaps, pdfCharts);
return result;
@@ -134,7 +135,7 @@
DataStorageWalker walker = new DataStorageWalker() {
@Override
public void onRow(String... tuple) {
- String speciesCode = tuple[3];
+ String speciesCode = tuple[2];
result.add(speciesCode);
}
};
@@ -148,7 +149,7 @@
DataStorageWalker walker = new DataStorageWalker() {
@Override
public void onRow(String... tuple) {
- String speciesCode = tuple[3];
+ String speciesCode = tuple[2];
speciesList.add(speciesCode);
}
};
@@ -163,7 +164,7 @@
DataStorageWalker walker = new DataStorageWalker() {
@Override
public void onRow(String... tuple) {
- String speciesCode = tuple[3];
+ String speciesCode = tuple[2];
speciesList.add(speciesCode);
}
};
@@ -172,6 +173,21 @@
return result;
}
+ protected Map<String, String> getCommunitySpeciesMap(String indicator) {
+ final Set<String> speciesList = Sets.newHashSet();
+
+ DataStorageWalker walker = new DataStorageWalker() {
+ @Override
+ public void onRow(String... tuple) {
+ String speciesCode = tuple[2];
+ speciesList.add(speciesCode);
+ }
+ };
+ walkOnCommunity(EchoBasePredicates.communityIndicatorPredicate(indicator),walker);
+ Map<String, String> result = repository.getSpeciesMap().getSpeciesSubMap(speciesList);
+ return result;
+ }
+
protected Map<String, String> getMapSpeciesMap() {
Map<String, String> result = repository.getMapSpecies();
return result;
@@ -300,6 +316,11 @@
Charts.ExtractGraphDataWalker walker = new Charts.ExtractGraphDataWalker() {
@Override
+ protected String getYearData(String... tuple) {
+ return tuple[4];
+ }
+
+ @Override
protected String getEstimationData(String... tuple) {
return tuple[5];
}
@@ -308,11 +329,6 @@
protected String getEcartData(String... tuple) {
return tuple[6];
}
-
- @Override
- protected String getYearData(String... tuple) {
- return tuple[4];
- }
};
walkOnCommunity(predicate, walker);
@@ -344,18 +360,18 @@
Charts.ExtractGraphDataWalker walker = new Charts.ExtractGraphDataWalker() {
@Override
- protected String getEstimationData(String... tuple) {
- return tuple[6];
+ protected String getYearData(String... tuple) {
+ return tuple[4];
}
@Override
- protected String getEcartData(String... tuple) {
- return tuple[7];
+ protected String getEstimationData(String... tuple) {
+ return tuple[5];
}
@Override
- protected String getYearData(String... tuple) {
- return tuple[5];
+ protected String getEcartData(String... tuple) {
+ return tuple[6];
}
};
walkOnPopulation(predicate, walker);
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetCommunityIndicatorResultDataCommand.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetCommunityIndicatorResultDataCommand.java 2014-03-23 16:18:56 UTC (rev 1164)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetCommunityIndicatorResultDataCommand.java 2014-03-24 09:23:51 UTC (rev 1165)
@@ -85,21 +85,6 @@
FileUtils.copyFile(csvFile, csvFileCopied);
FileUtils.forceDelete(csvFile);
- //TODO See what to generate here (we don't have any selection in echobase results).
-// // ajout du fichier d'information sur les espèces incluses dans
-// // les calculs des indicateurs de communautés
-// // load project (without data to get reftax data)
-// Project project = path.getProject();
-// Selection selection = path.getSelection();
-// File metaFile = webService.generateMetaFilePDF(project,
-// selection,
-// resultDirectory,
-// rSufiResult,
-// indicator,
-// locale);
-// File metaFileCopied = new File(baseDir, "Information.pdf");
-// FileUtils.copyFile(metaFile, metaFileCopied);
-
// make zip
File result = File.createTempFile("coser-chart-community-indicator", ".zip");
result.deleteOnExit();
Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetSpeciesListForCommunityIndicatorResultCommand.java
===================================================================
--- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetSpeciesListForCommunityIndicatorResultCommand.java 2014-03-23 16:18:56 UTC (rev 1164)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetSpeciesListForCommunityIndicatorResultCommand.java 2014-03-24 09:23:51 UTC (rev 1165)
@@ -53,7 +53,7 @@
@Override
public MapResult execute(GetSpeciesListForCommunityIndicatorResultRequest request) {
- Map<String, String> map = getCommunitySpeciesMap();
+ Map<String, String> map = getCommunitySpeciesMap(request.getIndicator());
MapResult result = newMapResult(map);
return result;
1
0
Author: tchemit
Date: 2014-03-23 17:18:56 +0100 (Sun, 23 Mar 2014)
New Revision: 1164
Url: http://forge.codelutin.com/projects/coser/repository/revisions/1164
Log:
fix demo deploy
Modified:
trunk/coser-web/pom.xml
Modified: trunk/coser-web/pom.xml
===================================================================
--- trunk/coser-web/pom.xml 2014-03-23 13:53:47 UTC (rev 1163)
+++ trunk/coser-web/pom.xml 2014-03-23 16:18:56 UTC (rev 1164)
@@ -32,6 +32,9 @@
<!-- i18n configuration -->
<i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName>
+ <!-- deploy configuration -->
+ <deployFiles>target/coser-${project.version}.war</deployFiles>
+
<!-- Post Release configuration -->
<skipPostRelease>false</skipPostRelease>
</properties>
1
0