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

r2260 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com Sept. 15, 2014

Sept. 15, 2014

Author: maven-release Date: 2014-09-15 15:16:37 +0200 (Mon, 15 Sep 2014) New Revision: 2260 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2260 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-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.12</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.12</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.12</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2259 - in tags: . wao-4.0.12
by maven-release＠users.forge.codelutin.com Sept. 15, 2014

Sept. 15, 2014

Author: maven-release Date: 2014-09-15 15:16:31 +0200 (Mon, 15 Sep 2014) New Revision: 2259 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2259 Log: [maven-release-plugin] copy for tag wao-4.0.12 Added: tags/wao-4.0.12/ Property changes on: tags/wao-4.0.12 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2258 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com Sept. 15, 2014

Sept. 15, 2014

Author: maven-release Date: 2014-09-15 15:16:26 +0200 (Mon, 15 Sep 2014) New Revision: 2258 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2258 Log: [maven-release-plugin] prepare release wao-4.0.12 Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.12</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.12</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.12</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2257 - in trunk: . wao-services wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-services/src/test/java/fr/ifremer/wao/services/service/mail wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Sept. 15, 2014

Sept. 15, 2014

Author: bleny Date: 2014-09-15 15:15:22 +0200 (Mon, 15 Sep 2014) New Revision: 2257 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2257 Log: Fusion des changements effectu?\195?\169s en 0.4.x vers la 4.1 Modified: trunk/ trunk/pom.xml trunk/wao-services/pom.xml trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2249 + /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2256 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) @@ -109,7 +109,7 @@ <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> - <mustacheVersion>0.8.15</mustacheVersion> + <mustacheVersion>1.9</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> <ehCacheVersion>2.6.9</ehCacheVersion> <jFreeChartVersion>1.0.13</jFreeChartVersion> @@ -259,8 +259,8 @@  <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> <version>${mustacheVersion}</version> </dependency> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> </dependency> <dependency> Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -44,10 +44,13 @@ // on ne veut que les news pour le programme et 'null' pour les news publiées pour tous les programmes query.addIn(News.PROPERTY_OBS_PROGRAM, Lists.newArrayList(authenticatedWaoUser.getObsProgram(), null)); - // on ne veut que les news publiées par le programme et les news publiées par la même société que l'utilisateur connecté - if ( ! authenticatedWaoUser.isAdmin()) { + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + // on veut les news publiées par le programme et les news internes de la société Company company = authenticatedWaoUser.getWaoUser().getCompany(); query.addIn(News.PROPERTY_COMPANY, Lists.newArrayList(company, null)); + } else { + // uniquement les news publiées par le programme + query.addNull(News.PROPERTY_COMPANY); } // de la plus récente à la plus ancienne Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -21,11 +21,10 @@ * #L% */ -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; import com.google.common.base.Charsets; import com.google.common.base.Objects; +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; @@ -35,7 +34,8 @@ import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; -import java.io.StringWriter; +import java.io.IOException; +import java.io.InputStreamReader; import java.util.Locale; public class EmailService extends WaoServiceSupport { @@ -131,17 +131,19 @@ Locale locale = mail.getLocale(); - MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + String templateName = "/email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; - String templateName = "email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; + try (InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream(templateName), Charsets.UTF_8.name())) { - Mustache mustache = mustacheFactory.compile(templateName); + Template template = Mustache.compiler().escapeHTML(false).compile(reader); - StringWriter stringWriter = new StringWriter(); + String body = template.execute(mail); - mustache.execute(stringWriter, mail); + return body; - return stringWriter.toString(); + } catch (IOException e) { + throw new WaoTechnicalException("Unable to read " + templateName, e); + } } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -23,6 +23,8 @@ import fr.ifremer.wao.entity.WaoUserImpl; import fr.ifremer.wao.services.AbstractWaoServiceTest; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,6 +33,8 @@ public class EmailServiceTest extends AbstractWaoServiceTest { + private static final Log log = LogFactory.getLog(EmailServiceTest.class); + protected EmailService service; @Before @@ -38,19 +42,28 @@ service = newService(EmailService.class); + newMail(); + } + protected UserCredentialsEmail newMail() { + UserCredentialsEmail mail = service.newUserCredentialsEmail(); + WaoUserImpl waoUser = new WaoUserImpl(); + waoUser.setFirstName("F"); + waoUser.setLogin("Login"); + mail.setWaoUser(waoUser); + mail.setNewPassword("taiste'"); + return mail; + } + @Test public void testGetBody() { { serviceContext.setLocale(Locale.FRANCE); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -59,11 +72,8 @@ { serviceContext.setLocale(Locale.FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -72,11 +82,8 @@ { serviceContext.setLocale(Locale.CANADA_FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -85,11 +92,8 @@ { serviceContext.setLocale(Locale.ENGLISH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -98,11 +102,8 @@ { serviceContext.setLocale(Locale.US); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -111,11 +112,8 @@ { serviceContext.setLocale(Locale.CANADA); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -123,4 +121,19 @@ } } + @Test + public void mustacheShouldNotEscapeContent() { + + serviceContext.setLocale(Locale.FRANCE); + + String body = service.getBody(newMail()); + + if (log.isDebugEnabled()) { + log.debug("body = \n" + body); + } + + Assert.assertFalse(body.contains("taiste'")); + Assert.assertTrue(body.contains("taiste'")); + + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -24,7 +24,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaApplicationContext; import fr.ifremer.wao.WaoTopiaPersistenceContext; @@ -136,7 +135,7 @@ BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); boatsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return boatsFilterValuesCache; @@ -156,7 +155,7 @@ ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); contactsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return contactsFilterValuesCache;

1 0

r2256 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Sept. 15, 2014

Sept. 15, 2014

Author: bleny Date: 2014-09-15 15:11:00 +0200 (Mon, 15 Sep 2014) New Revision: 2256 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2256 Log: Passage ?\195?\160 un rafraichissement des caches apr?\195?\168s 24h Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-12 10:20:34 UTC (rev 2255) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:11:00 UTC (rev 2256) @@ -135,7 +135,7 @@ BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); boatsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(4, TimeUnit.HOURS) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return boatsFilterValuesCache; @@ -155,7 +155,7 @@ ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); contactsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(4, TimeUnit.HOURS) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return contactsFilterValuesCache;

1 0

r2255 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Sept. 12, 2014

Sept. 12, 2014

Author: bleny Date: 2014-09-12 12:20:34 +0200 (Fri, 12 Sep 2014) New Revision: 2255 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2255 Log: Allongement de la dur?\195?\169e avant rafraichissement des caches Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-11 16:29:10 UTC (rev 2254) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-12 10:20:34 UTC (rev 2255) @@ -24,7 +24,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaApplicationContext; import fr.ifremer.wao.WaoTopiaPersistenceContext; @@ -136,7 +135,7 @@ BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); boatsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(4, TimeUnit.HOURS) . build(loader); } return boatsFilterValuesCache; @@ -156,7 +155,7 @@ ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); contactsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(4, TimeUnit.HOURS) . build(loader); } return contactsFilterValuesCache;

1 0

r2254 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com Sept. 11, 2014

Sept. 11, 2014

Author: bleny Date: 2014-09-11 18:29:10 +0200 (Thu, 11 Sep 2014) New Revision: 2254 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2254 Log: Seuls les coordinateurs et les observateurs peuvent voir les actualit?\195?\169s de la soci?\195?\169t?\195?\169 (fixes #5778) Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-11 16:18:42 UTC (rev 2253) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-11 16:29:10 UTC (rev 2254) @@ -44,10 +44,13 @@ // on ne veut que les news pour le programme et 'null' pour les news publiées pour tous les programmes query.addIn(News.PROPERTY_OBS_PROGRAM, Lists.newArrayList(authenticatedWaoUser.getObsProgram(), null)); - // on ne veut que les news publiées par le programme et les news publiées par la même société que l'utilisateur connecté - if ( ! authenticatedWaoUser.isAdmin()) { + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + // on veut les news publiées par le programme et les news internes de la société Company company = authenticatedWaoUser.getWaoUser().getCompany(); query.addIn(News.PROPERTY_COMPANY, Lists.newArrayList(company, null)); + } else { + // uniquement les news publiées par le programme + query.addNull(News.PROPERTY_COMPANY); } // de la plus récente à la plus ancienne

1 0

r2253 - in branches/wao-4.0.x: . wao-services wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-services/src/test/java/fr/ifremer/wao/services/service/mail
by bleny＠users.forge.codelutin.com Sept. 11, 2014

Sept. 11, 2014

Author: bleny Date: 2014-09-11 18:18:42 +0200 (Thu, 11 Sep 2014) New Revision: 2253 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2253 Log: Remplacement de la biblioth?\195?\168que utilis?\195?\169e pour le traitement des mod?\195?\168les mustache lors de l'envoi de mail : la biblioth?\195?\168que utilis?\195?\169e ne permettaient pas de d?\195?\169sactiver l'?\195?\169chappement HTML (fixes #5774) Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-09-11 16:03:08 UTC (rev 2252) +++ branches/wao-4.0.x/pom.xml 2014-09-11 16:18:42 UTC (rev 2253) @@ -109,7 +109,7 @@ <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> - <mustacheVersion>0.8.15</mustacheVersion> + <mustacheVersion>1.9</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> <ehCacheVersion>2.6.9</ehCacheVersion> <jFreeChartVersion>1.0.13</jFreeChartVersion> @@ -259,8 +259,8 @@  <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> <version>${mustacheVersion}</version> </dependency> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-09-11 16:03:08 UTC (rev 2252) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-09-11 16:18:42 UTC (rev 2253) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> </dependency> <dependency> Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-11 16:03:08 UTC (rev 2252) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-11 16:18:42 UTC (rev 2253) @@ -21,11 +21,10 @@ * #L% */ -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; import com.google.common.base.Charsets; import com.google.common.base.Objects; +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; @@ -35,7 +34,8 @@ import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; -import java.io.StringWriter; +import java.io.IOException; +import java.io.InputStreamReader; import java.util.Locale; public class EmailService extends WaoServiceSupport { @@ -131,17 +131,19 @@ Locale locale = mail.getLocale(); - MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + String templateName = "/email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; - String templateName = "email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; + try (InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream(templateName), Charsets.UTF_8.name())) { - Mustache mustache = mustacheFactory.compile(templateName); + Template template = Mustache.compiler().escapeHTML(false).compile(reader); - StringWriter stringWriter = new StringWriter(); + String body = template.execute(mail); - mustache.execute(stringWriter, mail); + return body; - return stringWriter.toString(); + } catch (IOException e) { + throw new WaoTechnicalException("Unable to read " + templateName, e); + } } Modified: branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java =================================================================== --- branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-11 16:03:08 UTC (rev 2252) +++ branches/wao-4.0.x/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-11 16:18:42 UTC (rev 2253) @@ -23,6 +23,8 @@ import fr.ifremer.wao.entity.WaoUserImpl; import fr.ifremer.wao.services.AbstractWaoServiceTest; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,6 +33,8 @@ public class EmailServiceTest extends AbstractWaoServiceTest { + private static final Log log = LogFactory.getLog(EmailServiceTest.class); + protected EmailService service; @Before @@ -38,19 +42,28 @@ service = newService(EmailService.class); + newMail(); + } + protected UserCredentialsEmail newMail() { + UserCredentialsEmail mail = service.newUserCredentialsEmail(); + WaoUserImpl waoUser = new WaoUserImpl(); + waoUser.setFirstName("F"); + waoUser.setLogin("Login"); + mail.setWaoUser(waoUser); + mail.setNewPassword("taiste'"); + return mail; + } + @Test public void testGetBody() { { serviceContext.setLocale(Locale.FRANCE); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -59,11 +72,8 @@ { serviceContext.setLocale(Locale.FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -72,11 +82,8 @@ { serviceContext.setLocale(Locale.CANADA_FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -85,11 +92,8 @@ { serviceContext.setLocale(Locale.ENGLISH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -98,11 +102,8 @@ { serviceContext.setLocale(Locale.US); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -111,11 +112,8 @@ { serviceContext.setLocale(Locale.CANADA); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -123,4 +121,19 @@ } } + @Test + public void mustacheShouldNotEscapeContent() { + + serviceContext.setLocale(Locale.FRANCE); + + String body = service.getBody(newMail()); + + if (log.isDebugEnabled()) { + log.debug("body = \n" + body); + } + + Assert.assertFalse(body.contains("taiste'")); + Assert.assertTrue(body.contains("taiste'")); + + } }

1 0

r2252 - in trunk/wao-web/src/main/webapp: . WEB-INF/decorators jquery-cookie-1.4.1
by bleny＠users.forge.codelutin.com Sept. 11, 2014

Sept. 11, 2014

Author: bleny Date: 2014-09-11 18:03:08 +0200 (Thu, 11 Sep 2014) New Revision: 2252 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2252 Log: Ajout de jquery-cookie-1.4.1 Added: trunk/wao-web/src/main/webapp/jquery-cookie-1.4.1/ trunk/wao-web/src/main/webapp/jquery-cookie-1.4.1/jquery.cookie.js Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-09-10 16:19:31 UTC (rev 2251) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-09-11 16:03:08 UTC (rev 2252) @@ -48,6 +48,7 @@ <s:if test="localeFrench"> <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js" />"></script> </s:if> + <script src="<s:url value="/jquery-cookie-1.4.1/jquery.cookie.js" />"></script> <script src="<s:url value="/wao.js" />"></script> <script src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> Added: trunk/wao-web/src/main/webapp/jquery-cookie-1.4.1/jquery.cookie.js =================================================================== --- trunk/wao-web/src/main/webapp/jquery-cookie-1.4.1/jquery.cookie.js (rev 0) +++ trunk/wao-web/src/main/webapp/jquery-cookie-1.4.1/jquery.cookie.js 2014-09-11 16:03:08 UTC (rev 2252) @@ -0,0 +1,117 @@ +/*! %%Ignore-License + * jQuery Cookie Plugin v1.4.1 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2013 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD + define(['jquery'], factory); + } else if (typeof exports === 'object') { + // CommonJS + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + // If we can't parse the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + + if (value !== undefined && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setTime(+t + days * 864e+5); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) === undefined) { + return false; + } + + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return !$.cookie(key); + }; + +}));

1 0

r2251 - in trunk/wao-persistence/src/main/java/fr/ifremer/wao: . entity
by bleny＠users.forge.codelutin.com Sept. 10, 2014

Sept. 10, 2014

Author: bleny Date: 2014-09-10 18:19:31 +0200 (Wed, 10 Sep 2014) New Revision: 2251 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2251 Log: Correction des erreurs de compilation suite ?\195?\160 fusion Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-09-10 15:53:16 UTC (rev 2250) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-09-10 16:19:31 UTC (rev 2251) @@ -417,7 +417,6 @@ clone.contactStates = contactStates == null ? null : new HashSet<>(contactStates); clone.dataReliabilities = dataReliabilities == null ? null : new HashSet<>(dataReliabilities); clone.actualSamplingStrategies = actualSamplingStrategies == null ? null : new HashSet<>(actualSamplingStrategies); - clone.observationTypes = observationTypes == null ? null : new HashSet<>(observationTypes); clone.observedDataControls = observedDataControls == null ? null : new HashSet<>(observedDataControls); clone.observerIds = observerIds == null ? null : new HashSet<>(observerIds); clone.terrestrialLocationIds = terrestrialLocationIds == null ? null : new HashSet<>(terrestrialLocationIds); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-10 15:53:16 UTC (rev 2250) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-10 16:19:31 UTC (rev 2251) @@ -123,8 +123,7 @@ } if (filter.getPeriodTo() != null) { - Date periodTo = DateUtil.setMaxTimeOfDay(filter.getPeriodTo()); - query.addLowerOrEquals(periodProperty, periodTo); + query.addLowerOrEquals(periodProperty, filter.getPeriodTo()); } if (CollectionUtils.isNotEmpty(filter.getContactIds())) {

1 0