[hibernate-commits] Hibernate SVN: r20243 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: backend/configuration and 10 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Aug 24 08:58:59 EDT 2010
Author: epbernard
Date: 2010-08-24 08:58:56 -0400 (Tue, 24 Aug 2010)
New Revision: 20243
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java
Log:
HSEARCH-581 No longer use Core's Helper classes
Make use of Hibernate Commons Annotations instead
We need to limit our dependencies to Core esp to non public contracts
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -27,12 +27,12 @@
import java.util.Map;
import java.util.Properties;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.spi.WorkerBuildContext;
import org.hibernate.search.backend.impl.TransactionalWorker;
import org.hibernate.search.cfg.SearchConfiguration;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
/**
* @author Emmanuel Bernard
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -26,7 +26,7 @@
import java.util.Properties;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -36,6 +36,7 @@
import org.slf4j.Logger;
import org.hibernate.annotations.common.AssertionFailure;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
import org.hibernate.search.spi.WorkerBuildContext;
@@ -60,7 +61,6 @@
import org.hibernate.search.util.HibernateHelper;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
/**
* Batch work until {@link #performWorks} is called.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -26,7 +26,7 @@
import java.math.BigDecimal;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a BigDecimal element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -26,7 +26,7 @@
import java.math.BigInteger;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a <code>BigInteger</code> element.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,8 +24,8 @@
*/
package org.hibernate.search.bridge.builtin;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
/**
* Map a boolean field
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,11 +24,11 @@
*/
package org.hibernate.search.bridge.builtin;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.bridge.ParameterizedBridge;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
import org.apache.lucene.document.DateTools;
import java.util.Date;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a character element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,10 +24,10 @@
*/
package org.hibernate.search.bridge.builtin;
+import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.bridge.TwoWayStringBridge;
import org.hibernate.search.SearchException;
-import org.hibernate.util.StringHelper;
-import org.hibernate.util.ReflectHelper;
/**
* Convert a Class back and forth
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -30,11 +30,12 @@
import java.util.Map;
import org.apache.lucene.document.DateTools;
+
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
import org.hibernate.search.bridge.ParameterizedBridge;
import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
/**
* Bridge a java.util.Date to a String, truncated to the resolution
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a double element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,8 +24,8 @@
*/
package org.hibernate.search.bridge.builtin;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a float element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map an integer element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a long element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,7 +24,7 @@
*/
package org.hibernate.search.bridge.builtin;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
/**
* Map a short element
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -27,7 +27,7 @@
import java.net.URI;
import java.net.URISyntaxException;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
import org.hibernate.search.bridge.TwoWayStringBridge;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -27,9 +27,9 @@
import java.net.URL;
import java.net.MalformedURLException;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.bridge.TwoWayStringBridge;
import org.hibernate.search.SearchException;
-import org.hibernate.util.StringHelper;
/**
* Bridge for <code>URL</code>s.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -46,6 +46,7 @@
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.XMember;
import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
import org.hibernate.search.analyzer.Discriminator;
import org.hibernate.search.annotations.AnalyzerDef;
@@ -71,7 +72,6 @@
import org.hibernate.search.util.PassThroughAnalyzer;
import org.hibernate.search.util.ReflectionHelper;
import org.hibernate.search.util.ScopedAnalyzer;
-import org.hibernate.util.StringHelper;
/**
* Set up and provide a manager for classes which are indexed via <code>@IndexedEmbedded</code>, but themselves do not
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -27,8 +27,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.hibernate.util.ReflectHelper;
+import org.hibernate.annotations.common.util.ReflectHelper;
+
/**
* @author Emmanuel Bernard
*/
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -34,6 +34,8 @@
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.search.Similarity;
+import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
import org.hibernate.search.annotations.AnalyzerDef;
@@ -41,8 +43,6 @@
import org.hibernate.search.util.DelegateNamedAnalyzer;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.ReflectHelper;
-import org.hibernate.util.StringHelper;
import org.slf4j.Logger;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -37,6 +37,7 @@
import org.slf4j.Logger;
import org.hibernate.annotations.common.AssertionFailure;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
import org.hibernate.search.Version;
@@ -72,7 +73,6 @@
import org.hibernate.search.store.optimization.OptimizerStrategy;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
/**
* This implementation is never directly exposed to the user, it is always wrapped into a {@link org.hibernate.search.impl.MutableSearchFactory}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -45,6 +45,7 @@
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
import org.hibernate.search.Version;
@@ -89,7 +90,6 @@
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.PluginLoader;
import org.hibernate.search.util.ReflectionHelper;
-import org.hibernate.util.StringHelper;
/**
* Build a search factory.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -30,10 +30,10 @@
import org.hibernate.CacheMode;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
import org.hibernate.search.util.JNDIHelper;
-import org.hibernate.util.ReflectHelper;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -58,6 +58,7 @@
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.query.ParameterMetadata;
import org.hibernate.impl.AbstractQueryImpl;
@@ -86,7 +87,6 @@
import org.hibernate.search.util.ContextHelper;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.transform.ResultTransformer;
-import org.hibernate.util.ReflectHelper;
import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -27,11 +27,11 @@
import java.util.Map;
import java.util.Properties;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.spi.BuildContext;
import org.hibernate.search.cfg.SearchConfiguration;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
/**
* @author Emmanuel Bernard
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -42,12 +42,12 @@
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.ProjectionConstants;
import org.hibernate.search.Version;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.reader.ReaderProvider;
import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.util.ReflectHelper;
/**
* A concurrent implementation of the {@code Statistics} interface.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -31,6 +31,7 @@
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.spi.WritableBuildContext;
import org.hibernate.search.SearchException;
@@ -43,7 +44,6 @@
import org.hibernate.search.store.optimization.NoOpOptimizerStrategy;
import org.hibernate.search.store.optimization.OptimizerStrategy;
import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
/**
* Create a Lucene directory provider which can be configured
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -39,7 +39,7 @@
import org.apache.lucene.store.SingleInstanceLockFactory;
import org.slf4j.Logger;
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.search.SearchException;
import org.hibernate.search.util.FileHelper;
import org.hibernate.search.util.LoggerFactory;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -35,7 +35,7 @@
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.util.plugin.ResourceLoaderAware;
-import org.hibernate.util.ReflectHelper;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.SearchException;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java 2010-08-24 12:51:19 UTC (rev 20242)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java 2010-08-24 12:58:56 UTC (rev 20243)
@@ -24,8 +24,8 @@
*/
package org.hibernate.search.util;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.SearchException;
-import org.hibernate.util.ReflectHelper;
/**
* Utility class to load instances of other classes by using a fully qualified name,
More information about the hibernate-commits
mailing list