5:34 a.m.
Author: epbernard
Date: 2009-08-23 06:34:35 -0400 (Sun, 23 Aug 2009)
New Revision: 17398
Modified:
search/trunk/pom.xml
search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
search/trunk/src/main/java/org/hibernate/search/util/ReflectionHelper.java
search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java
search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java
Log:
Clean compilation issues and unnecessary deps on Hibernate
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2009-08-23 10:17:36 UTC (rev 17397)
+++ search/trunk/pom.xml 2009-08-23 10:34:35 UTC (rev 17398)
@@ -54,7 +54,7 @@
<slf4jVersion>1.5.6</slf4jVersion>
<luceneVersion>2.4.1</luceneVersion>
<hibernateVersion>3.5.0-SNAPSHOT</hibernateVersion>
-
<hibernateCommonsAnnotationVersion>3.2.0-SNAPSHOT</hibernateCommonsAnnotationVersion>
+
<hibernateCommonsAnnotationVersion>3.2.0.Beta1</hibernateCommonsAnnotationVersion>
</properties>
<dependencies>
Modified:
search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
===================================================================
---
search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-08-23
10:17:36 UTC (rev 17397)
+++
search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-08-23
10:34:35 UTC (rev 17398)
@@ -19,6 +19,7 @@
import org.hibernate.Hibernate;
import org.hibernate.annotations.common.AssertionFailure;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.XMember;
@@ -47,7 +48,6 @@
import org.hibernate.search.store.IndexShardingStrategy;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.ReflectionHelper;
-import org.hibernate.util.ReflectHelper;
/**
* Set up and provide a manager for classes which are directly annotated with
<code>@Indexed</code>.
@@ -235,10 +235,9 @@
Annotation jpaId;
try {
@SuppressWarnings("unchecked")
- Class<? extends Annotation> jpaIdClass = org.hibernate
- .util
- .ReflectHelper
- .classForName( "javax.persistence.Id", InitContext.class );
+ Class<? extends Annotation> jpaIdClass =
+ org.hibernate.annotations.common.util.ReflectHelper
+ .classForName( "javax.persistence.Id", InitContext.class );
jpaId = member.getAnnotation( jpaIdClass );
}
catch ( ClassNotFoundException e ) {
Modified: search/trunk/src/main/java/org/hibernate/search/util/ReflectionHelper.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/util/ReflectionHelper.java 2009-08-23
10:17:36 UTC (rev 17397)
+++ search/trunk/src/main/java/org/hibernate/search/util/ReflectionHelper.java 2009-08-23
10:34:35 UTC (rev 17398)
@@ -4,7 +4,7 @@
import java.lang.reflect.Modifier;
import org.hibernate.annotations.common.reflection.XMember;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* @author Emmanuel Bernard
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java 2009-08-23
10:17:36 UTC (rev 17397)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java 2009-08-23
10:34:35 UTC (rev 17398)
@@ -32,6 +32,7 @@
private String name;
@OneToMany(fetch = FetchType.LAZY)
+ //FIXME with JPA 2, move to @OrderColumn
@IndexColumn(name = "list_position")
@Cascade(org.hibernate.annotations.CascadeType.ALL)
@IndexedEmbedded
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java 2009-08-23
10:17:36 UTC (rev 17397)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/Product.java 2009-08-23
10:34:35 UTC (rev 17398)
@@ -11,6 +11,7 @@
import javax.persistence.ManyToMany;
import javax.persistence.Column;
import javax.persistence.CascadeType;
+import javax.persistence.MapKeyColumn;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.Field;
@@ -33,7 +34,7 @@
@IndexedEmbedded
private Set<Author> authors = new HashSet<Author>();
@ManyToMany(cascade = CascadeType.REMOVE) //just to make the test easier, cascade
doesn't really make any business sense
- @MapKey(columns = @Column(name="CUST_NAME") )
+ @MapKeyColumn(name="CUST_NAME")
@IndexedEmbedded
private Map<String, Order> orders = new HashMap<String, Order>();