[hibernate-commits] Hibernate SVN: r14936 - in search/trunk/src/java/org/hibernate/search: backend and 4 other directories.

Author: epbernard Date: 2008-07-16 10:53:39 -0400 (Wed, 16 Jul 2008) New Revision: 14936 Added: search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java search/trunk/src/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java Removed: search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java Modified: search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java search/trunk/src/java/org/hibernate/search/backend/Worker.java search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java Log: Move TransactionContext make ProvidedId more generic in the annotation def Modified: search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -23,5 +23,5 @@ String name() default "providedId"; - Class<StringBridge> bridge() default StringBridge.class; + Class<?> bridge() default StringBridge.class; } Copied: search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java (from rev 14935, search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java) =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java (rev 0) +++ search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -0,0 +1,27 @@ +package org.hibernate.search.backend; + +import javax.transaction.Synchronization; + +/** + * Contract needed by Hibernate Search to bach changes per transactio + * + * @author Navin Surtani - navin(a)surtani.org + */ +public interface TransactionContext { + /** + * @return A boolean whether a transaction is in progress or not. + */ + public boolean isTransactionInProgress(); + + /** + * @return a transaction object. + */ + public Object getTransactionIdentifier(); + + /** + * register the givne synchronization + * + * @param synchronization synchronization to register + */ + public void registerSynchronization(Synchronization synchronization); +} Modified: search/trunk/src/java/org/hibernate/search/backend/Worker.java =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/Worker.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/backend/Worker.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -3,9 +3,8 @@ import java.util.Properties; -import org.hibernate.event.EventSource; import org.hibernate.search.engine.SearchFactoryImplementor; -import org.hibernate.search.transaction.TransactionContext; +import org.hibernate.search.backend.TransactionContext; /** * Perform work for a given session. This implementation has to be multi threaded Copied: search/trunk/src/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java (from rev 14935, search/trunk/src/java/org/hibernate/search/transaction/EventSourceTransactionContext.java) =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java (rev 0) +++ search/trunk/src/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -0,0 +1,35 @@ +package org.hibernate.search.backend.impl; + +import java.io.Serializable; +import javax.transaction.Synchronization; + +import org.hibernate.Transaction; +import org.hibernate.search.backend.TransactionContext; +import org.hibernate.event.EventSource; + +/** + * Implementation of the transactional context on top of an EventSource (Session) + * + * @author Navin Surtani - navin(a)surtani.org + */ +public class EventSourceTransactionContext implements TransactionContext, Serializable { + EventSource eventSource; + + public EventSourceTransactionContext(EventSource eventSource) { + this.eventSource = eventSource; + } + + public Object getTransactionIdentifier() { + return eventSource.getTransaction(); + } + + public void registerSynchronization(Synchronization synchronization) { + Transaction transaction = eventSource.getTransaction(); + transaction.registerSynchronization( synchronization ); + } + + public boolean isTransactionInProgress() { + return eventSource.isTransactionInProgress(); + } + +} Modified: search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -7,8 +7,8 @@ import org.hibernate.search.backend.Work; import org.hibernate.search.backend.WorkQueue; import org.hibernate.search.backend.Worker; +import org.hibernate.search.backend.TransactionContext; import org.hibernate.search.engine.SearchFactoryImplementor; -import org.hibernate.search.transaction.TransactionContext; import org.hibernate.search.util.WeakIdentityHashMap; /** Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java =================================================================== --- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -23,12 +23,9 @@ import org.hibernate.event.PostUpdateEventListener; import org.hibernate.search.backend.Work; import org.hibernate.search.backend.WorkType; -import org.hibernate.search.cfg.SearchConfiguration; -import org.hibernate.search.cfg.SearchConfigurationFromHibernateCore; import org.hibernate.search.engine.DocumentBuilder; import org.hibernate.search.engine.SearchFactoryImplementor; -import org.hibernate.search.impl.SearchFactoryImpl; -import org.hibernate.search.transaction.EventSourceTransactionContext; +import org.hibernate.search.backend.impl.EventSourceTransactionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java =================================================================== --- search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -45,11 +45,11 @@ import org.hibernate.search.SearchFactory; import org.hibernate.search.backend.Work; import org.hibernate.search.backend.WorkType; +import org.hibernate.search.backend.TransactionContext; +import org.hibernate.search.backend.impl.EventSourceTransactionContext; import org.hibernate.search.engine.DocumentBuilder; import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.FullTextQueryImpl; -import org.hibernate.search.transaction.EventSourceTransactionContext; -import org.hibernate.search.transaction.TransactionContext; import org.hibernate.search.util.ContextHelper; import org.hibernate.stat.SessionStatistics; import org.hibernate.type.Type; Deleted: search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java =================================================================== --- search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java 2008-07-16 14:37:47 UTC (rev 14935) +++ search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java 2008-07-16 14:53:39 UTC (rev 14936) @@ -1,28 +0,0 @@ -package org.hibernate.search.transaction; - -import java.io.Serializable; -import javax.transaction.Synchronization; - -/** - * Contract needed by Hibernate Search to bach changes per transactio - * - * @author Navin Surtani - navin(a)surtani.org - */ -public interface TransactionContext { - /** - * @return A boolean whether a transaction is in progress or not. - */ - public boolean isTransactionInProgress(); - - /** - * @return a transaction object. - */ - public Object getTransactionIdentifier(); - - /** - * register the givne synchronization - * - * @param synchronization synchronization to register - */ - public void registerSynchronization(Synchronization synchronization); -}