Wao-commits

Download

wao-commits@list.forge.codelutin.com

July 2014

3 participants
82 discussions

r2120 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: maven-release Date: 2014-07-02 14:37:52 +0200 (Wed, 02 Jul 2014) New Revision: 2120 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2120 Log: [maven-release-plugin] prepare release wao-4.0 Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-02 12:05:47 UTC (rev 2119) +++ trunk/pom.xml 2014-07-02 12:37:52 UTC (rev 2120) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-02 12:05:47 UTC (rev 2119) +++ trunk/wao-persistence/pom.xml 2014-07-02 12:37:52 UTC (rev 2120) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-02 12:05:47 UTC (rev 2119) +++ trunk/wao-services/pom.xml 2014-07-02 12:37:52 UTC (rev 2120) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-02 12:05:47 UTC (rev 2119) +++ trunk/wao-web/pom.xml 2014-07-02 12:37:52 UTC (rev 2120) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2119 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: bleny Date: 2014-07-02 14:05:47 +0200 (Wed, 02 Jul 2014) New Revision: 2119 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2119 Log: fixes #5367 prevent NPE Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -67,7 +67,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -119,7 +119,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -60,7 +60,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); }

1 0