merge hibernate4 migration branch into trunk

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / common / LanguageStringBase.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
index d2812aeeb2eeaece9be7ff08f079bc628359c3d8..1694e1f1c7aaf1ecaf1c629c8ee63e4b6879cf10 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
@@ -15,7 +15,6 @@ import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -26,14 +25,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.log4j.Logger;
-import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
-import eu.etaxonomy.cdm.hibernate.search.LanguageFieldBridge;
 import eu.etaxonomy.cdm.hibernate.search.StripHtmlBridge;
 import eu.etaxonomy.cdm.jaxb.FormattedTextAdapter;
 
@@ -59,7 +56,7 @@ public abstract class LanguageStringBase extends AnnotatableEntity{
     @XmlElement(name = "Text")
     @XmlJavaTypeAdapter(FormattedTextAdapter.class)
     @Column(length=65536)
-    @Field(index=Index.TOKENIZED)
+    @Field
     @FieldBridge(impl=StripHtmlBridge.class)
     @Lob
     protected String text;
@@ -69,8 +66,7 @@ public abstract class LanguageStringBase extends AnnotatableEntity{
     @XmlSchemaType(name = "IDREF")
     @ManyToOne(fetch = FetchType.EAGER)
     @Cascade({CascadeType.MERGE})
-    @Field
-    @FieldBridge(impl=LanguageFieldBridge.class)
+    @IndexedEmbedded(depth=1)
     protected Language language;
 
     protected LanguageStringBase() {