Author: sannegrinovero Date: 2009-04-13 18:52:23 -0400 (Mon, 13 Apr 2009) New Revision: 16311 Modified: search/trunk/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java search/trunk/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java search/trunk/src/main/java/org/hibernate/search/engine/LoaderHelper.java search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java Log: HSEARCH-359 change usage of deprecated helpers from commons-annotation to core Modified: search/trunk/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -3,7 +3,7 @@ import java.util.Properties; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.search.SearchException; /** Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -12,8 +12,8 @@ import org.slf4j.Logger; import org.hibernate.Hibernate; -import org.hibernate.annotations.common.util.ReflectHelper; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.ReflectHelper; +import org.hibernate.util.StringHelper; import org.hibernate.search.Environment; import org.hibernate.search.SearchException; import org.hibernate.search.backend.BackendQueueProcessorFactory; Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -2,9 +2,8 @@ package org.hibernate.search.bridge.builtin; import org.hibernate.search.bridge.TwoWayStringBridge; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; - /** * Map a boolean field * Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -3,8 +3,8 @@ import org.hibernate.search.bridge.TwoWayStringBridge; import org.hibernate.search.SearchException; -import org.hibernate.annotations.common.util.StringHelper; -import org.hibernate.annotations.common.util.ReflectHelper; +import org.hibernate.util.StringHelper; +import org.hibernate.util.ReflectHelper; /** * Convert a Class back and forth Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -2,7 +2,7 @@ package org.hibernate.search.bridge.builtin; import org.hibernate.search.bridge.TwoWayStringBridge; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; /** Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -4,7 +4,7 @@ import java.net.URI; import java.net.URISyntaxException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.search.SearchException; import org.hibernate.search.bridge.TwoWayStringBridge; Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -6,7 +6,7 @@ import org.hibernate.search.bridge.TwoWayStringBridge; import org.hibernate.search.SearchException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; /** * Bridge for <code>URL</code>s. Modified: search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -24,7 +24,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.util.StringHelper; import org.hibernate.search.SearchException; import org.hibernate.search.analyzer.Discriminator; import org.hibernate.search.annotations.AnalyzerDef; Modified: search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -23,7 +23,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.ReflectHelper; +import org.hibernate.util.ReflectHelper; import org.hibernate.proxy.HibernateProxy; import org.hibernate.search.SearchException; import org.hibernate.search.analyzer.Discriminator; Modified: search/trunk/src/main/java/org/hibernate/search/engine/LoaderHelper.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/engine/LoaderHelper.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/engine/LoaderHelper.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.common.util.ReflectHelper; +import org.hibernate.util.ReflectHelper; /** * @author Emmanuel Bernard Modified: search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -24,7 +24,8 @@ import org.hibernate.annotations.common.reflection.MetadataProvider; import org.hibernate.annotations.common.reflection.MetadataProviderInjector; import org.hibernate.annotations.common.reflection.java.JavaReflectionManager; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.ReflectHelper; +import org.hibernate.util.StringHelper; import org.hibernate.search.Environment; import org.hibernate.search.SearchException; import org.hibernate.search.Version; @@ -477,11 +478,7 @@ } else { try { - Class filterCachingStrategyClass = org.hibernate - .annotations - .common - .util - .ReflectHelper + Class filterCachingStrategyClass = ReflectHelper .classForName( impl, SearchFactoryImpl.class ); filterCachingStrategy = ( FilterCachingStrategy ) filterCachingStrategyClass.newInstance(); } Modified: search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -33,7 +33,7 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.hibernate.annotations.common.util.ReflectHelper; +import org.hibernate.util.ReflectHelper; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.ParameterMetadata; import org.hibernate.impl.AbstractQueryImpl; Modified: search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -16,7 +16,7 @@ import org.apache.lucene.store.SingleInstanceLockFactory; import org.slf4j.Logger; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.search.SearchException; import org.hibernate.search.util.FileHelper; import org.hibernate.search.util.LoggerFactory; Modified: search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2009-04-13 22:37:42 UTC (rev 16310) +++ search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2009-04-13 22:52:23 UTC (rev 16311) @@ -11,7 +11,7 @@ import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; -import org.hibernate.annotations.common.util.ReflectHelper; +import org.hibernate.util.ReflectHelper; import org.hibernate.search.SearchException; /**