ISPN-1361 Remove dependency to Hibernate Core

infinispan · Sep 29, 2011 · 86e523e · 86e523e
1 parent b236941
commit 86e523e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -119,7 +119,7 @@
       <version.gnu.getopt>1.0.13</version.gnu.getopt>
       <version.guava>r03</version.guava>
       <version.h2.driver>1.1.117</version.h2.driver>
-      <version.hibernate.search>4.0.0.Beta1</version.hibernate.search>
+      <version.hibernate.search>4.0.0.Beta2</version.hibernate.search>
       <version.jackson>1.6.1</version.jackson>
       <version.javax.cache>0.2</version.javax.cache>
       <version.javax.persistence>1.0</version.javax.persistence>

diff --git a/query/pom.xml b/query/pom.xml
@@ -45,24 +45,12 @@
 
       <dependency>
          <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-search</artifactId>
+         <artifactId>hibernate-search-engine</artifactId>
          <version>${version.hibernate.search}</version>
          <exclusions>
              <exclusion>
-                 <artifactId>antlr</artifactId>
-                 <groupId>antlr</groupId>
-             </exclusion>
-             <exclusion>
-                 <artifactId>hibernate-jpa-2.0-api</artifactId>
-                 <groupId>org.hibernate.javax.persistence</groupId>
-             </exclusion>
-             <exclusion>
-                 <artifactId>dom4j</artifactId>
-                 <groupId>dom4j</groupId>
-             </exclusion>
-             <exclusion>
-                 <artifactId>hibernate-search-analyzers</artifactId>
                  <groupId>org.hibernate</groupId>
+                 <artifactId>hibernate-search-analyzers</artifactId>
              </exclusion>
          </exclusions>
       </dependency>

diff --git a/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java b/query/src/main/java/org/infinispan/query/backend/SearchableCacheConfiguration.java
@@ -26,6 +26,8 @@
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.search.cfg.SearchMapping;
 import org.hibernate.search.cfg.spi.SearchConfiguration;
+import org.hibernate.search.impl.SimpleClassNavigator;
+import org.hibernate.search.spi.ClassNavigator;
 import org.hibernate.search.spi.ServiceProvider;
 
 import java.util.Collections;
@@ -44,6 +46,8 @@ public class SearchableCacheConfiguration implements SearchConfiguration {
    protected Map<String, Class<?>> classes;
    private Properties properties;
 
+   private static final SimpleClassNavigator classHelper = new SimpleClassNavigator();
+
    public SearchableCacheConfiguration(Class[] classArray, Properties properties) {
       // null chks
       if (classArray == null) throw new NullPointerException("Classes provided are null");
@@ -96,4 +100,9 @@ public Map<Class<? extends ServiceProvider<?>>, Object> getProvidedServices() {
    public boolean isTransactionManagerExpected() {
       return false;
    }
+
+   @Override
+   public ClassNavigator getClassHelper() {
+      return classHelper;
+   }
 }