Hibernate SVN: r11634 - in trunk/HibernateExt/search/src: java/org/hibernate/search/backend and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-05 19:12:44 -0400 (Tue, 05 Jun 2007)
New Revision: 11634
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/Environment.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java
Log:
HSEARCH-33 Support hibernate.search.worker.batch_size for massive indexation
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Environment.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/Environment.java 2007-06-05 20:58:24 UTC (rev 11633)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/Environment.java 2007-06-05 23:12:44 UTC (rev 11634)
@@ -25,6 +25,11 @@
public static final String WORKER_EXECUTION = WORKER_PREFIX + "execution";
/**
+ * Defines the maximum number of indexing operation batched per transaction
+ */
+ public static final String WORKER_BATCHSIZE = WORKER_PREFIX + "batch_size";
+
+ /**
* only used then execution is async
* Thread pool size
* default 1
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java 2007-06-05 20:58:24 UTC (rev 11633)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java 2007-06-05 23:12:44 UTC (rev 11634)
@@ -19,6 +19,10 @@
queue = new ArrayList<Work>(size);
}
+ private WorkQueue(List<Work> queue) {
+ this.queue = queue;
+ }
+
public WorkQueue() {
this(10);
}
@@ -33,7 +37,13 @@
return queue;
}
+ public WorkQueue splitQueue() {
+ WorkQueue subQueue = new WorkQueue( queue );
+ this.queue = new ArrayList<Work>( queue.size() );
+ return subQueue;
+ }
+
public List<LuceneWork> getSealedQueue() {
if (sealedQueue == null) throw new AssertionFailure("Access a Sealed WorkQueue whcih has not been sealed");
return sealedQueue;
@@ -49,4 +59,8 @@
queue.clear();
if (sealedQueue != null) sealedQueue.clear();
}
+
+ public int size() {
+ return queue.size();
+ }
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-05 20:58:24 UTC (rev 11633)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-05 23:12:44 UTC (rev 11634)
@@ -34,6 +34,7 @@
*/
public class BatchedQueueingProcessor implements QueueingProcessor {
private boolean sync;
+ private int batchSize;
private ExecutorService executorService;
private BackendQueueProcessorFactory backendQueueProcessorFactory;
private SearchFactoryImplementor searchFactoryImplementor;
@@ -52,6 +53,9 @@
int queueSize = Integer.parseInt(
properties.getProperty( Environment.WORKER_WORKQUEUE_SIZE, Integer.toString( Integer.MAX_VALUE ) ).trim()
);
+ batchSize = Integer.parseInt(
+ properties.getProperty( Environment.WORKER_BATCHSIZE, "0" ).trim()
+ );
if ( !sync ) {
/**
* choose min = max with a sizable queue to be able to
@@ -96,6 +100,11 @@
//don't check for builder it's done in performWorks
Work work = new Work(entity, id, workType);
workQueue.add( work );
+ if ( batchSize > 0 && workQueue.size() >= batchSize ) {
+ WorkQueue subQueue = workQueue.splitQueue();
+ prepareWorks( subQueue );
+ performWorks( subQueue );
+ }
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-05 20:58:24 UTC (rev 11633)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-05 23:12:44 UTC (rev 11634)
@@ -89,7 +89,7 @@
if (entity == null) return;
Class clazz = Hibernate.getClass( entity );
//TODO cache that at the FTSession level
- SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactory( session );
+ SearchFactoryImplementor searchFactoryImplementor = getSearchFactoryImplementor();
//not strictly necessary but a small optimization
DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
if ( builder != null ) {
@@ -112,6 +112,13 @@
return searchFactory;
}
+ private SearchFactoryImplementor getSearchFactoryImplementor() {
+ if (searchFactory == null) {
+ searchFactory = ContextHelper.getSearchFactory( session );
+ }
+ return searchFactory;
+ }
+
public Query createSQLQuery(String sql, String returnAlias, Class returnClass) {
return session.createSQLQuery( sql, returnAlias, returnClass );
}
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java 2007-06-05 20:58:24 UTC (rev 11633)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java 2007-06-05 23:12:44 UTC (rev 11634)
@@ -3,14 +3,19 @@
import java.util.List;
import java.sql.ResultSet;
+import java.io.File;
import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.impl.FullTextSessionImpl;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
+import org.hibernate.search.Environment;
+import org.hibernate.search.store.FSDirectoryProvider;
import org.hibernate.search.util.ContextHelper;
import org.hibernate.Transaction;
import org.hibernate.Session;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.store.Directory;
@@ -26,6 +31,40 @@
*/
public class MassIndexTest extends SearchTestCase {
+ public void testBatchSize() throws Exception {
+ FullTextSession s = Search.createFullTextSession( openSession() );
+ Transaction tx = s.beginTransaction();
+ int loop = 14;
+ for (int i = 0 ; i < loop; i++) {
+ s.connection().createStatement().executeUpdate( "insert into Email(id, title, body, header) values( + "
+ + (i+1) + ", 'Bob Sponge', 'Meet the guys who create the software', 'nope')");
+ }
+ tx.commit();
+ s.close();
+
+ //check non created object does get found!!1
+ s = new FullTextSessionImpl( openSession() );
+ tx = s.beginTransaction();
+ ScrollableResults results = s.createCriteria( Email.class ).scroll( ScrollMode.FORWARD_ONLY );
+ int index = 0;
+ while( results.next() ) {
+ index++;
+ s.index( results.get(0) );
+ if (index % 5 == 0) s.clear();
+ }
+ tx.commit();
+ s.clear();
+ tx = s.beginTransaction();
+ QueryParser parser = new QueryParser("id", new StopAnalyzer() );
+ List result = s.createFullTextQuery( parser.parse( "body:create" ) ).list();
+ assertEquals( 14, result.size() );
+ for (Object object : result) {
+ s.delete( object );
+ }
+ tx.commit();
+ s.close();
+ }
+
public void testTransactional() throws Exception {
FullTextSession s = Search.createFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
@@ -127,6 +166,12 @@
s.close();
}
+ protected void configure(org.hibernate.cfg.Configuration cfg) {
+ super.configure( cfg );
+ cfg.setProperty( "hibernate.search.worker.batch_size", "5" );
+ cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() );
+ }
+
protected Class[] getMappings() {
return new Class[] {
Email.class,
18 years, 10 months
- 1
- 0
Hibernate SVN: r11633 - in trunk/HibernateExt/search/src: java/org/hibernate/search/backend and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-05 16:58:24 -0400 (Tue, 05 Jun 2007)
New Revision: 11633
Added:
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/OptimizeLuceneWork.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/OptimizeTest.java
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
Log:
HSEARCH-72 optimize inspired by Andrew Hahn's patch
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-05 18:35:57 UTC (rev 11632)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -20,4 +20,14 @@
* for a given entity
*/
DirectoryProvider getDirectoryProvider(Class entity);
+
+ /**
+ * Optimize all indexes
+ */
+ void optimize();
+
+ /**
+ * Optimize the index holding <code>entityType</code>
+ */
+ void optimize(Class entityType);
}
Added: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/OptimizeLuceneWork.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/OptimizeLuceneWork.java (rev 0)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/OptimizeLuceneWork.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -0,0 +1,14 @@
+//$Id$
+package org.hibernate.search.backend;
+
+import java.io.Serializable;
+
+/**
+ * @author Andrew Hahn
+ * @author Emmanuel Bernard
+ */
+public class OptimizeLuceneWork extends LuceneWork {
+ public OptimizeLuceneWork(Class entity) {
+ super( null, entity );
+ }
+}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2007-06-05 18:35:57 UTC (rev 11632)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.List;
+import java.util.ArrayList;
import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.jms.QueueConnection;
@@ -11,6 +12,7 @@
import org.hibernate.HibernateException;
import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.backend.OptimizeLuceneWork;
/**
* @author Emmanuel Bernard
@@ -26,6 +28,14 @@
}
public void run() {
+ List<LuceneWork> filteredQueue = new ArrayList<LuceneWork>(queue);
+ for (LuceneWork work : queue) {
+ if ( work instanceof OptimizeLuceneWork ) {
+ //we don't want optimization to be propagated
+ filteredQueue.remove( work );
+ }
+ }
+ if ( filteredQueue.size() == 0) return;
factory.prepareJMSTools();
QueueConnection cnn;
QueueSender sender;
@@ -36,7 +46,7 @@
session = cnn.createQueueSession( false, QueueSession.AUTO_ACKNOWLEDGE );
ObjectMessage message = session.createObjectMessage();
- message.setObject( (Serializable) this.queue );
+ message.setObject( (Serializable) filteredQueue );
sender = session.createSender( factory.getJmsQueue() );
sender.send( message );
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-05 18:35:57 UTC (rev 11632)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -8,6 +8,7 @@
import org.hibernate.search.backend.AddLuceneWork;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
+import org.hibernate.search.backend.OptimizeLuceneWork;
import org.hibernate.search.engine.SearchFactoryImplementor;
/**
@@ -64,6 +65,7 @@
private long getWorkHashCode(LuceneWork luceneWork, Workspace workspace) {
long h = workspace.getDocumentBuilder( luceneWork.getEntityClass() ).hashCode() * 2;
if ( luceneWork instanceof AddLuceneWork ) h+=1; //addwork after deleteWork
+ if ( luceneWork instanceof OptimizeLuceneWork ) h+=2; //optimize after everything
return h;
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java 2007-06-05 18:35:57 UTC (rev 11632)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -17,6 +17,7 @@
import org.hibernate.search.backend.DeleteLuceneWork;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
+import org.hibernate.search.backend.OptimizeLuceneWork;
import org.hibernate.search.engine.DocumentBuilder;
/**
@@ -39,6 +40,9 @@
else if ( DeleteLuceneWork.class.isAssignableFrom( luceneWork.getClass() ) ) {
performWork( (DeleteLuceneWork) luceneWork );
}
+ else if ( OptimizeLuceneWork.class.isAssignableFrom( luceneWork.getClass() ) ) {
+ performWork( (OptimizeLuceneWork) luceneWork );
+ }
else {
throw new AssertionFailure( "Unknown work type: " + luceneWork.getClass() );
}
@@ -106,4 +110,19 @@
}
}
}
+
+ public void performWork(OptimizeLuceneWork work) {
+ Class entity = work.getEntityClass();
+ if ( log.isTraceEnabled() )
+ log.trace( "optimize Lucene index: " + entity );
+ //TODO get a batchIndexWriter of some kind that deals with different merge factors and all
+ //TODO this one should not compete with a regular IndexWriter (ie exception from the workspace)
+ IndexWriter writer = workspace.getIndexWriter( entity );
+ try {
+ writer.optimize();
+ }
+ catch (IOException e) {
+ throw new SearchException( "Unable to optimize Lucene index: " + entity, e );
+ }
+ }
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2007-06-05 18:35:57 UTC (rev 11632)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -6,6 +6,8 @@
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
+import java.util.List;
+import java.util.ArrayList;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.analysis.Analyzer;
@@ -15,20 +17,21 @@
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.mapping.PersistentClass;
+import org.hibernate.search.Environment;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.Version;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.Worker;
import org.hibernate.search.backend.WorkerFactory;
+import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.backend.OptimizeLuceneWork;
import org.hibernate.search.engine.DocumentBuilder;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.reader.ReaderProvider;
import org.hibernate.search.reader.ReaderProviderFactory;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.DirectoryProviderFactory;
-import org.hibernate.search.SearchFactory;
-import org.hibernate.search.Version;
-import org.hibernate.search.Environment;
-import org.hibernate.search.SearchException;
import org.hibernate.util.ReflectHelper;
/**
@@ -37,9 +40,11 @@
public class SearchFactoryImpl implements SearchFactoryImplementor {
private static ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>> contexts =
new ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>>();
+
static {
Version.touch();
}
+
private Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
//keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
private Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders =
@@ -111,11 +116,11 @@
}
}
Set<Class> indexedClasses = documentBuilders.keySet();
- for ( DocumentBuilder builder : documentBuilders.values() ) {
+ for (DocumentBuilder builder : documentBuilders.values()) {
builder.postInitialize( indexedClasses );
}
- worker = WorkerFactory.createWorker(cfg, this);
- readerProvider = ReaderProviderFactory.createReaderProvider(cfg, this);
+ worker = WorkerFactory.createWorker( cfg, this );
+ readerProvider = ReaderProviderFactory.createReaderProvider( cfg, this );
}
//code doesn't have to be multithreaded because SF creation is not.
@@ -123,13 +128,13 @@
//FIXME this is ugly, impl.staticmethod, fix that
public static SearchFactoryImpl getSearchFactory(Configuration cfg) {
WeakHashMap<Configuration, SearchFactoryImpl> contextMap = contexts.get();
- if (contextMap == null) {
+ if ( contextMap == null ) {
contextMap = new WeakHashMap<Configuration, SearchFactoryImpl>( 2 );
contexts.set( contextMap );
}
SearchFactoryImpl searchFactory = contextMap.get( cfg );
- if ( searchFactory == null) {
- searchFactory = new SearchFactoryImpl(cfg);
+ if ( searchFactory == null ) {
+ searchFactory = new SearchFactoryImpl( cfg );
contextMap.put( cfg, searchFactory );
}
@@ -174,4 +179,20 @@
DocumentBuilder<Object> documentBuilder = getDocumentBuilders().get( entity );
return documentBuilder == null ? null : documentBuilder.getDirectoryProvider();
}
+
+ public void optimize() {
+ Set<Class> clazzs = getDocumentBuilders().keySet();
+ for (Class clazz : clazzs) {
+ optimize( clazz );
+ }
+ }
+
+ public void optimize(Class entityType) {
+ if ( ! getDocumentBuilders().containsKey( entityType ) ) {
+ throw new SearchException("Entity not indexed: " + entityType);
+ }
+ List<LuceneWork> queue = new ArrayList<LuceneWork>(1);
+ queue.add( new OptimizeLuceneWork( entityType ) );
+ getBackendQueueProcessorFactory().getProcessor( queue ).run();
+ }
}
Added: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/OptimizeTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/OptimizeTest.java (rev 0)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/OptimizeTest.java 2007-06-05 20:58:24 UTC (rev 11633)
@@ -0,0 +1,105 @@
+//$Id$
+package org.hibernate.search.test.session;
+
+import java.io.File;
+
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.queryParser.QueryParser;
+import org.hibernate.Transaction;
+import org.hibernate.event.PostDeleteEventListener;
+import org.hibernate.event.PostInsertEventListener;
+import org.hibernate.event.PostUpdateEventListener;
+import org.hibernate.search.Environment;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.event.FullTextIndexEventListener;
+import org.hibernate.search.impl.FullTextSessionImpl;
+import org.hibernate.search.store.FSDirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class OptimizeTest extends SearchTestCase {
+
+ public void testOptimize() throws Exception {
+ FullTextSession s = Search.createFullTextSession( openSession() );
+ Transaction tx = s.beginTransaction();
+ int loop = 2000;
+ for (int i = 0; i < loop; i++) {
+ Email email = new Email();
+ email.setId( (long) i + 1 );
+ email.setTitle( "JBoss World Berlin" );
+ email.setBody( "Meet the guys who wrote the software" );
+ s.persist( email );
+ }
+ tx.commit();
+ s.close();
+
+ s = Search.createFullTextSession( openSession() );
+ tx = s.beginTransaction();
+ s.getSearchFactory().optimize( Email.class );
+ tx.commit();
+ s.close();
+
+ //check non indexed object get indexed by s.index
+ s = new FullTextSessionImpl( openSession() );
+ tx = s.beginTransaction();
+ QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ int result = s.createFullTextQuery( parser.parse( "body:wrote" ) ).getResultSize();
+ assertEquals( 2000, result );
+ s.createQuery( "delete " + Email.class.getName() ).executeUpdate();
+ tx.commit();
+ s.close();
+ }
+
+ protected void configure(org.hibernate.cfg.Configuration cfg) {
+ File sub = getBaseIndexDir();
+ cfg.setProperty( "hibernate.search.default.indexBase", sub.getAbsolutePath() );
+ cfg.setProperty( "hibernate.search.default.directory_provider", FSDirectoryProvider.class.getName() );
+ cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() );
+ }
+
+ protected void setUp() throws Exception {
+ File sub = getBaseIndexDir();
+ sub.mkdir();
+ File[] files = sub.listFiles();
+ for (File file : files) {
+ if ( file.isDirectory() ) {
+ delete( file );
+ }
+ }
+ //super.setUp(); //we need a fresh session factory each time for index set up
+ buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles() );
+ }
+
+ private File getBaseIndexDir() {
+ File current = new File( "." );
+ File sub = new File( current, "indextemp" );
+ return sub;
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ File sub = getBaseIndexDir();
+ delete( sub );
+ }
+
+ private void delete(File sub) {
+ if ( sub.isDirectory() ) {
+ for (File file : sub.listFiles()) {
+ delete( file );
+ }
+ sub.delete();
+ }
+ else {
+ sub.delete();
+ }
+ }
+
+ protected Class[] getMappings() {
+ return new Class[] {
+ Email.class
+ };
+ }
+}
18 years, 10 months
- 1
- 0
Hibernate SVN: r11632 - branches.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-06-05 14:35:57 -0400 (Tue, 05 Jun 2007)
New Revision: 11632
Added:
branches/JBOSS_EAP_4_2_0/
Log:
creating branches for JBoss EAP 4.2.0 release
18 years, 10 months
- 1
- 0
Hibernate SVN: r11631 - in trunk/HibernateExt/search/src: java/org/hibernate/search/backend and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-05 11:48:42 -0400 (Tue, 05 Jun 2007)
New Revision: 11631
Added:
trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
Removed:
trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java
trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentBuilder.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
Log:
HSEARCH-71 fulltextSession.getSearchFactory()
HSEARCH-60 SearchFactory SearchFactoryImplementor SearchFactoryImpl
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -22,4 +22,9 @@
* Indexation is batched per transaction
*/
void index(Object entity);
+
+ /**
+ * return the SearchFactory
+ */
+ SearchFactory getSearchFactory();
}
Deleted: trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -1,171 +0,0 @@
-//$Id$
-package org.hibernate.search;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
-import org.hibernate.annotations.common.reflection.XClass;
-import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.backend.BackendQueueProcessorFactory;
-import org.hibernate.search.backend.Worker;
-import org.hibernate.search.backend.WorkerFactory;
-import org.hibernate.search.engine.DocumentBuilder;
-import org.hibernate.search.reader.ReaderProvider;
-import org.hibernate.search.reader.ReaderProviderFactory;
-import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.search.store.DirectoryProviderFactory;
-import org.hibernate.util.ReflectHelper;
-
-/**
- * @author Emmanuel Bernard
- */
-public class SearchFactory {
- private static ThreadLocal<WeakHashMap<Configuration, SearchFactory>> contexts =
- new ThreadLocal<WeakHashMap<Configuration, SearchFactory>>();
- static {
- Version.touch();
- }
- private Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
- //keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
- private Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders =
- new HashMap<DirectoryProvider, ReentrantLock>();
- private Worker worker;
- private ReaderProvider readerProvider;
- private BackendQueueProcessorFactory backendQueueProcessorFactory;
-
- public BackendQueueProcessorFactory getBackendQueueProcessorFactory() {
- return backendQueueProcessorFactory;
- }
-
- public void setBackendQueueProcessorFactory(BackendQueueProcessorFactory backendQueueProcessorFactory) {
- this.backendQueueProcessorFactory = backendQueueProcessorFactory;
- }
-
- public SearchFactory(Configuration cfg) {
- //yuk
- ReflectionManager reflectionManager = getReflectionManager( cfg );
-
- Class analyzerClass;
- String analyzerClassName = cfg.getProperty( Environment.ANALYZER_CLASS );
- if ( analyzerClassName != null ) {
- try {
- analyzerClass = ReflectHelper.classForName( analyzerClassName );
- }
- catch (Exception e) {
- throw new SearchException(
- "Lucene analyzer class '" + analyzerClassName + "' defined in property '" + Environment.ANALYZER_CLASS + "' could not be found.",
- e
- );
- }
- }
- else {
- analyzerClass = StandardAnalyzer.class;
- }
- // Initialize analyzer
- Analyzer analyzer;
- try {
- analyzer = (Analyzer) analyzerClass.newInstance();
- }
- catch (ClassCastException e) {
- throw new SearchException(
- "Lucene analyzer does not implement " + Analyzer.class.getName() + ": " + analyzerClassName
- );
- }
- catch (Exception e) {
- throw new SearchException( "Failed to instantiate lucene analyzer with type " + analyzerClassName );
- }
-
- Iterator iter = cfg.getClassMappings();
- DirectoryProviderFactory factory = new DirectoryProviderFactory();
- while ( iter.hasNext() ) {
- PersistentClass clazz = (PersistentClass) iter.next();
- Class<?> mappedClass = clazz.getMappedClass();
- if ( mappedClass != null ) {
- XClass mappedXClass = reflectionManager.toXClass( mappedClass );
- if ( mappedXClass != null && mappedXClass.isAnnotationPresent( Indexed.class ) ) {
- DirectoryProvider provider = factory.createDirectoryProvider( mappedXClass, cfg, this );
- if ( !lockableDirectoryProviders.containsKey( provider ) ) {
- lockableDirectoryProviders.put( provider, new ReentrantLock() );
- }
- final DocumentBuilder<Object> documentBuilder = new DocumentBuilder<Object>(
- mappedXClass, analyzer, provider, reflectionManager
- );
-
- documentBuilders.put( mappedClass, documentBuilder );
- }
- }
- }
- Set<Class> indexedClasses = documentBuilders.keySet();
- for ( DocumentBuilder builder : documentBuilders.values() ) {
- builder.postInitialize( indexedClasses );
- }
- worker = WorkerFactory.createWorker(cfg, this);
- readerProvider = ReaderProviderFactory.createReaderProvider(cfg, this);
- }
-
- //code doesn't have to be multithreaded because SF creation is not.
- //this is not a public API, should really only be used during the SessionFActory building
- public static SearchFactory getSearchFactory(Configuration cfg) {
- WeakHashMap<Configuration, SearchFactory> contextMap = contexts.get();
- if (contextMap == null) {
- contextMap = new WeakHashMap<Configuration, SearchFactory>( 2 );
- contexts.set( contextMap );
- }
- SearchFactory searchFactory = contextMap.get( cfg );
- if ( searchFactory == null) {
- searchFactory = new SearchFactory(cfg);
-
- contextMap.put( cfg, searchFactory );
- }
- return searchFactory;
- }
-
-
- public Map<Class, DocumentBuilder<Object>> getDocumentBuilders() {
- return documentBuilders;
- }
-
- public Map<DirectoryProvider, ReentrantLock> getLockableDirectoryProviders() {
- return lockableDirectoryProviders;
- }
-
- public Worker getWorker() {
- return worker;
- }
-
- public ReaderProvider getReaderProvider() {
- return readerProvider;
- }
-
- //not happy about having it as a helper class but I don't want cfg to be associated with the SearchFactory
- public static ReflectionManager getReflectionManager(Configuration cfg) {
- ReflectionManager reflectionManager;
- try {
- //TODO introduce a ReflectionManagerHolder interface to avoid reflection
- //I want to avoid hard link between HAN and Validator for usch a simple need
- //reuse the existing reflectionManager one when possible
- reflectionManager =
- (ReflectionManager) cfg.getClass().getMethod( "getReflectionManager" ).invoke( cfg );
-
- }
- catch (Exception e) {
- reflectionManager = new JavaReflectionManager();
- }
- return reflectionManager;
- }
-
- public DirectoryProvider getDirectoryProvider(Class entity) {
- DocumentBuilder<Object> documentBuilder = getDocumentBuilders().get( entity );
- return documentBuilder == null ? null : documentBuilder.getDirectoryProvider();
- }
-}
Added: trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java (rev 0)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -0,0 +1,23 @@
+//$Id: $
+package org.hibernate.search;
+
+import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.store.DirectoryProvider;
+
+/**
+ * Provide application wide operations as well as access to the underlying Lucene resources.
+ * @author Emmanuel Bernard
+ */
+public interface SearchFactory {
+ /**
+ * Provide the configured readerProvider strategy,
+ * hence access to a Lucene IndexReader
+ */
+ ReaderProvider getReaderProvider();
+
+ /**
+ * Provide access to the DirectoryProvider (hence the Lucene Directory)
+ * for a given entity
+ */
+ DirectoryProvider getDirectoryProvider(Class entity);
+}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -10,7 +10,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.0.0.Beta2";
+ public static final String VERSION = "3.0.0.Beta3SNAPSHOT" + new Date();
private static Log log = LogFactory.getLog( Version.class );
static {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,7 +4,7 @@
import java.util.Properties;
import java.util.List;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Build stateful backend processor
@@ -14,7 +14,7 @@
* @author Emmanuel Bernard
*/
public interface BackendQueueProcessorFactory {
- void initialize(Properties props, SearchFactory searchFactory);
+ void initialize(Properties props, SearchFactoryImplementor searchFactory);
/**
* Return a runnable implementation responsible for processing the queue to a given backend
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -5,7 +5,7 @@
import java.io.Serializable;
import org.hibernate.event.EventSource;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Perform work for a given session. This implementation has to be multi threaded
@@ -14,5 +14,5 @@
public interface Worker {
void performWork(Object entity, Serializable id, WorkType workType, EventSource session);
- void initialize(Properties props, SearchFactory searchFactory);
+ void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor);
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -7,7 +7,7 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.backend.impl.TransactionalWorker;
import org.hibernate.util.ReflectHelper;
import org.hibernate.util.StringHelper;
@@ -30,7 +30,7 @@
return workerProperties;
}
- public static Worker createWorker(Configuration cfg, SearchFactory searchFactory) {
+ public static Worker createWorker(Configuration cfg, SearchFactoryImplementor searchFactoryImplementor) {
Properties props = getProperties( cfg );
String impl = props.getProperty( Environment.WORKER_SCOPE );
Worker worker;
@@ -55,7 +55,7 @@
throw new SearchException("Unable to instanciate worker class: " + impl, e );
}
}
- worker.initialize( props, searchFactory );
+ worker.initialize( props, searchFactoryImplementor );
return worker;
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -13,7 +13,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.hibernate.search.engine.DocumentBuilder;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.SearchException;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.annotations.common.AssertionFailure;
@@ -35,20 +35,20 @@
private Map<DirectoryProvider, IndexReader> readers = new HashMap<DirectoryProvider, IndexReader>();
private Map<DirectoryProvider, IndexWriter> writers = new HashMap<DirectoryProvider, IndexWriter>();
private List<DirectoryProvider> lockedProviders = new ArrayList<DirectoryProvider>();
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
- public Workspace(SearchFactory searchFactory) {
- this.searchFactory = searchFactory;
+ public Workspace(SearchFactoryImplementor searchFactoryImplementor) {
+ this.searchFactoryImplementor = searchFactoryImplementor;
}
public DocumentBuilder getDocumentBuilder(Class entity) {
- return searchFactory.getDocumentBuilders().get( entity );
+ return searchFactoryImplementor.getDocumentBuilders().get( entity );
}
public IndexReader getIndexReader(Class entity) {
//TODO NPEs
- DirectoryProvider provider = searchFactory.getDirectoryProvider( entity );
+ DirectoryProvider provider = searchFactoryImplementor.getDirectoryProvider( entity );
//one cannot access a reader for update after a writer has been accessed
if ( writers.containsKey( provider ) )
throw new AssertionFailure("Tries to read for update a index while a writer is accessed" + entity);
@@ -66,7 +66,7 @@
}
public IndexWriter getIndexWriter(Class entity) {
- DirectoryProvider provider = searchFactory.getDirectoryProvider( entity );
+ DirectoryProvider provider = searchFactoryImplementor.getDirectoryProvider( entity );
//one has to close a reader for update before a writer is accessed
IndexReader reader = readers.get( provider );
if ( reader != null ) {
@@ -83,7 +83,7 @@
lockProvider( provider );
try {
writer = new IndexWriter(
- provider.getDirectory(), searchFactory.getDocumentBuilders().get( entity ).getAnalyzer(), false
+ provider.getDirectory(), searchFactoryImplementor.getDocumentBuilders().get( entity ).getAnalyzer(), false
); //have been created at init time
writers.put( provider, writer );
}
@@ -95,7 +95,7 @@
private void lockProvider(DirectoryProvider provider) {
//make sure to use a semaphore
- ReentrantLock lock = searchFactory.getLockableDirectoryProviders().get( provider );
+ ReentrantLock lock = searchFactoryImplementor.getLockableDirectoryProviders().get( provider );
//of course a given thread cannot have a race cond with itself
if ( !lock.isHeldByCurrentThread() ) {
lock.lock();
@@ -133,7 +133,7 @@
}
}
for ( DirectoryProvider provider : lockedProviders ) {
- searchFactory.getLockableDirectoryProviders().get( provider ).unlock();
+ searchFactoryImplementor.getLockableDirectoryProviders().get( provider ).unlock();
}
readers.clear();
writers.clear();
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -15,7 +15,6 @@
import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.QueueingProcessor;
@@ -25,6 +24,7 @@
import org.hibernate.search.backend.impl.jms.JMSBackendQueueProcessorFactory;
import org.hibernate.search.backend.impl.lucene.LuceneBackendQueueProcessorFactory;
import org.hibernate.search.engine.DocumentBuilder;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Batch work until #performWorks is called.
@@ -36,11 +36,11 @@
private boolean sync;
private ExecutorService executorService;
private BackendQueueProcessorFactory backendQueueProcessorFactory;
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
- public BatchedQueueingProcessor(SearchFactory searchFactory,
+ public BatchedQueueingProcessor(SearchFactoryImplementor searchFactoryImplementor,
Properties properties) {
- this.searchFactory = searchFactory;
+ this.searchFactoryImplementor = searchFactoryImplementor;
//default to sync if none defined
this.sync = !"async".equalsIgnoreCase( properties.getProperty( Environment.WORKER_EXECUTION ) );
@@ -88,8 +88,8 @@
throw new SearchException( "Unable to instanciate processor class: " + backend, e );
}
}
- backendQueueProcessorFactory.initialize( properties, searchFactory );
- searchFactory.setBackendQueueProcessorFactory( backendQueueProcessorFactory );
+ backendQueueProcessorFactory.initialize( properties, searchFactoryImplementor );
+ searchFactoryImplementor.setBackendQueueProcessorFactory( backendQueueProcessorFactory );
}
public void add(Object entity, Serializable id, WorkType workType, WorkQueue workQueue) {
@@ -107,9 +107,9 @@
Work work = queue.get( i );
queue.set( i, null ); // help GC and avoid 2 loaded queues in memory
Class entityClass = Hibernate.getClass( work.getEntity() );
- DocumentBuilder<Object> builder = searchFactory.getDocumentBuilders().get( entityClass );
+ DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entityClass );
if ( builder == null ) return; //or exception?
- builder.addWorkToQueue(work.getEntity(), work.getId(), work.getType(), luceneQueue, searchFactory);
+ builder.addWorkToQueue(work.getEntity(), work.getId(), work.getType(), luceneQueue, searchFactoryImplementor );
}
workQueue.setSealedQueue( luceneQueue );
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -2,18 +2,15 @@
package org.hibernate.search.backend.impl;
import java.util.Properties;
-import java.util.List;
-import java.util.ArrayList;
import java.io.Serializable;
import org.hibernate.search.backend.Worker;
import org.hibernate.search.backend.QueueingProcessor;
import org.hibernate.search.backend.WorkType;
-import org.hibernate.search.backend.Work;
import org.hibernate.search.backend.WorkQueue;
import org.hibernate.search.backend.impl.BatchedQueueingProcessor;
import org.hibernate.search.util.WeakIdentityHashMap;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.event.EventSource;
import org.hibernate.Transaction;
@@ -51,7 +48,7 @@
}
}
- public void initialize(Properties props, SearchFactory searchFactory) {
+ public void initialize(Properties props, SearchFactoryImplementor searchFactory) {
this.queueingProcessor = new BatchedQueueingProcessor( searchFactory, props );
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -12,9 +12,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.util.ContextHelper;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Implement the Hibernate Search controller responsible for processing the
@@ -88,7 +88,7 @@
Runnable processor = null;
try {
- SearchFactory factory = ContextHelper.getSearchFactory( session );
+ SearchFactoryImplementor factory = ContextHelper.getSearchFactory( session );
processor = factory.getBackendQueueProcessorFactory().getProcessor( queue );
}
finally {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -13,7 +13,7 @@
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
@@ -30,7 +30,7 @@
public static final String JMS_CONNECTION_FACTORY = Environment.WORKER_PREFIX + "jms.connection_factory";
public static final String JMS_QUEUE = Environment.WORKER_PREFIX + "jms.queue";
- public void initialize(Properties props, SearchFactory searchFactory) {
+ public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
//TODO proper exception if jms queues and connecitons are not there
this.properties = props;
this.jmsConnectionFactoryName = props.getProperty( JMS_CONNECTION_FACTORY );
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -5,10 +5,10 @@
import java.util.Comparator;
import java.util.List;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.backend.AddLuceneWork;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Apply the operations to Lucene directories
@@ -18,17 +18,17 @@
*/
public class LuceneBackendQueueProcessor implements Runnable {
private List<LuceneWork> queue;
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
- public LuceneBackendQueueProcessor(List<LuceneWork> queue, SearchFactory searchFactory) {
+ public LuceneBackendQueueProcessor(List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor) {
this.queue = queue;
- this.searchFactory = searchFactory;
+ this.searchFactoryImplementor = searchFactoryImplementor;
}
public void run() {
Workspace workspace;
LuceneWorker worker;
- workspace = new Workspace( searchFactory );
+ workspace = new Workspace( searchFactoryImplementor );
worker = new LuceneWorker( workspace );
try {
deadlockFreeQueue(queue, workspace);
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,21 +4,21 @@
import java.util.Properties;
import java.util.List;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* @author Emmanuel Bernard
*/
public class LuceneBackendQueueProcessorFactory implements BackendQueueProcessorFactory {
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
- public void initialize(Properties props, SearchFactory searchFactory) {
- this.searchFactory = searchFactory;
+ public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
+ this.searchFactoryImplementor = searchFactoryImplementor;
}
public Runnable getProcessor(List<LuceneWork> queue) {
- return new LuceneBackendQueueProcessor( queue, searchFactory );
+ return new LuceneBackendQueueProcessor( queue, searchFactoryImplementor );
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -10,7 +10,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Arrays;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -28,7 +27,6 @@
import org.hibernate.annotations.common.reflection.XProperty;
import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.annotations.Boost;
import org.hibernate.search.annotations.ContainedIn;
import org.hibernate.search.annotations.DocumentId;
@@ -311,7 +309,7 @@
return value;
}
- public void addWorkToQueue(T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactory searchFactory) {
+ public void addWorkToQueue(T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor) {
Class entityClass = Hibernate.getClass( entity );
//TODO with the caller loop we are in a n^2: optimize it using a HashMap for work recognition
for ( LuceneWork luceneWork : queue) {
@@ -354,11 +352,11 @@
* When the internal object is changed, we apply the {Add|Update}Work on containedIns
*/
if (searchForContainers) {
- processContainedIn(entity, queue, rootPropertiesMetadata, searchFactory);
+ processContainedIn(entity, queue, rootPropertiesMetadata, searchFactoryImplementor);
}
}
- private void processContainedIn(Object instance, List<LuceneWork> queue, PropertiesMetadata metadata, SearchFactory searchFactory) {
+ private void processContainedIn(Object instance, List<LuceneWork> queue, PropertiesMetadata metadata, SearchFactoryImplementor searchFactoryImplementor) {
for ( int i = 0; i < metadata.containedInGetters.size(); i++ ) {
XMember member = metadata.containedInGetters.get( i );
Object value = getMemberValue( instance, member );
@@ -368,9 +366,9 @@
for ( Object arrayValue : (Object[]) value ) {
//highly inneficient but safe wrt the actual targeted class
Class valueClass = Hibernate.getClass( arrayValue );
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( valueClass );
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
if (builder == null) continue;
- processContainedInValue( arrayValue, queue, valueClass, builder, searchFactory );
+ processContainedInValue( arrayValue, queue, valueClass, builder, searchFactoryImplementor );
}
}
else if ( member.isCollection() ) {
@@ -385,16 +383,16 @@
for ( Object collectionValue : collection ) {
//highly inneficient but safe wrt the actual targeted class
Class valueClass = Hibernate.getClass( collectionValue );
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( valueClass );
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
if (builder == null) continue;
- processContainedInValue( collectionValue, queue, valueClass, builder, searchFactory );
+ processContainedInValue( collectionValue, queue, valueClass, builder, searchFactoryImplementor );
}
}
else {
Class valueClass = Hibernate.getClass( value );
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( valueClass );
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
if (builder == null) continue;
- processContainedInValue( value, queue, valueClass, builder, searchFactory );
+ processContainedInValue( value, queue, valueClass, builder, searchFactoryImplementor );
}
}
//an embedded cannot have a useful @ContainedIn (no shared reference)
@@ -402,9 +400,9 @@
}
private void processContainedInValue(Object value, List<LuceneWork> queue, Class valueClass,
- DocumentBuilder builder, SearchFactory searchFactory) {
+ DocumentBuilder builder, SearchFactoryImplementor searchFactoryImplementor) {
Serializable id = (Serializable) builder.getMemberValue( value, builder.idGetter );
- builder.addWorkToQueue( value, id, WorkType.UPDATE, queue, searchFactory );
+ builder.addWorkToQueue( value, id, WorkType.UPDATE, queue, searchFactoryImplementor );
}
public Document getDocument(T instance, Serializable id) {
@@ -537,14 +535,14 @@
}
}
- public static Serializable getDocumentId(SearchFactory searchFactory, Class clazz, Document document) {
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( clazz );
+ public static Serializable getDocumentId(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document) {
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
return (Serializable) builder.getIdBridge().get( builder.getIdKeywordName(), document );
}
- public static Object[] getDocumentFields(SearchFactory searchFactory, Class clazz, Document document, String[] fields) {
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( clazz );
+ public static Object[] getDocumentFields(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document, String[] fields) {
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
final int fieldNbr = fields.length;
Object[] result = new Object[fieldNbr];
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -2,27 +2,26 @@
package org.hibernate.search.engine;
import org.apache.lucene.document.Document;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.EntityInfo;
/**
* @author Emmanuel Bernard
*/
public class DocumentExtractor {
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
private String[] projection;
- public DocumentExtractor(SearchFactory searchFactory, String... projection) {
- this.searchFactory = searchFactory;
+ public DocumentExtractor(SearchFactoryImplementor searchFactoryImplementor, String... projection) {
+ this.searchFactoryImplementor = searchFactoryImplementor;
this.projection = projection;
}
public EntityInfo extract(Document document) {
EntityInfo entityInfo = new EntityInfo();
entityInfo.clazz = DocumentBuilder.getDocumentClass( document );
- entityInfo.id = DocumentBuilder.getDocumentId( searchFactory, entityInfo.clazz, document );
+ entityInfo.id = DocumentBuilder.getDocumentId( searchFactoryImplementor, entityInfo.clazz, document );
if (projection != null && projection.length > 0) {
- entityInfo.projection = DocumentBuilder.getDocumentFields( searchFactory, entityInfo.clazz, document, projection );
+ entityInfo.projection = DocumentBuilder.getDocumentFields( searchFactoryImplementor, entityInfo.clazz, document, projection );
}
//TODO read fields
return entityInfo;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,14 +4,13 @@
import java.util.List;
import org.hibernate.Session;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.EntityInfo;
/**
* @author Emmanuel Bernard
*/
public interface Loader {
- void init(Session session, SearchFactory searchFactory);
+ void init(Session session, SearchFactoryImplementor searchFactoryImplementor);
Object load(EntityInfo entityInfo);
List load(EntityInfo... entityInfos);
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -9,7 +9,6 @@
import org.hibernate.Hibernate;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.Session;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.EntityInfo;
/**
@@ -19,7 +18,7 @@
private static final Log log = LogFactory.getLog( ObjectLoader.class );
private Session session;
- public void init(Session session, SearchFactory searchFactory) {
+ public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
this.session = session;
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -5,14 +5,13 @@
import java.util.List;
import org.hibernate.Session;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.EntityInfo;
/**
* @author Emmanuel Bernard
*/
public class ProjectionLoader implements Loader {
- public void init(Session session, SearchFactory searchFactory) {
+ public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
}
public Object load(EntityInfo entityInfo) {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,15 +4,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Hibernate;
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.criterion.Disjunction;
import org.hibernate.criterion.Restrictions;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.EntityInfo;
/**
@@ -24,12 +21,12 @@
private Session session;
private Class entityType;
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
private Criteria criteria;
- public void init(Session session, SearchFactory searchFactory) {
+ public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
this.session = session;
- this.searchFactory = searchFactory;
+ this.searchFactoryImplementor = searchFactoryImplementor;
}
public void setEntityType(Class entityType) {
@@ -48,7 +45,7 @@
if (entityType == null) throw new AssertionFailure("EntityType not defined");
if (criteria == null) criteria = session.createCriteria( entityType );
- DocumentBuilder builder = searchFactory.getDocumentBuilders().get( entityType );
+ DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( entityType );
String idName = builder.getIdentifierName();
int loop = maxResults / MAX_IN_CLAUSE;
boolean exact = maxResults % MAX_IN_CLAUSE == 0;
Added: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java (rev 0)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -0,0 +1,25 @@
+//$Id: $
+package org.hibernate.search.engine;
+
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.hibernate.search.SearchFactory;
+import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.search.backend.BackendQueueProcessorFactory;
+import org.hibernate.search.backend.Worker;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface SearchFactoryImplementor extends SearchFactory {
+ BackendQueueProcessorFactory getBackendQueueProcessorFactory();
+
+ void setBackendQueueProcessorFactory(BackendQueueProcessorFactory backendQueueProcessorFactory);
+
+ Map<Class, DocumentBuilder<Object>> getDocumentBuilders();
+
+ Map<DirectoryProvider, ReentrantLock> getLockableDirectoryProviders();
+
+ Worker getWorker();
+}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -16,7 +16,8 @@
import org.hibernate.event.PostUpdateEventListener;
import org.hibernate.search.backend.WorkType;
import org.hibernate.search.engine.DocumentBuilder;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.impl.SearchFactoryImpl;
/**
* This listener supports setting a parent directory for all generated index files.
@@ -34,19 +35,19 @@
private static final Log log = LogFactory.getLog( FullTextIndexEventListener.class );
private boolean used;
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactoryImplementor;
public void initialize(Configuration cfg) {
- searchFactory = SearchFactory.getSearchFactory( cfg );
- used = searchFactory.getDocumentBuilders().size() != 0;
+ searchFactoryImplementor = SearchFactoryImpl.getSearchFactory( cfg );
+ used = searchFactoryImplementor.getDocumentBuilders().size() != 0;
}
- public SearchFactory getSearchFactory() {
- return searchFactory;
+ public SearchFactoryImplementor getSearchFactoryImplementor() {
+ return searchFactoryImplementor;
}
public void onPostDelete(PostDeleteEvent event) {
- if ( used && searchFactory.getDocumentBuilders().containsKey( event.getEntity().getClass() ) ) {
+ if ( used && searchFactoryImplementor.getDocumentBuilders().containsKey( event.getEntity().getClass() ) ) {
processWork( event.getEntity(), event.getId(), WorkType.DELETE, event );
}
}
@@ -54,7 +55,7 @@
public void onPostInsert(PostInsertEvent event) {
if (used) {
final Object entity = event.getEntity();
- DocumentBuilder<Object> builder = searchFactory.getDocumentBuilders().get( entity.getClass() );
+ DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entity.getClass() );
//not strictly necessary but a smal optimization
if ( builder != null ) {
Serializable id = event.getId();
@@ -67,7 +68,7 @@
if (used) {
final Object entity = event.getEntity();
//not strictly necessary but a smal optimization
- DocumentBuilder<Object> builder = searchFactory.getDocumentBuilders().get( entity.getClass() );
+ DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entity.getClass() );
if ( builder != null ) {
Serializable id = event.getId();
processWork( entity, id, WorkType.UPDATE, event );
@@ -76,6 +77,6 @@
}
private void processWork(Object entity, Serializable id, WorkType workType, AbstractEvent event) {
- searchFactory.getWorker().performWork( entity, id, workType, event.getSession() );
+ searchFactoryImplementor.getWorker().performWork( entity, id, workType, event.getSession() );
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -41,10 +41,11 @@
import org.hibernate.loader.custom.CustomQuery;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.search.FullTextSession;
+import org.hibernate.search.FullTextQuery;
import org.hibernate.search.SearchFactory;
-import org.hibernate.search.FullTextQuery;
import org.hibernate.search.backend.WorkType;
import org.hibernate.search.engine.DocumentBuilder;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.query.FullTextQueryImpl;
import org.hibernate.search.util.ContextHelper;
import org.hibernate.stat.SessionStatistics;
@@ -59,6 +60,7 @@
private final Session session;
private final EventSource eventSource;
private final SessionImplementor sessionImplementor;
+ private SearchFactoryImplementor searchFactory;
public FullTextSessionImpl(org.hibernate.Session session) {
this.session = (Session) session;
@@ -87,12 +89,12 @@
if (entity == null) return;
Class clazz = Hibernate.getClass( entity );
//TODO cache that at the FTSession level
- SearchFactory searchFactory = ContextHelper.getSearchFactory( session );
+ SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactory( session );
//not strictly necessary but a small optimization
- DocumentBuilder<Object> builder = searchFactory.getDocumentBuilders().get( clazz );
+ DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
if ( builder != null ) {
Serializable id = session.getIdentifier( entity );
- searchFactory.getWorker().performWork( entity, id, WorkType.UPDATE, eventSource );
+ searchFactoryImplementor.getWorker().performWork( entity, id, WorkType.UPDATE, eventSource );
}
//TODO
//need to add elements in a queue kept at the Session level
@@ -103,6 +105,13 @@
// this is an open discussion
}
+ public SearchFactory getSearchFactory() {
+ if (searchFactory == null) {
+ searchFactory = ContextHelper.getSearchFactory( session );
+ }
+ return searchFactory;
+ }
+
public Query createSQLQuery(String sql, String returnAlias, Class returnClass) {
return session.createSQLQuery( sql, returnAlias, returnClass );
}
Copied: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java (from rev 11625, trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java)
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java (rev 0)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -0,0 +1,177 @@
+//$Id$
+package org.hibernate.search.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.backend.BackendQueueProcessorFactory;
+import org.hibernate.search.backend.Worker;
+import org.hibernate.search.backend.WorkerFactory;
+import org.hibernate.search.engine.DocumentBuilder;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.reader.ReaderProviderFactory;
+import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.search.store.DirectoryProviderFactory;
+import org.hibernate.search.SearchFactory;
+import org.hibernate.search.Version;
+import org.hibernate.search.Environment;
+import org.hibernate.search.SearchException;
+import org.hibernate.util.ReflectHelper;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class SearchFactoryImpl implements SearchFactoryImplementor {
+ private static ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>> contexts =
+ new ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>>();
+ static {
+ Version.touch();
+ }
+ private Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
+ //keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
+ private Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders =
+ new HashMap<DirectoryProvider, ReentrantLock>();
+ private Worker worker;
+ private ReaderProvider readerProvider;
+ private BackendQueueProcessorFactory backendQueueProcessorFactory;
+
+ public BackendQueueProcessorFactory getBackendQueueProcessorFactory() {
+ return backendQueueProcessorFactory;
+ }
+
+ public void setBackendQueueProcessorFactory(BackendQueueProcessorFactory backendQueueProcessorFactory) {
+ this.backendQueueProcessorFactory = backendQueueProcessorFactory;
+ }
+
+ public SearchFactoryImpl(Configuration cfg) {
+ //yuk
+ ReflectionManager reflectionManager = getReflectionManager( cfg );
+
+ Class analyzerClass;
+ String analyzerClassName = cfg.getProperty( Environment.ANALYZER_CLASS );
+ if ( analyzerClassName != null ) {
+ try {
+ analyzerClass = ReflectHelper.classForName( analyzerClassName );
+ }
+ catch (Exception e) {
+ throw new SearchException(
+ "Lucene analyzer class '" + analyzerClassName + "' defined in property '" + Environment.ANALYZER_CLASS + "' could not be found.",
+ e
+ );
+ }
+ }
+ else {
+ analyzerClass = StandardAnalyzer.class;
+ }
+ // Initialize analyzer
+ Analyzer analyzer;
+ try {
+ analyzer = (Analyzer) analyzerClass.newInstance();
+ }
+ catch (ClassCastException e) {
+ throw new SearchException(
+ "Lucene analyzer does not implement " + Analyzer.class.getName() + ": " + analyzerClassName
+ );
+ }
+ catch (Exception e) {
+ throw new SearchException( "Failed to instantiate lucene analyzer with type " + analyzerClassName );
+ }
+
+ Iterator iter = cfg.getClassMappings();
+ DirectoryProviderFactory factory = new DirectoryProviderFactory();
+ while ( iter.hasNext() ) {
+ PersistentClass clazz = (PersistentClass) iter.next();
+ Class<?> mappedClass = clazz.getMappedClass();
+ if ( mappedClass != null ) {
+ XClass mappedXClass = reflectionManager.toXClass( mappedClass );
+ if ( mappedXClass != null && mappedXClass.isAnnotationPresent( Indexed.class ) ) {
+ DirectoryProvider provider = factory.createDirectoryProvider( mappedXClass, cfg, this );
+ if ( !lockableDirectoryProviders.containsKey( provider ) ) {
+ lockableDirectoryProviders.put( provider, new ReentrantLock() );
+ }
+ final DocumentBuilder<Object> documentBuilder = new DocumentBuilder<Object>(
+ mappedXClass, analyzer, provider, reflectionManager
+ );
+
+ documentBuilders.put( mappedClass, documentBuilder );
+ }
+ }
+ }
+ Set<Class> indexedClasses = documentBuilders.keySet();
+ for ( DocumentBuilder builder : documentBuilders.values() ) {
+ builder.postInitialize( indexedClasses );
+ }
+ worker = WorkerFactory.createWorker(cfg, this);
+ readerProvider = ReaderProviderFactory.createReaderProvider(cfg, this);
+ }
+
+ //code doesn't have to be multithreaded because SF creation is not.
+ //this is not a public API, should really only be used during the SessionFActory building
+ //FIXME this is ugly, impl.staticmethod, fix that
+ public static SearchFactoryImpl getSearchFactory(Configuration cfg) {
+ WeakHashMap<Configuration, SearchFactoryImpl> contextMap = contexts.get();
+ if (contextMap == null) {
+ contextMap = new WeakHashMap<Configuration, SearchFactoryImpl>( 2 );
+ contexts.set( contextMap );
+ }
+ SearchFactoryImpl searchFactory = contextMap.get( cfg );
+ if ( searchFactory == null) {
+ searchFactory = new SearchFactoryImpl(cfg);
+
+ contextMap.put( cfg, searchFactory );
+ }
+ return searchFactory;
+ }
+
+
+ public Map<Class, DocumentBuilder<Object>> getDocumentBuilders() {
+ return documentBuilders;
+ }
+
+ public Map<DirectoryProvider, ReentrantLock> getLockableDirectoryProviders() {
+ return lockableDirectoryProviders;
+ }
+
+ public Worker getWorker() {
+ return worker;
+ }
+
+ public ReaderProvider getReaderProvider() {
+ return readerProvider;
+ }
+
+ //not happy about having it as a helper class but I don't want cfg to be associated with the SearchFactory
+ public static ReflectionManager getReflectionManager(Configuration cfg) {
+ ReflectionManager reflectionManager;
+ try {
+ //TODO introduce a ReflectionManagerHolder interface to avoid reflection
+ //I want to avoid hard link between HAN and Validator for usch a simple need
+ //reuse the existing reflectionManager one when possible
+ reflectionManager =
+ (ReflectionManager) cfg.getClass().getMethod( "getReflectionManager" ).invoke( cfg );
+
+ }
+ catch (Exception e) {
+ reflectionManager = new JavaReflectionManager();
+ }
+ return reflectionManager;
+ }
+
+ public DirectoryProvider getDirectoryProvider(Class entity) {
+ DocumentBuilder<Object> documentBuilder = getDocumentBuilders().get( entity );
+ return documentBuilder == null ? null : documentBuilder.getDirectoryProvider();
+ }
+}
Property changes on: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -35,7 +35,7 @@
import org.hibernate.impl.CriteriaImpl;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.impl.SearchFactoryImpl;
import org.hibernate.search.engine.DocumentBuilder;
import org.hibernate.search.engine.DocumentExtractor;
import org.hibernate.search.engine.EntityInfo;
@@ -43,6 +43,7 @@
import org.hibernate.search.engine.ObjectLoader;
import org.hibernate.search.engine.ProjectionLoader;
import org.hibernate.search.engine.QueryLoader;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.util.ContextHelper;
@@ -92,9 +93,9 @@
//user stop using it
//scrollable is better in this area
- SearchFactory searchFactory = ContextHelper.getSearchFactoryBySFI( session );
+ SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactoryBySFI( session );
//find the directories
- IndexSearcher searcher = buildSearcher( searchFactory );
+ IndexSearcher searcher = buildSearcher( searchFactoryImplementor );
if ( searcher == null ) {
return new IteratorImpl( new ArrayList<EntityInfo>(0), noLoader );
}
@@ -105,13 +106,13 @@
Session sess = (Session) this.session;
List<EntityInfo> entityInfos = new ArrayList<EntityInfo>( max - first + 1 );
- DocumentExtractor extractor = new DocumentExtractor( searchFactory, indexProjection );
+ DocumentExtractor extractor = new DocumentExtractor( searchFactoryImplementor, indexProjection );
for ( int index = first; index <= max; index++ ) {
//TODO use indexSearcher.getIndexReader().document( hits.id(index), FieldSelector(indexProjection) );
Document document = hits.doc( index );
entityInfos.add( extractor.extract( document ) );
}
- Loader loader = getLoader(sess, searchFactory);
+ Loader loader = getLoader(sess, searchFactoryImplementor);
return new IteratorImpl( entityInfos, loader );
}
catch (IOException e) {
@@ -119,7 +120,7 @@
}
finally {
try {
- searchFactory.getReaderProvider().closeReader( searcher.getIndexReader() );
+ searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() );
}
catch( SearchException e ) {
log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e );
@@ -127,10 +128,10 @@
}
}
- private Loader getLoader(Session session, SearchFactory searchFactory) {
+ private Loader getLoader(Session session, SearchFactoryImplementor searchFactoryImplementor) {
if ( indexProjection != null) {
ProjectionLoader loader = new ProjectionLoader();
- loader.init( session, searchFactory );
+ loader.init( session, searchFactoryImplementor );
return loader;
}
if (criteria != null) {
@@ -151,27 +152,27 @@
}
}
QueryLoader loader = new QueryLoader();
- loader.init( session, searchFactory );
+ loader.init( session, searchFactoryImplementor );
loader.setEntityType( classes[0] );
loader.setCriteria(criteria);
return loader;
}
else if (classes.length == 1) {
QueryLoader loader = new QueryLoader();
- loader.init( session, searchFactory );
+ loader.init( session, searchFactoryImplementor );
loader.setEntityType( classes[0] );
return loader;
}
else {
final ObjectLoader objectLoader = new ObjectLoader();
- objectLoader.init( session, searchFactory );
+ objectLoader.init( session, searchFactoryImplementor );
return objectLoader;
}
}
public ScrollableResults scroll() throws HibernateException {
//keep the searcher open until the resultset is closed
- SearchFactory searchFactory = ContextHelper.getSearchFactoryBySFI( session );
+ SearchFactoryImplementor searchFactory = ContextHelper.getSearchFactoryBySFI( session );
//find the directories
IndexSearcher searcher = buildSearcher( searchFactory );
@@ -203,9 +204,9 @@
}
public List list() throws HibernateException {
- SearchFactory searchFactory = ContextHelper.getSearchFactoryBySFI( session );
+ SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactoryBySFI( session );
//find the directories
- IndexSearcher searcher = buildSearcher( searchFactory );
+ IndexSearcher searcher = buildSearcher( searchFactoryImplementor );
if (searcher == null) return new ArrayList(0);
Hits hits;
try {
@@ -214,12 +215,12 @@
int max = max( first, hits );
Session sess = (Session) this.session;
List<EntityInfo> infos = new ArrayList<EntityInfo>( max - first + 1 );
- DocumentExtractor extractor = new DocumentExtractor( searchFactory, indexProjection );
+ DocumentExtractor extractor = new DocumentExtractor( searchFactoryImplementor, indexProjection );
for ( int index = first; index <= max; index++ ) {
Document document = hits.doc( index );
infos.add( extractor.extract( document ) );
}
- Loader loader = getLoader( sess, searchFactory );
+ Loader loader = getLoader( sess, searchFactoryImplementor );
return loader.load( infos.toArray( new EntityInfo[infos.size()]) );
}
catch (IOException e) {
@@ -227,7 +228,7 @@
}
finally {
try {
- searchFactory.getReaderProvider().closeReader( searcher.getIndexReader() );
+ searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() );
}
catch (SearchException e) {
log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e );
@@ -296,8 +297,8 @@
* can return null
* TODO change classesAndSubclasses by side effect, which is a mismatch with the Searcher return, fix that.
*/
- private IndexSearcher buildSearcher(SearchFactory searchFactory) {
- Map<Class, DocumentBuilder<Object>> builders = searchFactory.getDocumentBuilders();
+ private IndexSearcher buildSearcher(SearchFactoryImplementor searchFactoryImplementor) {
+ Map<Class, DocumentBuilder<Object>> builders = searchFactoryImplementor.getDocumentBuilders();
List<DirectoryProvider> directories = new ArrayList<DirectoryProvider>();
if ( classes == null || classes.length == 0 ) {
//no class means all classes
@@ -330,7 +331,7 @@
//set up the searcher
final DirectoryProvider[] directoryProviders = directories.toArray( new DirectoryProvider[directories.size()] );
- return new IndexSearcher( searchFactory.getReaderProvider().openReader( directoryProviders ) );
+ return new IndexSearcher( searchFactoryImplementor.getReaderProvider().openReader( directoryProviders ) );
}
private void setResultSize(Hits hits) {
@@ -341,8 +342,8 @@
public int getResultSize() {
if (resultSize == null) {
//get result size without object initialization
- SearchFactory searchFactory = ContextHelper.getSearchFactoryBySFI( session );
- IndexSearcher searcher = buildSearcher( searchFactory );
+ SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactoryBySFI( session );
+ IndexSearcher searcher = buildSearcher( searchFactoryImplementor );
if (searcher == null) {
resultSize = 0;
}
@@ -358,7 +359,7 @@
finally {
//searcher cannot be null
try {
- searchFactory.getReaderProvider().closeReader( searcher.getIndexReader() );
+ searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() );
}
catch( SearchException e ) {
log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e );
@@ -407,7 +408,7 @@
}
private static Loader noLoader = new Loader() {
- public void init(Session session, SearchFactory searchFactory) {
+ public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
}
public Object load(EntityInfo entityInfo) {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -6,7 +6,7 @@
import org.apache.lucene.index.IndexReader;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
import static org.hibernate.search.reader.ReaderProviderHelper.clean;
import org.hibernate.search.store.DirectoryProvider;
@@ -48,6 +48,6 @@
}
}
- public void initialize(Properties props, SearchFactory searchFactory) {
+ public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,8 +4,8 @@
import java.util.Properties;
import org.apache.lucene.index.IndexReader;
-import org.hibernate.search.SearchFactory;
import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Responsible for providing and managing the lifecycle of a read only reader
@@ -30,5 +30,5 @@
*/
void closeReader(IndexReader reader);
- void initialize(Properties props, SearchFactory searchFactory);
+ void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor);
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -7,7 +7,7 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.util.ReflectHelper;
import org.hibernate.util.StringHelper;
@@ -28,7 +28,7 @@
return workerProperties;
}
- public static ReaderProvider createReaderProvider(Configuration cfg, SearchFactory searchFactory) {
+ public static ReaderProvider createReaderProvider(Configuration cfg, SearchFactoryImplementor searchFactoryImplementor) {
Properties props = getProperties( cfg );
String impl = props.getProperty( Environment.READER_STRATEGY );
ReaderProvider readerProvider;
@@ -57,7 +57,7 @@
throw new SearchException( "Unable to instanciate readerProvider class: " + impl, e );
}
}
- readerProvider.initialize( props, searchFactory );
+ readerProvider.initialize( props, searchFactoryImplementor );
return readerProvider;
}
}
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -17,7 +17,7 @@
import org.apache.lucene.index.MultiReader;
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.SearchException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
import static org.hibernate.search.reader.ReaderProviderHelper.clean;
import org.hibernate.search.store.DirectoryProvider;
@@ -284,7 +284,7 @@
}
}
- public void initialize(Properties props, SearchFactory searchFactory) {
+ public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
if ( subReadersField == null ) {
try {
subReadersField = MultiReader.class.getDeclaredField( "subReaders" );
@@ -294,7 +294,7 @@
throw new SearchException( "Incompatible version of Lucene: MultiReader.subReaders not accessible", e );
}
}
- Set<DirectoryProvider> providers = searchFactory.getLockableDirectoryProviders().keySet();
+ Set<DirectoryProvider> providers = searchFactoryImplementor.getLockableDirectoryProviders().keySet();
perDirectoryProviderManipulationLocks = new HashMap<DirectoryProvider, Lock>( providers.size() );
for (DirectoryProvider dp : providers) {
perDirectoryProviderManipulationLocks.put( dp, new ReentrantLock() );
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -4,7 +4,7 @@
import java.util.Properties;
import org.apache.lucene.store.Directory;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
@@ -22,7 +22,7 @@
/**
* get the information to initialize the directory and build its hashCode
*/
- void initialize(String directoryProviderName, Properties properties, SearchFactory searchFactory);
+ void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor);
/**
* Returns an initialized Lucene Directory. This method call <b>must</b> be threadsafe
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -9,7 +9,8 @@
import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.impl.SearchFactoryImpl;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
@@ -40,7 +41,7 @@
private static String DEFAULT_DIRECTORY_PROVIDER = FSDirectoryProvider.class.getName();
//TODO for the public?
- public DirectoryProvider<?> createDirectoryProvider(XClass entity, Configuration cfg, SearchFactory searchFactory) {
+ public DirectoryProvider<?> createDirectoryProvider(XClass entity, Configuration cfg, SearchFactoryImplementor searchFactoryImplementor) {
//get properties
String directoryProviderName = getDirectoryProviderName( entity, cfg );
Properties indexProps = getDirectoryProperties( cfg, directoryProviderName );
@@ -62,7 +63,7 @@
throw new HibernateException( "Unable to instanciate directory provider: " + className, e );
}
try {
- provider.initialize( directoryProviderName, indexProps, searchFactory );
+ provider.initialize( directoryProviderName, indexProps, searchFactoryImplementor );
}
catch (Exception e) {
throw new HibernateException( "Unable to initialize: " + directoryProviderName, e);
@@ -98,7 +99,7 @@
private static String getDirectoryProviderName(XClass clazz, Configuration cfg) {
//yuk
- ReflectionManager reflectionManager = SearchFactory.getReflectionManager(cfg);
+ ReflectionManager reflectionManager = SearchFactoryImpl.getReflectionManager(cfg);
//get the most specialized (ie subclass > superclass) non default index name
//if none extract the name from the most generic (superclass > subclass) @Indexed class in the hierarchy
//FIXME I'm inclined to get rid of the default value
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -12,7 +12,7 @@
import org.apache.lucene.store.FSDirectory;
import org.hibernate.HibernateException;
import org.hibernate.search.util.DirectoryProviderHelper;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Use a Lucene FSDirectory
@@ -27,7 +27,7 @@
private static Log log = LogFactory.getLog( FSDirectoryProvider.class );
private String indexName;
- public void initialize(String directoryProviderName, Properties properties, SearchFactory searchFactory) {
+ public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
File indexDir = DirectoryProviderHelper.determineIndexDir( directoryProviderName, properties );
try {
boolean create = !indexDir.exists();
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -17,7 +17,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.search.util.DirectoryProviderHelper;
import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.HibernateException;
/**
@@ -37,9 +37,9 @@
private int current;
private String indexName;
private Timer timer;
- private SearchFactory searchFactory;
+ private SearchFactoryImplementor searchFactory;
- public void initialize(String directoryProviderName, Properties properties, SearchFactory searchFactory) {
+ public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
//source guessing
String source = DirectoryProviderHelper.getSourceDirectory( "sourceBase", "source", directoryProviderName, properties );
if ( source == null)
@@ -90,7 +90,7 @@
timer = new Timer(true); //daemon thread, the copy algorithm is robust
TimerTask task = new FSMasterDirectoryProvider.TriggerTask(indexName, source, this );
timer.scheduleAtFixedRate( task, period, period );
- this.searchFactory = searchFactory;
+ this.searchFactory = searchFactoryImplementor;
}
public FSDirectory getDirectory() {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -18,7 +18,7 @@
import org.hibernate.AssertionFailure;
import org.hibernate.search.util.FileHelper;
import org.hibernate.search.util.DirectoryProviderHelper;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* File based directory provider that takes care of geting a version of the index
@@ -39,7 +39,7 @@
private String indexName;
private Timer timer;
- public void initialize(String directoryProviderName, Properties properties, SearchFactory searchFactory) {
+ public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
//source guessing
String source = DirectoryProviderHelper.getSourceDirectory( "sourceBase", "source", directoryProviderName, properties );
if (source == null)
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -8,7 +8,7 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
import org.hibernate.HibernateException;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* Use a Lucene RAMDirectory
@@ -21,7 +21,7 @@
private RAMDirectory directory;
private String indexName;
- public void initialize(String directoryProviderName, Properties properties, SearchFactory searchFactory) {
+ public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
indexName = directoryProviderName;
directory = new RAMDirectory();
try {
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -6,19 +6,19 @@
import org.hibernate.engine.SessionImplementor;
import org.hibernate.event.PostInsertEventListener;
import org.hibernate.search.event.FullTextIndexEventListener;
-import org.hibernate.search.SearchFactory;
+import org.hibernate.search.engine.SearchFactoryImplementor;
/**
* @author Emmanuel Bernard
*/
public abstract class ContextHelper {
- public static SearchFactory getSearchFactory(Session session) {
+ public static SearchFactoryImplementor getSearchFactory(Session session) {
return getSearchFactoryBySFI( (SessionImplementor) session );
}
- public static SearchFactory getSearchFactoryBySFI(SessionImplementor session) {
+ public static SearchFactoryImplementor getSearchFactoryBySFI(SessionImplementor session) {
PostInsertEventListener[] listeners = session.getListeners().getPostInsertEventListeners();
FullTextIndexEventListener listener = null;
//FIXME this sucks since we mandante the event listener use
@@ -31,6 +31,6 @@
if ( listener == null ) throw new HibernateException(
"Hibernate Search Event listeners not configured, please check the reference documentation and the " +
"application's hibernate.cfg.xml" );
- return listener.getSearchFactory();
+ return listener.getSearchFactoryImplementor();
}
}
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java 2007-06-05 02:25:56 UTC (rev 11630)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java 2007-06-05 15:48:42 UTC (rev 11631)
@@ -20,7 +20,7 @@
}
protected Directory getDirectory(Class clazz) {
- return getLuceneEventListener().getSearchFactory().getDirectoryProvider( clazz ).getDirectory();
+ return getLuceneEventListener().getSearchFactoryImplementor().getDirectoryProvider( clazz ).getDirectory();
}
private FullTextIndexEventListener getLuceneEventListener() {
18 years, 10 months
- 1
- 0
Hibernate SVN: r11630 - trunk/Hibernate3/code.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-06-04 22:25:56 -0400 (Mon, 04 Jun 2007)
New Revision: 11630
Added:
trunk/Hibernate3/code/pom.xml
Log:
adding missing pom
Added: trunk/Hibernate3/code/pom.xml
===================================================================
--- trunk/Hibernate3/code/pom.xml (rev 0)
+++ trunk/Hibernate3/code/pom.xml 2007-06-05 02:25:56 UTC (rev 11630)
@@ -0,0 +1,122 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-parent</artifactId>
+ <version>3.3.0.beta1</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-code</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Hibernate Core - Code</name>
+ <description>Grouping of Hibernate Core Project code modules</description>
+
+ <modules>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>jbosscache2-module</id>
+ <modules>
+ <module>cache-jbosscache2</module>
+ </modules>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Not really caring about reporting plugin versions; I think this is ok??? -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>@FIXME</tag>
+ <tag>@fixme</tag>
+ <tag>FIXME</tag>
+ <tag>fixme</tag>
+ <tag>@TODO</tag>
+ <tag>@todo</tag>
+ <tag>TODO</tag>
+ <tag>todo</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.4</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
18 years, 10 months
- 1
- 0
Hibernate SVN: r11629 - trunk/HibernateExt/search/src/java/org/hibernate/search/util.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-04 21:03:46 -0400 (Mon, 04 Jun 2007)
New Revision: 11629
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
Log:
HSEARCH-70 create base directory if not there yet
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-05 00:42:32 UTC (rev 11628)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-05 01:03:46 UTC (rev 11629)
@@ -45,6 +45,13 @@
}
else {
File rootDir = new File(root);
+ if ( ! rootDir.exists() ) {
+ rootDir.mkdir();
+ }
+ else if ( ! rootDir.isDirectory() ) {
+ throw new SearchException(rootPropertyName + " is not a directory");
+ }
+ //test it again in case mkdir failed for wrong reasons
if ( rootDir.exists() ) {
File sourceFile = new File(root, relative);
if (! sourceFile.exists() ) sourceFile.mkdir();
@@ -57,7 +64,7 @@
}
}
else {
- throw new SearchException(rootPropertyName + " does not exist");
+ throw new SearchException(rootPropertyName + " does not exist and cannot be created");
}
}
return relative;
18 years, 10 months
- 1
- 0
Hibernate SVN: r11628 - trunk/HibernateExt/search/src/java/org/hibernate/search/store.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-04 20:42:32 -0400 (Mon, 04 Jun 2007)
New Revision: 11628
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
Log:
HSEARCH-68 mark copy threads to daemon, the copy alorithm is robust
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-05 00:00:53 UTC (rev 11627)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-05 00:42:32 UTC (rev 11628)
@@ -87,7 +87,7 @@
catch (IOException e) {
throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
}
- timer = new Timer();
+ timer = new Timer(true); //daemon thread, the copy algorithm is robust
TimerTask task = new FSMasterDirectoryProvider.TriggerTask(indexName, source, this );
timer.scheduleAtFixedRate( task, period, period );
this.searchFactory = searchFactory;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-05 00:00:53 UTC (rev 11627)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-05 00:42:32 UTC (rev 11628)
@@ -116,7 +116,7 @@
catch (IOException e) {
throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
}
- timer = new Timer();
+ timer = new Timer(true); //daemon thread, the copy algorithm is robust
TimerTask task = new TriggerTask(source, indexName);
timer.scheduleAtFixedRate( task, period, period );
}
18 years, 10 months
- 1
- 0
Hibernate SVN: r11627 - in trunk/HibernateExt/search/src: test/org/hibernate/search/test/query and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-04 20:00:53 -0400 (Mon, 04 Jun 2007)
New Revision: 11627
Added:
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Music.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/QueryLoaderTest.java
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
Log:
HSEARCH-66 no longer use setMaxResult
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-04 17:42:10 UTC (rev 11626)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-05 00:00:53 UTC (rev 11627)
@@ -19,7 +19,6 @@
* @author Emmanuel Bernard
*/
public class QueryLoader implements Loader {
- private static final Log log = LogFactory.getLog( QueryLoader.class );
private static final int MAX_IN_CLAUSE = 500;
private static final List EMPTY_LIST = new ArrayList(0);
@@ -66,7 +65,6 @@
disjunction.add( Restrictions.in( idName, ids ) );
}
criteria.add( disjunction );
- criteria.setMaxResults( maxResults ); //is it faster
criteria.list(); //load all objects
//mandatory to keep the same ordering
Added: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Music.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Music.java (rev 0)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Music.java 2007-06-05 00:00:53 UTC (rev 11627)
@@ -0,0 +1,80 @@
+//$Id: $
+package org.hibernate.search.test.query;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.search.annotations.Store;
+
+@Entity
+@Indexed()
+public class Music {
+ protected Long id;
+ protected String title;
+ protected Set<Author> authors = new HashSet<Author>();
+
+ @Id
+ @GeneratedValue
+ @DocumentId
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * @return the singers
+ */
+ @ManyToMany( cascade = CascadeType.ALL,
+ fetch = FetchType.EAGER,
+ targetEntity = Author.class )
+ @IndexedEmbedded( depth = 1 )
+ public Set<Author> getAuthors() {
+ return authors;
+ }
+
+ /**
+ * @param authors the authors to set
+ */
+ public void setAuthors(Set<Author> authors) {
+ this.authors = authors;
+ }
+
+ public void addAuthor(Author author) {
+ this.getAuthors().add( author );
+ }
+
+ /**
+ * @return the title
+ */
+ @Column( name = "title",
+ length = 255,
+ nullable = false )
+ @Field( name = "title",
+ index = Index.TOKENIZED,
+ store = Store.YES )
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * @param title the title to set
+ */
+ public void setTitle(String title) {
+ this.title = title;
+ }
+}
Added: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/QueryLoaderTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/QueryLoaderTest.java (rev 0)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/QueryLoaderTest.java 2007-06-05 00:00:53 UTC (rev 11627)
@@ -0,0 +1,98 @@
+//$Id: $
+package org.hibernate.search.test.query;
+
+import java.util.List;
+
+import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.FullTextQuery;
+import org.hibernate.search.Search;
+import org.hibernate.Transaction;
+import org.hibernate.Session;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.analysis.KeywordAnalyzer;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class
+ QueryLoaderTest extends SearchTestCase {
+
+ public void testWithEagerCollectionLoad() throws Exception
+ {
+ Session sess = openSession();
+ Transaction tx = sess.beginTransaction();
+ Music music = new Music();
+ music.setTitle("Moo Goes The Cow");
+ Author author = new Author();
+ author.setName("Moo Cow");
+ music.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("Another Moo Cow");
+ music.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("A Third Moo Cow");
+ music.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("Random Moo Cow");
+ music.addAuthor(author);
+ sess.persist(author);
+ sess.save(music);
+
+ Music music2 = new Music();
+ music2.setTitle("The Cow Goes Moo");
+ author = new Author();
+ author.setName("Moo Cow The First");
+ music2.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("Moo Cow The Second");
+ music2.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("Moo Cow The Third");
+ music2.addAuthor(author);
+ sess.persist(author);
+ author = new Author();
+ author.setName("Moo Cow The Fourth");
+ music2.addAuthor(author);
+ sess.persist(author);
+ sess.save(music2);
+ tx.commit();
+ sess.clear();
+
+ FullTextSession s = Search.createFullTextSession(sess);
+ tx = s.beginTransaction();
+ QueryParser parser = new QueryParser("title", new KeywordAnalyzer());
+ Query query = parser.parse("title:moo");
+ FullTextQuery hibQuery = s.createFullTextQuery(query, Music.class);
+ List result = hibQuery.list();
+ assertEquals("Should have returned 2 Books", 2, result.size());
+ music = (Music) result.get( 0 );
+ assertEquals("Book 1 should have four authors", 4, music.getAuthors().size());
+ music2 = (Music) result.get( 1 );
+ assertEquals("Book 2 should have four authors", 4, music2.getAuthors().size());
+
+ //cleanup
+ music.getAuthors().clear();
+ music2.getAuthors().clear();
+
+ for (Object o : s.createCriteria( Object.class ).list() ) {
+ s.delete( o );
+ }
+
+ tx.commit();
+ s.close();
+ }
+
+ protected Class[] getMappings() {
+ return new Class[] {
+ Author.class,
+ Music.class
+ };
+ }
+}
18 years, 10 months
- 1
- 0
Hibernate SVN: r11626 - trunk/HibernateExt/search/src/java/org/hibernate/search/util.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-04 13:42:10 -0400 (Mon, 04 Jun 2007)
New Revision: 11626
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
Log:
HSEARCH-70 Better usability, create the base directory if it does not exists
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-04 17:42:10 UTC (rev 11626)
@@ -39,7 +39,7 @@
log.debug( "No root directory, go with relative " + relative );
File sourceFile = new File(relative);
if ( ! sourceFile.exists() ) {
- throw new HibernateException("Unable to read source directory: " + relative);
+ throw new SearchException("Unable to read source directory: " + relative);
}
//else keep source as it
}
@@ -66,12 +66,16 @@
public static File determineIndexDir(String directoryProviderName, Properties properties) {
String indexBase = properties.getProperty( "indexBase", "." );
File indexDir = new File( indexBase );
- if ( !( indexDir.exists() && indexDir.isDirectory() ) ) {
- //TODO create the directory?
- throw new HibernateException( MessageFormat.format( "Index directory does not exists: {0}", indexBase ) );
+ if ( ! indexDir.exists() ) {
+ //if the base directory does not exists, create it
+ //we do not fear concurrent creation since mkdir does not raise exceptions
+ indexDir.mkdir();
}
+ else if ( ! indexDir.isDirectory() ) {
+ throw new SearchException( MessageFormat.format( "Index directory is not a directory: {0}", indexBase ) );
+ }
if ( !indexDir.canWrite() ) {
- throw new HibernateException( "Cannot write into index directory: " + indexBase );
+ throw new SearchException( "Cannot write into index directory: " + indexBase );
}
indexDir = new File( indexDir, directoryProviderName );
18 years, 10 months
- 1
- 0
Hibernate SVN: r11625 - in trunk/HibernateExt/search/src: java/org/hibernate/search/annotations and 25 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-06-04 12:21:54 -0400 (Mon, 04 Jun 2007)
New Revision: 11625
Modified:
trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java
trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java
trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java
trunk/HibernateExt/search/src/java/org/hibernate/search/SearchException.java
trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Boost.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/ContainedIn.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DateBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DocumentId.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Field.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/FieldBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Index.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Parameter.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Resolution.java
trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Store.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/AddLuceneWork.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/DeleteLuceneWork.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/LuceneWork.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/QueueingProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Work.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkType.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/BridgeFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/FieldBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/ParameterizedBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/StringBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayFieldBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayString2FieldBridgeAdaptor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayStringBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DateBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DoubleBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/EnumBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/FloatBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/IntegerBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/LongBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/NumberBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/ShortBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/StringBridge.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/query/IteratorImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderHelper.java
trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/BinderHelper.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/FileHelper.java
trunk/HibernateExt/search/src/java/org/hibernate/search/util/WeakIdentityHashMap.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/AlternateDocument.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/Clock.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/HANTestCase.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/RamDirectoryTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/TransactionTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/BridgeTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Cloud.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/CloudType.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Gangster.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/SnowStorm.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Address.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Author.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Order.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Owner.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Product.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Tower.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Animal.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Mammal.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/JMSMasterTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MDBSearchController.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MyHibernateUtil.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/TShirt.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/SearchQueueChecker.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/TShirt.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/AlternateBook.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Author.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Clock.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQuerySortTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQueryTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Detective.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/NotSharedReaderPerfTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/ReaderPerfTestCase.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/SharedReaderPerfTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Suspect.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Categorie.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/DelegationWrapper.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Email.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Entite.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/SessionTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/util/FileHelperTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/AsyncWorkerTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employee.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employer.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/SyncWorkerTest.java
trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/WorkerTestCase.java
Log:
Expand $Id keyword
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
import org.apache.lucene.search.Sort;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
import org.hibernate.classic.Session;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
import org.hibernate.Session;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/SearchException.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/SearchException.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/SearchException.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
import java.util.HashMap;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/Version.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search;
import java.util.Date;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Boost.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Boost.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Boost.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Documented;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/ContainedIn.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/ContainedIn.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/ContainedIn.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DateBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DateBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DateBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Documented;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DocumentId.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DocumentId.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/DocumentId.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Documented;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Field.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Field.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Field.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
/**
* JavaDoc copy/pastle from the Apache Lucene project
* Available under the ASL 2.0 http://www.apache.org/licenses/LICENSE-2.0
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/FieldBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/FieldBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/FieldBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Documented;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Index.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Index.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Index.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Retention;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Parameter.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Parameter.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Parameter.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
import java.lang.annotation.Target;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Resolution.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Resolution.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Resolution.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Store.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Store.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/annotations/Store.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.annotations;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/AddLuceneWork.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/AddLuceneWork.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/AddLuceneWork.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/DeleteLuceneWork.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/DeleteLuceneWork.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/DeleteLuceneWork.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/LuceneWork.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/LuceneWork.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/LuceneWork.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/QueueingProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/QueueingProcessor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/QueueingProcessor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.util.List;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Work.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Work.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Work.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkQueue.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.util.List;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkType.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkType.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkType.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Worker.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/WorkerFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.util.Map;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl;
import java.util.List;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.jms;
import java.util.List;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.jms;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.jms;
import java.util.HashSet;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.lucene;
import java.util.Collections;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.lucene;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/backend/impl/lucene/LuceneWorker.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.backend.impl.lucene;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/BridgeFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/BridgeFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/BridgeFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import java.math.BigDecimal;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/FieldBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/FieldBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/FieldBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import org.apache.lucene.document.Document;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/ParameterizedBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/ParameterizedBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/ParameterizedBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import java.util.Map;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import org.apache.lucene.document.Document;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/StringBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/StringBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/StringBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayFieldBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayFieldBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayFieldBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import org.apache.lucene.document.Document;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayString2FieldBridgeAdaptor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayString2FieldBridgeAdaptor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayString2FieldBridgeAdaptor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
import org.apache.lucene.document.Document;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayStringBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayStringBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/TwoWayStringBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge;
/**
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import java.math.BigDecimal;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import java.math.BigInteger;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/BooleanBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.search.bridge.TwoWayStringBridge;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DateBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DateBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DateBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import java.text.ParseException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DoubleBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DoubleBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/DoubleBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.util.StringHelper;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/EnumBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/EnumBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.search.bridge.TwoWayStringBridge;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/FloatBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/FloatBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/FloatBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.util.StringHelper;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/IntegerBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/IntegerBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/IntegerBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.util.StringHelper;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/LongBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/LongBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/LongBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.util.StringHelper;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/NumberBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/NumberBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/NumberBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.search.bridge.StringBridge;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/ShortBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/ShortBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/ShortBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
import org.hibernate.util.StringHelper;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/StringBridge.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/StringBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/bridge/builtin/StringBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.bridge.builtin;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import org.apache.lucene.document.Document;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/Loader.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import java.util.List;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import java.util.ArrayList;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import java.util.ArrayList;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.engine;
import java.util.ArrayList;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.impl;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.query;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/IteratorImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/query/IteratorImpl.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/IteratorImpl.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.query;
import java.util.Iterator;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.query;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.reader;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.reader;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.reader;
import java.util.Map;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderHelper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/ReaderProviderHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.reader;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.reader;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.util.ArrayList;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.io.File;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.util.Timer;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/store/RAMDirectoryProvider.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.store;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/BinderHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/BinderHelper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/BinderHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.util;
import org.hibernate.annotations.common.reflection.XMember;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/ContextHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.util;
import org.hibernate.HibernateException;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.util;
import java.util.Properties;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/FileHelper.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/FileHelper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/FileHelper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.util;
import java.io.File;
Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/util/WeakIdentityHashMap.java
===================================================================
--- trunk/HibernateExt/search/src/java/org/hibernate/search/util/WeakIdentityHashMap.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/java/org/hibernate/search/util/WeakIdentityHashMap.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/AlternateDocument.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/AlternateDocument.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/AlternateDocument.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/Clock.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/Clock.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/Clock.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/HANTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/HANTestCase.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/HANTestCase.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import java.io.InputStream;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/RamDirectoryTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/RamDirectoryTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/RamDirectoryTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import org.hibernate.Session;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import org.apache.lucene.analysis.StopAnalyzer;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/TransactionTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/TransactionTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/TransactionTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test;
import java.io.IOException;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.util.Date;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.util.Date;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/CloudType.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/CloudType.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/CloudType.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
/**
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.util.Date;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Gangster.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Gangster.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/Gangster.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.util.Arrays;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import org.hibernate.search.bridge.FieldBridge;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/TruncateStringBridge.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.util.Map;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.bridge;
import java.io.InputStream;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.directoryProvider;
import java.io.File;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.directoryProvider;
import java.io.InputStream;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/SnowStorm.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/SnowStorm.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/directoryProvider/SnowStorm.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.directoryProvider;
import java.util.Date;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Address.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Address.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Address.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import java.util.Set;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Author.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Author.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Author.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Order.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Order.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Order.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import javax.persistence.Id;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Owner.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Owner.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Owner.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import javax.persistence.Embeddable;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Product.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Product.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Product.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import java.util.Set;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Tower.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Tower.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/embedded/Tower.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.embedded;
import javax.persistence.CascadeType;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.fieldAccess;
import javax.persistence.Id;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.fieldAccess;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Animal.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Animal.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Animal.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.inheritance;
import org.hibernate.search.annotations.Keyword;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.inheritance;
import org.hibernate.search.test.SearchTestCase;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Mammal.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Mammal.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/inheritance/Mammal.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.inheritance;
import org.hibernate.search.annotations.Indexed;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/JMSMasterTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/JMSMasterTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.master;
import java.io.Serializable;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MDBSearchController.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MDBSearchController.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MDBSearchController.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.master;
import javax.ejb.MessageDriven;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MyHibernateUtil.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MyHibernateUtil.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/MyHibernateUtil.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.master;
import org.hibernate.SessionFactory;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/TShirt.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/TShirt.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/master/TShirt.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.master;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/JMSSlaveTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/JMSSlaveTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.slave;
import org.jboss.embedded.Bootstrap;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/SearchQueueChecker.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/SearchQueueChecker.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/SearchQueueChecker.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.slave;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/TShirt.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/TShirt.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/jms/slave/TShirt.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.jms.slave;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/AlternateBook.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/AlternateBook.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/AlternateBook.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Author.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Author.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Author.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import java.util.Set;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Clock.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Clock.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Clock.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQuerySortTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQuerySortTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQuerySortTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQueryTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQueryTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/LuceneQueryTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.query;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Detective.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Detective.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Detective.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.reader;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/NotSharedReaderPerfTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/NotSharedReaderPerfTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/NotSharedReaderPerfTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.reader;
import org.hibernate.cfg.Configuration;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/ReaderPerfTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/ReaderPerfTestCase.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/ReaderPerfTestCase.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.reader;
import java.io.File;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/SharedReaderPerfTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/SharedReaderPerfTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/SharedReaderPerfTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.reader;
import org.hibernate.cfg.Configuration;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Suspect.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Suspect.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/reader/Suspect.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.reader;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Categorie.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Categorie.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Categorie.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/DelegationWrapper.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/DelegationWrapper.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/DelegationWrapper.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import java.lang.reflect.InvocationTargetException;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Email.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Email.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Email.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Entite.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Entite.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/Entite.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/MassIndexTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import java.util.List;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/SessionTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/SessionTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/session/SessionTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.session;
import java.lang.reflect.Proxy;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/util/FileHelperTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/util/FileHelperTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/util/FileHelperTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.util;
import java.io.File;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/AsyncWorkerTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/AsyncWorkerTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/AsyncWorkerTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.worker;
import org.hibernate.search.store.RAMDirectoryProvider;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employee.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employee.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employee.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.worker;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employer.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employer.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/Employer.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.worker;
import javax.persistence.Entity;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/SyncWorkerTest.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/SyncWorkerTest.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/SyncWorkerTest.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.worker;
import org.hibernate.cfg.Configuration;
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/WorkerTestCase.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/WorkerTestCase.java 2007-06-04 16:16:46 UTC (rev 11624)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/worker/WorkerTestCase.java 2007-06-04 16:21:54 UTC (rev 11625)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.search.test.worker;
import java.io.File;
18 years, 10 months
- 1
- 0