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

r1995 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: bleny Date: 2014-06-05 09:37:37 +0200 (Thu, 05 Jun 2014) New Revision: 1995 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1995 Log: in migration remove obsdeb accounts Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:36:43 UTC (rev 1994) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:37:37 UTC (rev 1995) @@ -27,4 +27,6 @@ update sampleRow set company=(select topiaId from company where name='ADMIN') where company is null; +-- On ferme l'accès à ObsDeb +delete from userProfile where obsProgramOrdinal=2

1 0

r1994 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: bleny Date: 2014-06-05 09:36:43 +0200 (Thu, 05 Jun 2014) New Revision: 1994 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1994 Log: in migration affect sample row without company to 'admin' Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-04 14:29:43 UTC (rev 1993) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:36:43 UTC (rev 1994) @@ -22,3 +22,9 @@ -- On mesure les navires en centimètres et non plus en mètres update boat set boatlength = boatlength * 100; + +-- Une ligne sans société : on l'affecte à la société 'ADMIN' + +update sampleRow set company=(select topiaId from company where name='ADMIN') where company is null; + +

1 0

Build failed in Jenkins: wao-nightly » Wao :: Services #56
by admin+ci-codelutin.com＠codelutin.com 04 Jun '14

04 Jun '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/56/…> Changes: [bleny] refs #4490 introduce cache for boats [bleny] fixes #4483 cache for sampling plan [bleny] refactor to allow caching ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-services --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:278.65ms) ( ~ 2.488ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 200703ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-services --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Scan 124 files header done in 201.017ms. [INFO] * uptodate header on 98 files. * add header on 26 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-services --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-services --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

r1993 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 04 Jun '14

04 Jun '14

Author: bleny Date: 2014-06-04 16:29:43 +0200 (Wed, 04 Jun 2014) New Revision: 1993 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1993 Log: introduce CacheInvalidationTopiaEntityListener Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.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/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.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-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -31,7 +31,9 @@ import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.entity.TerrestrialLocation; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -58,6 +60,8 @@ protected SortedSet<FilterOption> boats = new TreeSet<>(); + protected Set<String> boatIds = new HashSet<>(); + public BoatsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { super(locale); this.elligibleForSampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram, optionalCompanyId); @@ -100,6 +104,8 @@ elligibleForSampleRowsFilterValues.addSampleRow(sampleRow); } } + + boatIds.add(boat.getTopiaId()); } public SampleRowsFilterValues getElligibleForSampleRowsFilterValues() { @@ -156,4 +162,8 @@ copyProperty(copy, propertyName); return copy; } + + public Set<String> getBoatIds() { + return boatIds; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -42,6 +42,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; public class ObsMerSamplingPlan implements Iterable<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart>, Serializable { @@ -93,6 +94,11 @@ */ protected SampleRowsFilterValues filterValues; + /** + * Ids of all the sample rows included in this sampling plan. + */ + protected Set<String> sampleRowIds; + public ObsMerSamplingPlan(List<Date> months, Collection<ObsMerSamplingPlanFacadePart> facadeParts, Map<Date, ObsMerSamplingPlanStatistics> totalsPerMonth, @@ -100,7 +106,8 @@ Double observationTimesInDaysTotalExpected, Long observationTimesInDaysTotalReal, Long observationTimesInDaysTotalEstimated, - SampleRowsFilterValues filterValues) { + SampleRowsFilterValues filterValues, + Set<String> sampleRowIds) { this.months = months; this.facades = facadeParts; this.totalsPerMonth = totalsPerMonth; @@ -109,8 +116,13 @@ this.observationTimesInDaysTotalReal = observationTimesInDaysTotalReal; this.observationTimesInDaysTotalEstimated = observationTimesInDaysTotalEstimated; this.filterValues = filterValues; + this.sampleRowIds = sampleRowIds; } + public Set<String> getSampleRowIds() { + return sampleRowIds; + } + @Override public Iterator<ObsMerSamplingPlanFacadePart> iterator() { return facades.iterator(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -36,9 +36,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.TreeMap; /** @@ -63,6 +65,11 @@ protected SampleRowsFilterValues sampleRowsFilterValues; /** + * Ids of all the sample rows included in this sampling plan. + */ + protected Set<String> sampleRowIds; + + /** * List of month computed from the filter. */ protected List<Date> months; @@ -140,6 +147,7 @@ SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSMER, optionalCompanyId); + this.sampleRowIds = new HashSet<>(); this.facadeMap = new TreeMap<>(); this.observationTimesInDaysTotalExpected = new MutableDouble(); this.observationTimesInDaysTotalReal = new MutableLong(); @@ -191,6 +199,8 @@ sampleRowsFilterValues.addSampleRow(sampleRow); + sampleRowIds.add(sampleRow.getTopiaId()); + return this; } @@ -233,7 +243,8 @@ observationTimesInDaysTotalExpected.toDouble(), observationTimesInDaysTotalReal.toLong(), observationTimesInDaysTotalEstimated.toLong(), - sampleRowsFilterValues); + sampleRowsFilterValues, + sampleRowIds); return result; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -364,28 +364,8 @@ } commit(); - if (updateSampleRowCommand.isCreation()) { - invalidateCachesForAllSampleRows(); - } else { - invalidateCachesForSampleRow(sampleRow); - } - } - protected void invalidateCachesForAllSampleRows() { - serviceContext.getSamplingPlansCache().invalidateAll(); - } - - protected void invalidateCachesForSampleRow(SampleRow sampleRow) { - Set<SamplingPlanCacheKey> toInvalidate = new HashSet<>(); - Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache = serviceContext.getSamplingPlansCache(); - for (Map.Entry<SamplingPlanCacheKey, ObsMerSamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { - entry.getValue().getFilterValues().getSampleRowCodes().contains(sampleRow.getCode()); - toInvalidate.add(entry.getKey()); - } - samplingPlansCache.invalidateAll(); - } - public SampleRow getSampleRow(String sampleRowId) { SampleRow sampleRow = getSampleRowDao().findByTopiaId(sampleRowId); @@ -407,8 +387,6 @@ commit(); - invalidateCachesForSampleRow(sampleRow); - } public List<SampleRow> getSamplingPlanRows(SampleRowsFilter sampleRowsFilter) { @@ -572,8 +550,6 @@ commit(); - invalidateCachesForAllSampleRows(); - } protected ImportModel<SampleRow> newSamplingPlanImportModel(AuthenticatedWaoUser authenticatedWaoUser) { @@ -822,8 +798,6 @@ } } - invalidateCachesForSampleRow(sampleRow); - } public List<SampleRow> getUnfinishedSampleRows(AuthenticatedWaoUser authenticatedWaoUser, String companyId) { Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -0,0 +1,141 @@ +package fr.ifremer.wao.web; + +import com.google.common.cache.Cache; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ElligibleBoat; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.SamplingPlanCacheKey; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.event.TopiaEntityEvent; +import org.nuiton.topia.persistence.event.TopiaEntityListener; +import org.nuiton.topia.persistence.event.TopiaTransactionEvent; +import org.nuiton.topia.persistence.event.TopiaTransactionListener; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Avec ce listener, on scrute ce qu'il se passe sur l'application pour invalider les caches + * qu'il faut. + */ +public class CacheInvalidationTopiaEntityListener implements TopiaEntityListener, TopiaTransactionListener { + + private static final Log log = LogFactory.getLog(CacheInvalidationTopiaEntityListener.class); + + protected Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache; + + protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + + protected Set<String> dirtySampleRowIds = new HashSet<>(); + + protected Set<String> dirtyBoatIds = new HashSet<>(); + + protected boolean invalidateAllSampleRows = false; + + protected boolean invalidateAllBoats = false; + + public CacheInvalidationTopiaEntityListener( + Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache, + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache) { + this.samplingPlansCache = samplingPlansCache; + this.boatsFilterValuesCache = boatsFilterValuesCache; + } + + @Override + public void create(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + invalidateAllSampleRows = true; + } else if (entity instanceof ElligibleBoat) { + ElligibleBoat elligibleBoat = (ElligibleBoat) entity; + dirtyBoatIds.add(elligibleBoat.getBoat().getTopiaId()); + } else if (entity instanceof Boat) { + invalidateAllBoats = true; + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void load(TopiaEntityEvent event) { + + } + + @Override + public void update(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + dirtySampleRowIds.add(entity.getTopiaId()); + } else if (entity instanceof Boat) { + dirtyBoatIds.add(entity.getTopiaId()); + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void delete(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + samplingPlansCache.invalidateAll(); + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void commit(TopiaTransactionEvent event) { + if (log.isTraceEnabled()) { + log.trace("will commit for entities " + event.getEntities()); + } + if (invalidateAllSampleRows || dirtySampleRowIds.size() > 20) { + samplingPlansCache.invalidateAll(); + } else { + Set<SamplingPlanCacheKey> samplingPlansCacheKeysToInvalidate = new HashSet<>(); + for (Map.Entry<SamplingPlanCacheKey, ObsMerSamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { + if (CollectionUtils.containsAny(entry.getValue().getSampleRowIds(), dirtySampleRowIds)) { + samplingPlansCacheKeysToInvalidate.add(entry.getKey()); + } + } + samplingPlansCache.invalidateAll(samplingPlansCacheKeysToInvalidate); + } + if (invalidateAllBoats || dirtyBoatIds.size() > 20) { + boatsFilterValuesCache.invalidateAll(); + } else { + Set<BoatsFilterValuesCacheKey> boatsFilterValuesCacheKeysToInvalidate = new HashSet<>(); + for (Map.Entry<BoatsFilterValuesCacheKey, BoatsFilterValues> entry : boatsFilterValuesCache.asMap().entrySet()) { + if (CollectionUtils.containsAny(entry.getValue().getBoatIds(), dirtyBoatIds)) { + boatsFilterValuesCacheKeysToInvalidate.add(entry.getKey()); + } + } + boatsFilterValuesCache.invalidateAll(boatsFilterValuesCacheKeysToInvalidate); + } + clear(); + } + + @Override + public void rollback(TopiaTransactionEvent event) { + clear(); + } + + protected void clear() { + dirtySampleRowIds.clear(); + dirtyBoatIds.clear(); + invalidateAllSampleRows = false; + invalidateAllBoats = false; + } +} 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-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -141,6 +141,12 @@ WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); + CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = + new CacheInvalidationTopiaEntityListener(getSamplingPlansCache(), getBoatsFilterValuesCache()); + + persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); + persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + return persistenceContext; }

1 0

Build failed in Jenkins: wao-ci #218
by admin+ci-codelutin.com＠codelutin.com 04 Jun '14

04 Jun '14

See <http://ci.codelutin.com/jenkins/job/wao-ci/218/changes> Changes: [bleny] refs #4490 just put the link on the name [bleny] fix NPE [bleny] refs #4490 introduce cache for boats [bleny] refs #4490 too many shipowners, ask user to type 3 caracters before searching ------------------------------------------ [...truncated 55 lines...] [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/nuiton-ut… (2 KB at 13.9 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-persistence --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ wao-persistence --- [INFO] Process phase [zargo] [INFO] Generate one file in 13.807ms. [INFO] Process phase [xmi] [INFO] Generate one file in 1.298s. [INFO] Process phase [model] [INFO] Process phase [generator] [INFO] Apply generator TopiaMetaTransformer [INFO] Generate 173 files in 495.865ms. [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-persistence --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…,> includes:[**/*.java] [INFO] 145 file(s) to process (among 145 files) [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…,> includes:[**/*.java] [INFO] 65 file(s) to process (among 65 files) [INFO] Parsing is done. [treated file(s) : 13/210](total time:4.612s) ( ~ 21.96ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-persistence >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-persistence --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 352901ns [INFO] Copying wao-persistence.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] Copying wao-persistence.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-persistence <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-persistence --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [WARNING] bundle fr_FR contains 1/150 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/150 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 28 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-persistence --- [INFO] Compiling 210 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[404,48] formatDate(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[407,70] formatDate(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[408,70] formatDate(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[43,82] formatMonth(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[43,47] formatMonth(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/src/mai…>:[49,90] formatMonth(java.util.Date) in fr.ifremer.wao.WaoUtils has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-persistence --- [INFO] Compiling 1 source file to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ wao-persistence --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.wao.entity.SampleRowLogImplTest 2014/06/03 07:25:31 DEBUG (SampleRowLogImplTest.java:77) testNewSampleRowLog Le nombre d'observateurs est de 0 Le durée moyenne d'une marée est de 0.0 La ligne est sur la période du 03/2011 au 06/2011 Le métier de la ligne est 2014/06/03 07:25:31 DEBUG (SampleRowLogImplTest.java:93) testCompareSampleRowToItself 2014/06/03 07:25:31 DEBUG (SampleRowLogImplTest.java:117) testModifySampleRow La durée moyenne d'une marée est passé de 0.0 jours à 1.0 La ligne est désormais associée au programme programName La date de fin est passée de 06/2011 à 07/2011 Les zones de pêches suivantes ont été ajoutées : null - null - IV Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.155 sec - in fr.ifremer.wao.entity.SampleRowLogImplTest Results : Tests run: 3, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-persistence/target/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-persistence --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/main/j…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:444.844ms) ( ~ 3.972ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/gen…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 207089ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/gen…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/gen…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/main/r…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/gen…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/cla…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/main/j…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/main/j…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/sur…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/target/tes…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/test/j…>:[29,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Wao ............................................... SUCCESS [ 1.649 s] [INFO] Wao :: Persistence ................................ SUCCESS [ 16.211 s] [INFO] Wao :: Services ................................... FAILURE [ 1.863 s] [INFO] Wao :: Web ........................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 20.878 s [INFO] Finished at: 2014-06-03T19:25:35+01:00 [INFO] Final Memory: 55M/1219M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure [ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/test/j…>:[29,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/test/j…>:[29,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-ci/ws/trunk/wao-services/src/test/j…>:[29,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :wao-services Sending e-mails to: wao-commits(a)list.forge.codelutin.com leny(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: wao-ci » Wao :: Services #218
by admin+ci-codelutin.com＠codelutin.com 04 Jun '14

04 Jun '14

See <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/218/chan…> Changes: [bleny] refs #4490 introduce cache for boats ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:444.844ms) ( ~ 3.972ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 207089ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/t…>:[29,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

r1992 - trunk/wao-services/src/test/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com 04 Jun '14

04 Jun '14

Author: bleny Date: 2014-06-04 10:12:57 +0200 (Wed, 04 Jun 2014) New Revision: 1992 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1992 Log: fix build Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-03 17:14:46 UTC (rev 1991) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-04 08:12:57 UTC (rev 1992) @@ -7,6 +7,8 @@ import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoTopiaApplicationContext; import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -46,6 +48,8 @@ protected Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache; + protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + public FakeWaoApplicationContext(String context, boolean initWithReferential) { this.context = context; this.initWithReferential = initWithReferential; @@ -210,14 +214,6 @@ } @Override - public Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> getSamplingPlansCache() { - if (samplingPlansCache == null) { - samplingPlansCache = CacheBuilder.newBuilder().build(); - } - return samplingPlansCache; - } - - @Override public WaoTopiaPersistenceContext newPersistenceContext() { WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); @@ -243,4 +239,19 @@ } } + @Override + public Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> getSamplingPlansCache() { + if (samplingPlansCache == null) { + samplingPlansCache = CacheBuilder.newBuilder().build(); + } + return samplingPlansCache; + } + + @Override + public Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache() { + if (boatsFilterValuesCache == null) { + boatsFilterValuesCache = CacheBuilder.newBuilder().build(); + } + return boatsFilterValuesCache; + } }

1 0

r1991 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 03 Jun '14

03 Jun '14

Author: bleny Date: 2014-06-03 19:14:46 +0200 (Tue, 03 Jun 2014) New Revision: 1991 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1991 Log: refs #4490 just put the link on the name Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-03 17:14:20 UTC (rev 1990) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-03 17:14:46 UTC (rev 1991) @@ -296,14 +296,15 @@ <s:text name="wao.ui.field.Boat.shipOwner"/> </th> <td class="no-border-top"> - <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> - <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> - <s:url action="boats" id="shipOwnerBoatsUrl"> <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> </s:url> - <s:a href="%{shipOwnerBoatsUrl}"> + <s:set name="shipOwnerBoatsTitle"> <s:text name="wao.ui.action.viewShipOwnerBoats"/> + </s:set> + <s:a href="%{shipOwnerBoatsUrl}" title="%{shipOwnerBoatsTitle}"> + <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> + <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> </s:a> </td> </tr>

1 0

r1990 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 03 Jun '14

03 Jun '14

Author: bleny Date: 2014-06-03 19:14:20 +0200 (Tue, 03 Jun 2014) New Revision: 1990 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1990 Log: fix NPE Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 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-06-03 17:06:09 UTC (rev 1989) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-03 17:14:20 UTC (rev 1990) @@ -159,8 +159,8 @@ public void close() { if (log.isInfoEnabled()) { - log.info("samplingPlansCache stats: " + samplingPlansCache.stats().toString()); - log.info("boatsFilterValuesCache stats: " + boatsFilterValuesCache.stats().toString()); + log.info("samplingPlansCache stats: " + getSamplingPlansCache().stats().toString()); + log.info("boatsFilterValuesCache stats: " + getBoatsFilterValuesCache().stats().toString()); } if (topiaApplicationContext != null) {

1 0

r1989 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 03 Jun '14

03 Jun '14

Author: bleny Date: 2014-06-03 19:06:09 +0200 (Tue, 03 Jun 2014) New Revision: 1989 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1989 Log: refs #4490 introduce cache for boats Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -25,6 +25,8 @@ import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -123,4 +125,9 @@ return waoApplicationContext.getSamplingPlansCache(); } + @Override + public Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache() { + return waoApplicationContext.getBoatsFilterValuesCache(); + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -3,6 +3,8 @@ import com.google.common.cache.Cache; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -31,6 +33,8 @@ Cache<SamplingPlanCacheKey,ObsMerSamplingPlan> getSamplingPlansCache(); + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); + void close(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -24,6 +24,8 @@ import com.google.common.cache.Cache; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -40,8 +42,6 @@ WaoTopiaPersistenceContext getPersistenceContext(); - Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> getSamplingPlansCache(); - Date getNow(); <E extends WaoService> E newService(Class<E> serviceClass); @@ -54,4 +54,8 @@ String newUuid(); + Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> getSamplingPlansCache(); + + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); + } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -0,0 +1,40 @@ +package fr.ifremer.wao.services.service; + +import com.google.common.base.Objects; +import com.google.common.base.Optional; +import fr.ifremer.wao.entity.ObsProgram; + +import java.io.Serializable; +import java.util.Locale; + +public class BoatsFilterValuesCacheKey implements Serializable { + + protected final Locale locale; + + protected final ObsProgram obsProgram; + + protected final Optional<String> optionalCompanyId; + + public BoatsFilterValuesCacheKey(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { + this.locale = locale; + this.obsProgram = obsProgram; + this.optionalCompanyId = optionalCompanyId; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BoatsFilterValuesCacheKey that = (BoatsFilterValuesCacheKey) o; + boolean equals = Objects.equal(locale, that.locale) + && Objects.equal(optionalCompanyId, that.optionalCompanyId) + && Objects.equal(obsProgram, that.obsProgram); + return equals; + } + + @Override + public int hashCode() { + return Objects.hashCode(locale, optionalCompanyId, obsProgram); + } + +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -24,6 +24,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.cache.Cache; import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.ContactsFilter; @@ -51,10 +52,8 @@ import java.io.InputStream; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; /** * Created on 4/1/14. @@ -67,30 +66,37 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ObsMerBoatsService.class); - protected static final Map<BoatsFilter, BoatsFilterValues> cache = new HashMap(); - public BoatsFilterValues getBoatsFilterValues(AuthenticatedWaoUser authenticatedWaoUser, BoatsFilter filter) { - BoatsFilterValues boatsFilterValues = cache.get(filter); + Optional<String> optionalCompanyId = Optional.absent(); + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); + } + BoatsFilterValuesCacheKey boatsFilterValuesCacheKey = + new BoatsFilterValuesCacheKey( + serviceContext.getLocale(), + authenticatedWaoUser.getObsProgram(), + optionalCompanyId); + + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> cache = + serviceContext.getBoatsFilterValuesCache(); + + BoatsFilterValues boatsFilterValues = cache.getIfPresent(boatsFilterValuesCacheKey); + if (boatsFilterValues == null) { BoatTopiaDao dao = getBoatDao(); List<Boat> boats = dao.findAll(filter); - Optional<String> optionalCompanyId = Optional.absent(); - if (authenticatedWaoUser.isCoordinatorOrObserver()) { - optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); - } - boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), optionalCompanyId); for (Boat boat : boats) { boatsFilterValues.addBoat(boat); } - cache.put(filter, boatsFilterValues); + cache.put(boatsFilterValuesCacheKey, boatsFilterValues); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -943,6 +943,8 @@ commit(); + serviceContext.getBoatsFilterValuesCache().invalidateAll(); + } public void importBoatGroups(InputStream input) throws ImportErrorException { @@ -995,6 +997,8 @@ commit(); + serviceContext.getBoatsFilterValuesCache().invalidateAll(); + } public List<Boat> getBoatsFromImmatriculations(String joinedImmatriculations) throws UnknownBoatImmatriculationsException { 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-06-03 17:05:18 UTC (rev 1988) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-03 17:06:09 UTC (rev 1989) @@ -23,7 +23,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheStats; import com.opensymphony.xwork2.util.LocalizedTextUtil; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaApplicationContext; @@ -32,6 +31,8 @@ import fr.ifremer.wao.services.WaoApplicationContext; import fr.ifremer.wao.services.WaoServiceContext; import fr.ifremer.wao.services.WaoWebApplicationContext; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -66,6 +67,8 @@ protected Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache; + protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + @Override public WaoApplicationConfig getApplicationConfig() { if (applicationConfig == null) { @@ -116,6 +119,14 @@ return samplingPlansCache; } + @Override + public Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache() { + if (boatsFilterValuesCache == null) { + boatsFilterValuesCache = newCacheBuilder(100).expireAfterAccess(30, TimeUnit.DAYS).build(); + } + return boatsFilterValuesCache; + } + protected <K, V> CacheBuilder<K, V> newCacheBuilder(int expectedMaximumCacheSize) { int maximumCacheSize = applicationConfig.isCachingEnabled() ? expectedMaximumCacheSize : 0; CacheBuilder<K, V> cacheBuilder = (CacheBuilder<K, V>) CacheBuilder.newBuilder().maximumSize(maximumCacheSize); @@ -148,8 +159,8 @@ public void close() { if (log.isInfoEnabled()) { - CacheStats cacheStats = samplingPlansCache.stats(); - log.info("samplingPlansCache stats: " + cacheStats.toString()); + log.info("samplingPlansCache stats: " + samplingPlansCache.stats().toString()); + log.info("boatsFilterValuesCache stats: " + boatsFilterValuesCache.stats().toString()); } if (topiaApplicationContext != null) {

1 0