Author: echatellier Date: 2013-01-18 16:52:36 +0100 (Fri, 18 Jan 2013) New Revision: 53 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/53 Log: refs #1646: Configuration de la sequence de id molecule Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java 2013-01-18 15:37:14 UTC (rev 52) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java 2013-01-18 15:52:36 UTC (rev 53) @@ -30,7 +30,6 @@ import nc.ird.cantharella.data.validation.CollectionUniqueField; -import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.NotEmpty; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-01-18 15:37:14 UTC (rev 52) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-01-18 15:52:36 UTC (rev 53) @@ -35,6 +35,7 @@ import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @@ -67,7 +68,8 @@ /** ID */ @Id - @GeneratedValue + @GeneratedValue(generator="molecule_sequence_gen") + @SequenceGenerator(name="molecule_sequence_gen", sequenceName="molecule_sequence") private Integer idMolecule; /** Nom commun */ 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-01-18 15:37:14 UTC (rev 52) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2013-01-18 15:52:36 UTC (rev 53) @@ -45,7 +45,6 @@ import org.apache.commons.beanutils.BeanComparator; import org.hibernate.annotations.Type; import org.hibernate.search.annotations.Analyze; -import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.FullTextFilterDef; import org.hibernate.search.annotations.FullTextFilterDefs; Modified: trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql =================================================================== --- trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-01-18 15:37:14 UTC (rev 52) +++ trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-01-18 15:52:36 UTC (rev 53) @@ -84,4 +84,5 @@ add constraint FK8B39E567FE19187A foreign key (produit_id) references Produit - \ No newline at end of file + + create sequence molecule_sequence \ No newline at end of file