July 2014 - Wao-commits - mailman.cloud.codelutin.com

r2148 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: maven-release Date: 2014-07-10 18:06:26 +0200 (Thu, 10 Jul 2014) New Revision: 2148 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2148 Log: [maven-release-plugin] prepare for next development iteration 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-10 16:06:21 UTC (rev 2147) +++ trunk/pom.xml 2014-07-10 16:06:26 UTC (rev 2148) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2</version> + <version>4.0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.2</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.2</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.2</url> + <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> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-10 16:06:21 UTC (rev 2147) +++ trunk/wao-persistence/pom.xml 2014-07-10 16:06:26 UTC (rev 2148) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-10 16:06:21 UTC (rev 2147) +++ trunk/wao-services/pom.xml 2014-07-10 16:06:26 UTC (rev 2148) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-10 16:06:21 UTC (rev 2147) +++ trunk/wao-web/pom.xml 2014-07-10 16:06:26 UTC (rev 2148) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2147 - in tags: . wao-4.0.2
by maven-release＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: maven-release Date: 2014-07-10 18:06:21 +0200 (Thu, 10 Jul 2014) New Revision: 2147 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2147 Log: [maven-release-plugin] copy for tag wao-4.0.2 Added: tags/wao-4.0.2/ Property changes on: tags/wao-4.0.2 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2146 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: maven-release Date: 2014-07-10 18:06:16 +0200 (Thu, 10 Jul 2014) New Revision: 2146 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2146 Log: [maven-release-plugin] prepare release wao-4.0.2 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-10 16:03:00 UTC (rev 2145) +++ trunk/pom.xml 2014-07-10 16:06:16 UTC (rev 2146) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</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.2</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.2</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.2</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-10 16:03:00 UTC (rev 2145) +++ trunk/wao-persistence/pom.xml 2014-07-10 16:06:16 UTC (rev 2146) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-10 16:03:00 UTC (rev 2145) +++ trunk/wao-services/pom.xml 2014-07-10 16:06:16 UTC (rev 2146) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-10 16:03:00 UTC (rev 2145) +++ trunk/wao-web/pom.xml 2014-07-10 16:06:16 UTC (rev 2146) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2145 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 18:03:00 +0200 (Thu, 10 Jul 2014) New Revision: 2145 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2145 Log: refs #5391 add a rollback before close Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-10 12:47:47 UTC (rev 2144) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-10 16:03:00 UTC (rev 2145) @@ -144,15 +144,10 @@ return invocation.invoke(); - } catch (java.lang.OutOfMemoryError e) { - - if (log.isErrorEnabled()) { - log.error("", e); - } - throw e; - } finally { + serviceContext.getPersistenceContext().rollback(); + serviceContext.getPersistenceContext().close(); }

1 0

r2144 - in trunk/wao-web/src/main/webapp/WEB-INF/content: . obsmer obsvente
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 14:47:47 +0200 (Thu, 10 Jul 2014) New Revision: 2144 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2144 Log: fixes #5410 escapeHtml=true when in a title attribute of an html element Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -512,7 +512,7 @@ <s:if test="mammalsCapture"> <img src="<s:url value="/img/hook-22px.png"/>" alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" - title="<s:property value="mammalsInfo" escapeHtml="false"/>"/> + title="<s:property value="mammalsInfo" escapeHtml="true"/>"/> </s:if> </td> </s:if> @@ -536,17 +536,17 @@ <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> <td class="align-center"> <s:if test=" ! comment.empty"> - " class="fa fa-comment"> + " class="fa fa-comment"> </s:if> </td> <td class="align-center"> <s:if test=" ! commentCoordinator.empty"> - " class="fa fa-comment"> + " class="fa fa-comment"> </s:if> </td> <td class="align-center"> <s:if test=" ! commentAdmin.empty"> - " class="fa fa-comment"> + " class="fa fa-comment"> </s:if> </td> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -438,7 +438,7 @@ </td> <td> <s:if test=" ! comment.empty"> - " class="fa fa-comment"> + " class="fa fa-comment"> </s:if> </td> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -411,7 +411,7 @@ </td> <td> <s:if test=" ! comment.empty"> - " class="fa fa-comment"> + " class="fa fa-comment"> </s:if> </td>

1 0

r2143 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 11:50:14 +0200 (Thu, 10 Jul 2014) New Revision: 2143 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2143 Log: fixes #5403 change log level from error to warn, it doesn't break the app Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java 2014-07-10 09:37:44 UTC (rev 2142) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java 2014-07-10 09:50:14 UTC (rev 2143) @@ -102,8 +102,8 @@ return null; } //FIXME See why we don't see the error - if (log.isErrorEnabled()) { - log.error("Could not format parse date " + string, e); + if (log.isWarnEnabled()) { + log.warn("could not format parse date " + string, e); } throw new TypeConversionException("strings=" + Arrays.toString(strings)); }

1 0

r2142 - trunk/wao-web/src/main/resources
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 11:37:44 +0200 (Thu, 10 Jul 2014) New Revision: 2142 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2142 Log: add some commented logging directives Modified: trunk/wao-web/src/main/resources/log4j.properties Modified: trunk/wao-web/src/main/resources/log4j.properties =================================================================== --- trunk/wao-web/src/main/resources/log4j.properties 2014-07-10 09:36:54 UTC (rev 2141) +++ trunk/wao-web/src/main/resources/log4j.properties 2014-07-10 09:37:44 UTC (rev 2142) @@ -42,3 +42,24 @@ #log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL #log4j.logger.com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler=FATAL #log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack=ERROR + +## pool de connection c3p0 +#log4j.logger.org.hibernate.c3p0=TRACE +#log4j.logger.com.mchange=TRACE +# +## le driver PostgreSQL JDBC +#log4j.logger.org.postgresql=TRACE +# +## La partie Hibernate qui gère les connexions +#log4j.logger.org.hibernate.engine.jdbc=TRACE +#log4j.logger.org.hibernate.jdbc=TRACE +#log4j.logger.org.hibernate.internal=TRACE +#log4j.logger.org.hibernate.SQL=TRACE +#log4j.logger.org.hibernate.transaction=TRACE +# +# +## Topia (gestion de Hibernate) +#log4j.logger.org.nuiton.topia.persistence.internal=TRACE +#log4j.logger.org.nuiton.topia.persistence.internal.support=WARN + +

1 0

r2141 - trunk/wao-persistence/src/main/resources
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 11:36:54 +0200 (Thu, 10 Jul 2014) New Revision: 2141 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2141 Log: show hql in sql comments Modified: trunk/wao-persistence/src/main/resources/wao.properties Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-07-10 09:36:21 UTC (rev 2140) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-07-10 09:36:54 UTC (rev 2141) @@ -26,6 +26,7 @@ hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=false hibernate.format_sql=true +hibernate.use_sql_comments=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.c3p0.min_size=5

1 0

r2140 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 11:36:21 +0200 (Thu, 10 Jul 2014) New Revision: 2140 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2140 Log: add a fixme Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-10 09:35:33 UTC (rev 2139) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-10 09:36:21 UTC (rev 2140) @@ -58,6 +58,7 @@ protected SampleRowsFilterValues sampleRowsFilterValues; + // FIXME brendan 10/07/14 really used ? protected SortedSet<FilterOption> boatRegistrationCodes = new TreeSet<>(); protected SortedSet<FilterOption> contactStates = new TreeSet<>();

1 0

r2139 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: bleny Date: 2014-07-10 11:35:33 +0200 (Thu, 10 Jul 2014) New Revision: 2139 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2139 Log: fixes #5409 add missing operation in boatFilterValues.addBoat Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-09 12:21:01 UTC (rev 2138) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-10 09:35:33 UTC (rev 2139) @@ -79,6 +79,8 @@ boatIds.add(boat.getTopiaId()); + boats.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); + TerrestrialLocation district = boat.getDistrict(); if (district != null) { districts.add(FilterOption.forValueAndLabel( @@ -108,8 +110,6 @@ fleet.getDescription())); } - boats.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); - for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { SampleRow sampleRow = elligibleBoat.getSampleRow(); if (elligibleBoat.isBoatElligible()) {

1 0