[hibernate-commits] Hibernate SVN: r10742 - in branches/Lucene_Integration/HibernateExt/metadata/src: java/org/hibernate java/org/hibernate/search java/org/hibernate/search/annotations java/org/hibernate/search/backend java/org/hibernate/search/backend/impl java/org/hibernate/search/bridge java/org/hibernate/search/engine java/org/hibernate/search/event java/org/hibernate/search/query java/org/hibernate/search/store java/org/hibernate/search/util test/org/hibernate test/org/hibernate/search/test test/org/hi

Author: epbernard Date: 2006-11-06 20:03:16 -0500 (Mon, 06 Nov 2006) New Revision: 10742 Added: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/ Removed: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/lucene/ Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/Environment.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/LuceneSession.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Boost.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DateBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DocumentId.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Field.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Index.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Indexed.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Keyword.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Store.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Text.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Unstored.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/AddWork.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/DeleteWork.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/UpdateWork.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Work.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/WorkQueue.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Workspace.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/BatchLuceneWorkQueue.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/LuceneWorker.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigDecimalBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigIntegerBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DateBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DoubleBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FieldBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FloatBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IdFieldBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IntegerBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/LongBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/NumberBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/ParameterizedBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/Resolution.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2IdFieldBridgeAdaptor.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringImplBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/event/LuceneEventListener.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/EntityInfo.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/IteratorImpl.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/LuceneQueryImpl.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/ScrollableResultsImpl.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProvider.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/FSDirectoryProvider.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/RAMDirectoryProvider.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/ContextHelper.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/AlternateDocument.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Clock.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Document.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/FSDirectoryTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/RamDirectoryTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TestCase.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TransactionTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/BridgeTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/Document.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Animal.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Mammal.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/AlternateBook.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Book.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Clock.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/LuceneQueryTest.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/Email.java branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/MassIndexTest.java Log: ANN-488 package change lucene => search Copied: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search (from rev 10741, branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene) Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/Environment.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/Environment.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/Environment.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene; +package org.hibernate.search; /** * @author Emmanuel Bernard @@ -8,10 +8,10 @@ /** * Indexes base directory */ - public static final String INDEX_BASE_DIR = "hibernate.lucene.index_dir"; + public static final String INDEX_BASE_DIR = "hibernate.search.index_dir"; /** * Lucene analyser */ - public static final String ANALYZER_CLASS = "hibernate.lucene.analyzer"; + public static final String ANALYZER_CLASS = "hibernate.search.analyzer"; } Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/LuceneSession.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/LuceneSession.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/LuceneSession.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene; +package org.hibernate.search; import java.io.Serializable; import java.sql.Connection; @@ -27,16 +27,16 @@ import org.hibernate.event.PostInsertEventListener; import org.hibernate.engine.query.ParameterMetadata; import org.hibernate.impl.SessionImpl; -import org.hibernate.lucene.query.LuceneQueryImpl; -import org.hibernate.lucene.event.LuceneEventListener; -import org.hibernate.lucene.util.ContextHelper; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.backend.UpdateWork; -import org.hibernate.lucene.backend.Work; -import org.hibernate.lucene.backend.WorkQueue; -import org.hibernate.lucene.backend.impl.BatchLuceneWorkQueue; -import org.hibernate.lucene.backend.impl.PostTransactionWorkQueueSynchronization; -import org.hibernate.lucene.store.DirectoryProvider; +import org.hibernate.search.query.LuceneQueryImpl; +import org.hibernate.search.event.LuceneEventListener; +import org.hibernate.search.util.ContextHelper; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.backend.UpdateWork; +import org.hibernate.search.backend.Work; +import org.hibernate.search.backend.WorkQueue; +import org.hibernate.search.backend.impl.BatchLuceneWorkQueue; +import org.hibernate.search.backend.impl.PostTransactionWorkQueueSynchronization; +import org.hibernate.search.store.DirectoryProvider; import org.hibernate.stat.SessionStatistics; import org.hibernate.type.Type; import org.apache.lucene.document.Document; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Boost.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Boost.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Boost.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DateBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/DateBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DateBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -7,7 +7,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.hibernate.lucene.bridge.Resolution; +import org.hibernate.search.bridge.Resolution; /** * Defines the temporal resolution of a given field Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DocumentId.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/DocumentId.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/DocumentId.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ /** * Declare a field as the document id. If set to a property, the property will be used * TODO: If set to a class, the class itself will be passed to the FieldBridge - * Note that @{link org.hibernate.lucene.bridge.FieldBridge#get} must return the Entity id + * Note that @{link org.hibernate.search.bridge.FieldBridge#get} must return the Entity id * * @author Emmanuel Bernard */ Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Field.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Field.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Field.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -3,7 +3,7 @@ * JavaDoc copy/pastle from the Apache Lucene project * Available under the ASL 2.0 http://www.apache.org/licenses/LICENSE-2.0 */ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/FieldBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/FieldBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Index.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Index.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Index.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; /** * Defines how an Field should be indexed Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Indexed.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Indexed.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Indexed.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Keyword.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Keyword.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Keyword.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Store.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Store.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Store.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; /** * Whether or not the value is stored in the document Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Text.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Text.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Text.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Unstored.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/annotations/Unstored.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/annotations/Unstored.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.annotations; +package org.hibernate.search.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/AddWork.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/AddWork.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/AddWork.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; import java.io.Serializable; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/DeleteWork.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/DeleteWork.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/DeleteWork.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; import java.io.Serializable; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/UpdateWork.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/UpdateWork.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/UpdateWork.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; import java.io.Serializable; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Work.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/Work.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Work.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; import java.io.Serializable; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/WorkQueue.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/WorkQueue.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/WorkQueue.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; /** * Set of work operations Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Workspace.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/Workspace.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/Workspace.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend; +package org.hibernate.search.backend; import java.io.IOException; import java.util.ArrayList; @@ -13,8 +13,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.hibernate.HibernateException; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.store.DirectoryProvider; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.store.DirectoryProvider; /** * Lucene workspace Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/BatchLuceneWorkQueue.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/impl/BatchLuceneWorkQueue.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/BatchLuceneWorkQueue.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,20 +1,20 @@ //$Id: $ -package org.hibernate.lucene.backend.impl; +package org.hibernate.search.backend.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.locks.ReentrantLock; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.store.DirectoryProvider; -import org.hibernate.lucene.backend.impl.LuceneWorker; -import org.hibernate.lucene.backend.WorkQueue; -import org.hibernate.lucene.backend.Workspace; -import org.hibernate.lucene.backend.Work; -import org.hibernate.lucene.backend.UpdateWork; -import org.hibernate.lucene.backend.DeleteWork; -import org.hibernate.lucene.backend.AddWork; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.store.DirectoryProvider; +import org.hibernate.search.backend.impl.LuceneWorker; +import org.hibernate.search.backend.WorkQueue; +import org.hibernate.search.backend.Workspace; +import org.hibernate.search.backend.Work; +import org.hibernate.search.backend.UpdateWork; +import org.hibernate.search.backend.DeleteWork; +import org.hibernate.search.backend.AddWork; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/LuceneWorker.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/impl/LuceneWorker.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/LuceneWorker.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.backend.impl; +package org.hibernate.search.backend.impl; import java.io.IOException; import java.io.Serializable; @@ -13,12 +13,12 @@ import org.apache.lucene.index.TermDocs; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.backend.Workspace; -import org.hibernate.lucene.backend.DeleteWork; -import org.hibernate.lucene.backend.AddWork; -import org.hibernate.lucene.backend.UpdateWork; -import org.hibernate.lucene.backend.Work; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.backend.Workspace; +import org.hibernate.search.backend.DeleteWork; +import org.hibernate.search.backend.AddWork; +import org.hibernate.search.backend.UpdateWork; +import org.hibernate.search.backend.Work; /** * Stateless implementation that perform a work Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/backend/impl/PostTransactionWorkQueueSynchronization.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,11 +1,11 @@ //$Id: $ -package org.hibernate.lucene.backend.impl; +package org.hibernate.search.backend.impl; import javax.transaction.Status; import javax.transaction.Synchronization; -import org.hibernate.lucene.backend.WorkQueue; -import org.hibernate.lucene.backend.Work; +import org.hibernate.search.backend.WorkQueue; +import org.hibernate.search.backend.Work; /** * Execute some work inside a transaction sychronization Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigDecimalBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/BigDecimalBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigDecimalBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import java.math.BigDecimal; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigIntegerBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/BigIntegerBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BigIntegerBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import java.math.BigInteger; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/BridgeFactory.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/BridgeFactory.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import java.math.BigDecimal; import java.math.BigInteger; @@ -56,20 +56,20 @@ builtInBridges.put( BigDecimal.class.getName(), BIG_DECIMAL ); builtInBridges.put( String.class.getName(), STRING ); - DATE_YEAR = org.hibernate.lucene.bridge.DateBridge.DATE_YEAR; - DATE_MONTH = org.hibernate.lucene.bridge.DateBridge.DATE_MONTH; - DATE_DAY = org.hibernate.lucene.bridge.DateBridge.DATE_DAY; - DATE_HOUR = org.hibernate.lucene.bridge.DateBridge.DATE_HOUR; - DATE_MINUTE = org.hibernate.lucene.bridge.DateBridge.DATE_MINUTE; - DATE_SECOND = org.hibernate.lucene.bridge.DateBridge.DATE_SECOND; - DATE_MILLISECOND = org.hibernate.lucene.bridge.DateBridge.DATE_MILLISECOND; + DATE_YEAR = org.hibernate.search.bridge.DateBridge.DATE_YEAR; + DATE_MONTH = org.hibernate.search.bridge.DateBridge.DATE_MONTH; + DATE_DAY = org.hibernate.search.bridge.DateBridge.DATE_DAY; + DATE_HOUR = org.hibernate.search.bridge.DateBridge.DATE_HOUR; + DATE_MINUTE = org.hibernate.search.bridge.DateBridge.DATE_MINUTE; + DATE_SECOND = org.hibernate.search.bridge.DateBridge.DATE_SECOND; + DATE_MILLISECOND = org.hibernate.search.bridge.DateBridge.DATE_MILLISECOND; builtInBridges.put( Date.class.getName(), DATE_MILLISECOND ); } public static FieldBridge guessType(XMember member) { FieldBridge bridge = null; - org.hibernate.lucene.annotations.FieldBridge bridgeAnn = - member.getAnnotation( org.hibernate.lucene.annotations.FieldBridge.class ); + org.hibernate.search.annotations.FieldBridge bridgeAnn = + member.getAnnotation( org.hibernate.search.annotations.FieldBridge.class ); if ( bridgeAnn != null ) { Class impl = bridgeAnn.impl(); try { @@ -93,9 +93,9 @@ throw new HibernateException( "Unable to instanciate FieldBridge for " + member.getName(), e ); } } - else if ( member.isAnnotationPresent( org.hibernate.lucene.annotations.DateBridge.class ) ) { - Resolution resolution = member.getAnnotation( org.hibernate.lucene.annotations.DateBridge.class ).value(); - bridge = org.hibernate.lucene.bridge.DateBridge.getDateField( resolution ); + else if ( member.isAnnotationPresent( org.hibernate.search.annotations.DateBridge.class ) ) { + Resolution resolution = member.getAnnotation( org.hibernate.search.annotations.DateBridge.class ).value(); + bridge = org.hibernate.search.bridge.DateBridge.getDateField( resolution ); } else { //find in built-ins Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DateBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/DateBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DateBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import java.text.ParseException; import java.util.Date; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DoubleBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/DoubleBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/DoubleBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.hibernate.util.StringHelper; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FieldBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/FieldBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FieldBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FloatBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/FloatBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/FloatBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.hibernate.util.StringHelper; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IdFieldBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/IdFieldBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IdFieldBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.apache.lucene.document.Document; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IntegerBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/IntegerBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/IntegerBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.hibernate.util.StringHelper; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/LongBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/LongBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/LongBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.hibernate.util.StringHelper; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/NumberBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/NumberBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/NumberBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/ParameterizedBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/ParameterizedBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/ParameterizedBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import java.util.Map; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/Resolution.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/Resolution.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/Resolution.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; /** * Date indexing resolution Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/String2FieldBridgeAdaptor.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2IdFieldBridgeAdaptor.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/String2IdFieldBridgeAdaptor.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/String2IdFieldBridgeAdaptor.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/StringBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; /** * Transform an object into a stirng representation and vice versa Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringImplBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/bridge/StringImplBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/bridge/StringImplBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.bridge; +package org.hibernate.search.bridge; /** * Map a string element Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/engine/DocumentBuilder.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/engine/DocumentBuilder.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.engine; +package org.hibernate.search.engine; import java.io.Serializable; import java.lang.reflect.Modifier; @@ -16,19 +16,19 @@ import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.cfg.annotations.Version; -import org.hibernate.lucene.annotations.Boost; -import org.hibernate.lucene.annotations.DocumentId; -import org.hibernate.lucene.annotations.Index; -import org.hibernate.lucene.annotations.Keyword; -import org.hibernate.lucene.annotations.Store; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Unstored; -import org.hibernate.lucene.bridge.BridgeFactory; -import org.hibernate.lucene.bridge.FieldBridge; -import org.hibernate.lucene.bridge.IdFieldBridge; -import org.hibernate.lucene.event.LuceneEventListener; -import org.hibernate.lucene.store.DirectoryProvider; -import org.hibernate.lucene.util.BinderHelper; +import org.hibernate.search.annotations.Boost; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Keyword; +import org.hibernate.search.annotations.Store; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Unstored; +import org.hibernate.search.bridge.BridgeFactory; +import org.hibernate.search.bridge.FieldBridge; +import org.hibernate.search.bridge.IdFieldBridge; +import org.hibernate.search.event.LuceneEventListener; +import org.hibernate.search.store.DirectoryProvider; +import org.hibernate.search.util.BinderHelper; import org.hibernate.reflection.ReflectionManager; import org.hibernate.reflection.XAnnotatedElement; import org.hibernate.reflection.XClass; @@ -162,8 +162,8 @@ idBoost = getBoost( member ); } - org.hibernate.lucene.annotations.Field fieldAnn = - member.getAnnotation( org.hibernate.lucene.annotations.Field.class ); + org.hibernate.search.annotations.Field fieldAnn = + member.getAnnotation( org.hibernate.search.annotations.Field.class ); if ( fieldAnn != null ) { setAccessible( member ); fieldGetters.add( member ); Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/event/LuceneEventListener.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/event/LuceneEventListener.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/event/LuceneEventListener.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id$ -package org.hibernate.lucene.event; +package org.hibernate.search.event; import java.io.Serializable; import java.util.HashMap; @@ -25,18 +25,18 @@ import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PostUpdateEvent; import org.hibernate.event.PostUpdateEventListener; -import org.hibernate.lucene.Environment; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.backend.AddWork; -import org.hibernate.lucene.backend.DeleteWork; -import org.hibernate.lucene.backend.UpdateWork; -import org.hibernate.lucene.backend.Work; -import org.hibernate.lucene.backend.WorkQueue; -import org.hibernate.lucene.backend.impl.BatchLuceneWorkQueue; -import org.hibernate.lucene.backend.impl.PostTransactionWorkQueueSynchronization; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.store.DirectoryProvider; -import org.hibernate.lucene.store.DirectoryProviderFactory; +import org.hibernate.search.Environment; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.backend.AddWork; +import org.hibernate.search.backend.DeleteWork; +import org.hibernate.search.backend.UpdateWork; +import org.hibernate.search.backend.Work; +import org.hibernate.search.backend.WorkQueue; +import org.hibernate.search.backend.impl.BatchLuceneWorkQueue; +import org.hibernate.search.backend.impl.PostTransactionWorkQueueSynchronization; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.store.DirectoryProvider; +import org.hibernate.search.store.DirectoryProviderFactory; import org.hibernate.mapping.PersistentClass; import org.hibernate.reflection.ReflectionManager; import org.hibernate.reflection.XClass; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/EntityInfo.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/query/EntityInfo.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/EntityInfo.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.query; +package org.hibernate.search.query; import java.io.Serializable; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/IteratorImpl.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/query/IteratorImpl.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/IteratorImpl.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.query; +package org.hibernate.search.query; import java.util.Iterator; import java.util.List; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/LuceneQueryImpl.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/query/LuceneQueryImpl.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/LuceneQueryImpl.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.query; +package org.hibernate.search.query; import java.io.IOException; import java.io.Serializable; @@ -34,9 +34,9 @@ import org.hibernate.engine.query.ParameterMetadata; import org.hibernate.event.PostInsertEventListener; import org.hibernate.impl.AbstractQueryImpl; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.event.LuceneEventListener; -import org.hibernate.lucene.util.ContextHelper; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.event.LuceneEventListener; +import org.hibernate.search.util.ContextHelper; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/ScrollableResultsImpl.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/query/ScrollableResultsImpl.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.query; +package org.hibernate.search.query; import java.io.IOException; import java.math.BigDecimal; @@ -17,8 +17,8 @@ import org.hibernate.HibernateException; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.hibernate.lucene.engine.DocumentBuilder; -import org.hibernate.lucene.event.LuceneEventListener; +import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.event.LuceneEventListener; import org.hibernate.type.Type; /** Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProvider.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProvider.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.store; +package org.hibernate.search.store; import java.util.Properties; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.store; +package org.hibernate.search.store; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Configuration; -import org.hibernate.lucene.annotations.Indexed; +import org.hibernate.search.annotations.Indexed; import org.hibernate.mapping.PersistentClass; import org.hibernate.reflection.ReflectionManager; import org.hibernate.reflection.XClass; @@ -20,13 +20,13 @@ * Create a Lucene directory provider * <p/> * Lucene directory providers are configured through properties - * - hibernate.lucene.default.* and - * - hibernate.lucene.<indexname>.* + * - hibernate.search.default.* and + * - hibernate.search.<indexname>.* * <p/> * <indexname> properties have precedence over default * <p/> * The implementation is described by - * hibernate.lucene.[default|indexname].directory_provider + * hibernate.search.[default|indexname].directory_provider * <p/> * If none is defined the default value is FSDirectory * @@ -35,7 +35,7 @@ */ public class DirectoryProviderFactory { public List<DirectoryProvider<?>> providers = new ArrayList<DirectoryProvider<?>>(); - private static String LUCENE_PREFIX = "hibernate.lucene."; + private static String LUCENE_PREFIX = "hibernate.search."; private static String LUCENE_DEFAULT = LUCENE_PREFIX + "default."; private static String DEFAULT_DIRECTORY_PROVIDER = FSDirectoryProvider.class.getName(); Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/FSDirectoryProvider.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.store; +package org.hibernate.search.store; import java.io.File; import java.io.IOException; @@ -15,7 +15,7 @@ /** * Use a Lucene FSDirectory - * The base directory is represented by hibernate.lucene.<index>.indexBase + * The base directory is represented by hibernate.search.<index>.indexBase * The index is created in <base directory>/<index name> * * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/RAMDirectoryProvider.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/RAMDirectoryProvider.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/store/RAMDirectoryProvider.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.store; +package org.hibernate.search.store; import java.io.IOException; import java.util.Properties; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/util/BinderHelper.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/BinderHelper.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.util; +package org.hibernate.search.util; import org.hibernate.reflection.XMember; import org.hibernate.util.StringHelper; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/ContextHelper.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/util/ContextHelper.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/search/util/ContextHelper.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,10 +1,10 @@ //$Id: $ -package org.hibernate.lucene.util; +package org.hibernate.search.util; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.event.PostInsertEventListener; -import org.hibernate.lucene.event.LuceneEventListener; +import org.hibernate.search.event.LuceneEventListener; /** * @author Emmanuel Bernard Copied: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search (from rev 10741, branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene) Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/AlternateDocument.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/AlternateDocument.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/AlternateDocument.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,16 +1,16 @@ //$Id: $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Lob; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.DocumentId; -import org.hibernate.lucene.annotations.Field; -import org.hibernate.lucene.annotations.Store; -import org.hibernate.lucene.annotations.Index; -import org.hibernate.lucene.annotations.Boost; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Store; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Boost; /** * Example of 2 entities mapped in the same index Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Clock.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/Clock.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Clock.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,12 +1,12 @@ //$Id: $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import javax.persistence.Entity; import javax.persistence.Id; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Keyword; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Keyword; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Document.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/Document.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/Document.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,17 +1,17 @@ //$Id$ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Lob; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Boost; -import org.hibernate.lucene.annotations.Field; -import org.hibernate.lucene.annotations.Index; -import org.hibernate.lucene.annotations.DocumentId; -import org.hibernate.lucene.annotations.Store; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Boost; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Store; @Entity @Indexed(index = "Documents") Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/FSDirectoryTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/FSDirectoryTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/FSDirectoryTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: LuceneTest.java 10014 2006-06-12 09:56:27 -0700 (lun., 12 juin 2006) epbernard $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import java.io.File; import java.util.List; @@ -17,9 +17,9 @@ import org.hibernate.event.PostDeleteEventListener; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PostUpdateEventListener; -import org.hibernate.lucene.Environment; -import org.hibernate.lucene.store.FSDirectoryProvider; -import org.hibernate.lucene.event.LuceneEventListener; +import org.hibernate.search.Environment; +import org.hibernate.search.store.FSDirectoryProvider; +import org.hibernate.search.event.LuceneEventListener; /** * @author Gavin King @@ -180,8 +180,8 @@ protected void configure(org.hibernate.cfg.Configuration cfg) { File sub = getBaseIndexDir(); - cfg.setProperty( "hibernate.lucene.default.indexBase", sub.getAbsolutePath() ); - cfg.setProperty( "hibernate.lucene.Clock.directory_provider", FSDirectoryProvider.class.getName() ); + cfg.setProperty( "hibernate.search.default.indexBase", sub.getAbsolutePath() ); + cfg.setProperty( "hibernate.search.Clock.directory_provider", FSDirectoryProvider.class.getName() ); cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() ); LuceneEventListener del = new LuceneEventListener(); cfg.getEventListeners().setPostDeleteEventListeners( new PostDeleteEventListener[]{del} ); Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/RamDirectoryTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/RamDirectoryTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/RamDirectoryTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import java.io.File; import java.util.List; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TestCase.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/TestCase.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TestCase.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,14 +1,14 @@ //$Id: $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import org.apache.lucene.analysis.StopAnalyzer; import org.apache.lucene.store.Directory; import org.hibernate.event.PostDeleteEventListener; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PostUpdateEventListener; -import org.hibernate.lucene.Environment; -import org.hibernate.lucene.store.RAMDirectoryProvider; -import org.hibernate.lucene.event.LuceneEventListener; +import org.hibernate.search.Environment; +import org.hibernate.search.store.RAMDirectoryProvider; +import org.hibernate.search.event.LuceneEventListener; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.impl.SessionFactoryImpl; @@ -43,7 +43,7 @@ } protected void configure(org.hibernate.cfg.Configuration cfg) { - cfg.setProperty( "hibernate.lucene.default.directory_provider", RAMDirectoryProvider.class.getName() ); + cfg.setProperty( "hibernate.search.default.directory_provider", RAMDirectoryProvider.class.getName() ); cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() ); LuceneEventListener del = new LuceneEventListener(); cfg.getEventListeners().setPostDeleteEventListeners( new PostDeleteEventListener[]{del} ); Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TransactionTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/TransactionTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/TransactionTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.test; +package org.hibernate.search.test; import java.io.File; import java.io.IOException; @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.HibernateException; import org.hibernate.event.PostInsertEventListener; -import org.hibernate.lucene.LuceneSession; -import org.hibernate.lucene.event.LuceneEventListener; +import org.hibernate.search.LuceneSession; +import org.hibernate.search.event.LuceneEventListener; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.Term; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/BridgeTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/bridge/BridgeTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,5 +1,5 @@ //$Id: $ -package org.hibernate.lucene.test.bridge; +package org.hibernate.search.test.bridge; import java.util.Date; import java.util.List; @@ -10,9 +10,9 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.hibernate.lucene.test.TestCase; -import org.hibernate.lucene.LuceneSession; -import org.hibernate.lucene.Environment; +import org.hibernate.search.test.TestCase; +import org.hibernate.search.LuceneSession; +import org.hibernate.search.Environment; import org.hsqldb.Session; import org.apache.lucene.search.Query; import org.apache.lucene.queryParser.QueryParser; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/bridge/Cloud.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/Cloud.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,17 +1,17 @@ //$Id: $ -package org.hibernate.lucene.test.bridge; +package org.hibernate.search.test.bridge; import java.util.Date; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.GeneratedValue; -import org.hibernate.lucene.annotations.Keyword; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.DateBridge; -import org.hibernate.lucene.annotations.FieldBridge; -import org.hibernate.lucene.bridge.Resolution; +import org.hibernate.search.annotations.Keyword; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.DateBridge; +import org.hibernate.search.annotations.FieldBridge; +import org.hibernate.search.bridge.Resolution; import org.hibernate.annotations.Parameter; /** Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/bridge/TruncateFieldBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,7 +1,7 @@ //$Id: $ -package org.hibernate.lucene.test.bridge; +package org.hibernate.search.test.bridge; -import org.hibernate.lucene.bridge.FieldBridge; +import org.hibernate.search.bridge.FieldBridge; import org.hibernate.util.StringHelper; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/bridge/TruncateStringBridge.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,10 +1,10 @@ //$Id: $ -package org.hibernate.lucene.test.bridge; +package org.hibernate.search.test.bridge; import java.util.Map; -import org.hibernate.lucene.bridge.StringBridge; -import org.hibernate.lucene.bridge.ParameterizedBridge; +import org.hibernate.search.bridge.StringBridge; +import org.hibernate.search.bridge.ParameterizedBridge; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/Document.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/fieldAccess/Document.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/Document.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,16 +1,16 @@ //$Id: $ -package org.hibernate.lucene.test.fieldAccess; +package org.hibernate.search.test.fieldAccess; import javax.persistence.Id; import javax.persistence.GeneratedValue; import javax.persistence.Entity; import javax.persistence.Lob; -import org.hibernate.lucene.annotations.Unstored; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Keyword; -import org.hibernate.lucene.annotations.Boost; -import org.hibernate.lucene.annotations.Indexed; +import org.hibernate.search.annotations.Unstored; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Keyword; +import org.hibernate.search.annotations.Boost; +import org.hibernate.search.annotations.Indexed; /** * @author Richard Hallier Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/fieldAccess/FieldAccessTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,10 +1,10 @@ //$Id: $ -package org.hibernate.lucene.test.fieldAccess; +package org.hibernate.search.test.fieldAccess; import java.util.List; -import org.hibernate.lucene.test.TestCase; -import org.hibernate.lucene.LuceneSession; +import org.hibernate.search.test.TestCase; +import org.hibernate.search.LuceneSession; import org.hibernate.Session; import org.hibernate.Transaction; import org.apache.lucene.queryParser.QueryParser; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Animal.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Animal.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Animal.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,9 +1,9 @@ //$Id: $ -package org.hibernate.lucene.test.inheritance; +package org.hibernate.search.test.inheritance; -import org.hibernate.lucene.annotations.Keyword; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Indexed; +import org.hibernate.search.annotations.Keyword; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Indexed; import javax.persistence.Entity; import javax.persistence.Id; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/InheritanceTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,10 +1,10 @@ //$Id: $ -package org.hibernate.lucene.test.inheritance; +package org.hibernate.search.test.inheritance; -import org.hibernate.lucene.test.TestCase; -import org.hibernate.lucene.test.query.Clock; -import org.hibernate.lucene.test.query.Book; -import org.hibernate.lucene.LuceneSession; +import org.hibernate.search.test.TestCase; +import org.hibernate.search.test.query.Clock; +import org.hibernate.search.test.query.Book; +import org.hibernate.search.LuceneSession; import org.hibernate.Transaction; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Mammal.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Mammal.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/inheritance/Mammal.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,8 +1,8 @@ //$Id: $ -package org.hibernate.lucene.test.inheritance; +package org.hibernate.search.test.inheritance; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Keyword; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Keyword; import javax.persistence.Entity; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/AlternateBook.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/query/AlternateBook.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/AlternateBook.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,13 +1,13 @@ //$Id: $ -package org.hibernate.lucene.test.query; +package org.hibernate.search.test.query; import javax.persistence.Entity; import javax.persistence.Id; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.DocumentId; -import org.hibernate.lucene.annotations.Field; -import org.hibernate.lucene.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Book.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/query/Book.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Book.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,13 +1,13 @@ //$Id: $ -package org.hibernate.lucene.test.query; +package org.hibernate.search.test.query; import javax.persistence.Entity; import javax.persistence.Id; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Keyword; -import org.hibernate.lucene.annotations.Unstored; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Keyword; +import org.hibernate.search.annotations.Unstored; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Clock.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/query/Clock.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/Clock.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,12 +1,12 @@ //$Id: $ -package org.hibernate.lucene.test.query; +package org.hibernate.search.test.query; import javax.persistence.Entity; import javax.persistence.Id; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.Text; -import org.hibernate.lucene.annotations.Keyword; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Text; +import org.hibernate.search.annotations.Keyword; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/LuceneQueryTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/query/LuceneQueryTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/query/LuceneQueryTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,11 +1,11 @@ //$Id: $ -package org.hibernate.lucene.test.query; +package org.hibernate.search.test.query; import java.util.List; import java.util.Iterator; -import org.hibernate.lucene.test.TestCase; -import org.hibernate.lucene.LuceneSession; +import org.hibernate.search.test.TestCase; +import org.hibernate.search.LuceneSession; import org.hibernate.Transaction; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/Email.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/session/Email.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/Email.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,14 +1,14 @@ //$Id: $ -package org.hibernate.lucene.test.session; +package org.hibernate.search.test.session; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.GeneratedValue; -import org.hibernate.lucene.annotations.Indexed; -import org.hibernate.lucene.annotations.DocumentId; -import org.hibernate.lucene.annotations.Field; -import org.hibernate.lucene.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; /** * @author Emmanuel Bernard Modified: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/MassIndexTest.java =================================================================== --- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/session/MassIndexTest.java 2006-11-06 22:14:32 UTC (rev 10741) +++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/search/test/session/MassIndexTest.java 2006-11-07 01:03:16 UTC (rev 10742) @@ -1,11 +1,11 @@ //$Id: $ -package org.hibernate.lucene.test.session; +package org.hibernate.search.test.session; import java.sql.SQLException; import java.util.List; -import org.hibernate.lucene.test.TestCase; -import org.hibernate.lucene.LuceneSession; +import org.hibernate.search.test.TestCase; +import org.hibernate.search.LuceneSession; import org.hibernate.Session; import org.hibernate.Transaction; import org.apache.lucene.queryParser.QueryParser;