Author: echatellier Date: 2013-03-27 12:22:40 +0100 (Wed, 27 Mar 2013) New Revision: 185 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/185 Log: Fix indexation configuration (Station & specimen avec les campagnes) Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2013-03-27 11:22:40 UTC (rev 185) @@ -151,6 +151,7 @@ @NotNull @ManyToMany(fetch = FetchType.LAZY) @Cascade( { CascadeType.SAVE_UPDATE }) + @ContainedIn private List<Station> stations; /** Attached documents. */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2013-03-27 11:22:40 UTC (rev 185) @@ -158,7 +158,7 @@ /** Station */ @ManyToOne(fetch = FetchType.EAGER) - @IndexedEmbedded(depth = 1) + @IndexedEmbedded private Station station; /** Compléments d'information */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2013-03-27 11:22:40 UTC (rev 185) @@ -133,6 +133,7 @@ /** Stations */ @NotNull @ManyToMany(mappedBy = "stations", fetch = FetchType.LAZY) + @IndexedEmbedded private List<Campagne> campagnes; /** Spécimens de référence qui sont rattachés à cette station */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 11:22:40 UTC (rev 185) @@ -36,7 +36,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.hibernate.LazyInitializationException; import org.hibernate.search.bridge.FieldBridge; import org.hibernate.search.bridge.LuceneOptions; import org.slf4j.Logger;