[jbosscache-commits] JBoss Cache SVN: r6339 - in searchable/trunk: src/main/java/org/jboss/cache/search and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Jul 18 12:59:00 EDT 2008
Author: navssurtani
Date: 2008-07-18 12:59:00 -0400 (Fri, 18 Jul 2008)
New Revision: 6339
Modified:
searchable/trunk/pom.xml
searchable/trunk/src/main/java/org/jboss/cache/search/CacheQueryImpl.java
searchable/trunk/src/main/java/org/jboss/cache/search/NodeModifiedTransactionContext.java
searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java
searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java
searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java
searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCoreListener.java
Log:
Changed pom dependency for HS, refactored searchFactoryImpl to SearchFactoryImplementor
Modified: searchable/trunk/pom.xml
===================================================================
--- searchable/trunk/pom.xml 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/pom.xml 2008-07-18 16:59:00 UTC (rev 6339)
@@ -36,9 +36,9 @@
</dependency>
<dependency>
- <groupId>org.hibernate.sandbox</groupId>
- <artifactId>hibernate-search-gsoc</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>3.1.0.Beta1</version>
</dependency>
<dependency>
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/CacheQueryImpl.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/CacheQueryImpl.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/CacheQueryImpl.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -5,7 +5,6 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
-import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.search.FullTextFilter;
import org.hibernate.search.SearchException;
@@ -46,7 +45,7 @@
private Sort sort;
private Filter filter;
private Map<String, FullTextFilterImpl> filterDefinitions;
- private SearchFactoryImpl searchFactory;
+ private SearchFactoryImplementor searchFactory;
private Integer firstResult;
private Integer resultSize;
private Integer maxResults;
@@ -60,7 +59,7 @@
CacheEntityLoader entityLoader;
- public CacheQueryImpl(Query luceneQuery, SearchFactoryImpl searchFactory, Cache cache)
+ public CacheQueryImpl(Query luceneQuery, SearchFactoryImplementor searchFactory, Cache cache)
{
this.luceneQuery = luceneQuery;
// this.cache = cache;
@@ -68,7 +67,7 @@
this.searchFactory = searchFactory;
}
- public CacheQueryImpl(Query luceneQuery, SearchFactoryImpl searchFactory, Cache cache, Class... classes)
+ public CacheQueryImpl(Query luceneQuery, SearchFactoryImplementor searchFactory, Cache cache, Class... classes)
{
this(luceneQuery, searchFactory, cache);
this.classes = classes;
@@ -217,7 +216,7 @@
int size = max - first + 1 < 0 ? 0 : max - first + 1;
ids = new ArrayList<CacheEntityId>(size);
- DocumentExtractor extractor = new DocumentExtractor(searchFactory, indexProjection);
+ DocumentExtractor extractor = new DocumentExtractor(luceneQuery, searcher, searchFactory, indexProjection);
for (int index = first; index <= max; index++)
{
String documentId = (String) extractor.extract(hits, index).id;
@@ -266,7 +265,7 @@
int size = max - first + 1 < 0 ? 0 : max - first + 1;
List<CacheEntityId> ids = new ArrayList<CacheEntityId>(size);
- DocumentExtractor extractor = new DocumentExtractor(searchFactory, indexProjection);
+ DocumentExtractor extractor = new DocumentExtractor(luceneQuery, searcher, searchFactory, indexProjection);
for (int index = first; index <= max; index++)
{
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/NodeModifiedTransactionContext.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/NodeModifiedTransactionContext.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/NodeModifiedTransactionContext.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -1,13 +1,13 @@
package org.jboss.cache.search;
-import org.hibernate.search.transaction.TransactionContext;
+import org.hibernate.search.backend.TransactionContext;
import org.jboss.cache.notifications.event.NodeModifiedEvent;
import javax.transaction.Synchronization;
import javax.transaction.Transaction;
/**
- * This class implements the {@link org.hibernate.search.transaction.TransactionContext} interface. It
+ * This class implements the {@link org.hibernate.search.backend.TransactionContext} interface. It
* retrieves transaction context information from the {@link org.jboss.cache.notifications.event.NodeModifiedEvent} that gets passed in.
* <p />
* It is used by the {@link SearchableCoreListener} to pass transaction information to a Hibernate Search {@link org.hibernate.search.backend.Work} object.
@@ -37,7 +37,7 @@
* an org.hibernate transaction).
* @return true if a transaction is in progress, false otherwise.
*/
- public boolean isTxInProgress()
+ public boolean isTransactionInProgress()
{
return (event.getTransaction() != null);
}
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -7,7 +7,7 @@
/**
* This is the implementation class for the interface QueryResultIterator which extends ListIterator. It is what is
- * returned when the iterate() method is run on a CacheQuery instance.
+ * returned when the iterator() method is run on a CacheQuery instance.
*
* @author Navin Surtani - navin at surtani.org
*/
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -2,6 +2,7 @@
import org.hibernate.search.impl.SearchFactoryImpl;
import org.hibernate.search.cfg.SearchConfiguration;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheStatus;
import org.apache.commons.logging.Log;
@@ -62,7 +63,7 @@
SearchConfiguration cfg = new SearchableCacheCfgImpl(classes, properties);
// set classes in the cfg
- SearchFactoryImpl searchFactory = new SearchFactoryImpl(cfg);
+ SearchFactoryImplementor searchFactory = new SearchFactoryImpl(cfg);
// boolean isPojoCache = c instanceof PojoCache; keep this for later usage
// Step 2: Add cache listener to listen for events happening in the cache.
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -2,6 +2,7 @@
import org.apache.lucene.search.Query;
import org.hibernate.search.impl.SearchFactoryImpl;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheStatus;
@@ -28,9 +29,9 @@
private Cache<K, V> cache;
- private SearchFactoryImpl searchFactory;
+ private SearchFactoryImplementor searchFactory;
- public SearchableCacheImpl(Cache<K, V> cache, SearchFactoryImpl searchFactory)
+ public SearchableCacheImpl(Cache<K, V> cache, SearchFactoryImplementor searchFactory)
{
if (cache == null) throw new NullPointerException("Cache is null");
if (searchFactory == null) throw new NullPointerException("searchFactory is null");
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCoreListener.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCoreListener.java 2008-07-18 16:48:45 UTC (rev 6338)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCoreListener.java 2008-07-18 16:59:00 UTC (rev 6339)
@@ -1,9 +1,10 @@
package org.jboss.cache.search;
import org.hibernate.search.impl.SearchFactoryImpl;
-import org.hibernate.search.transaction.TransactionContext;
+import org.hibernate.search.backend.TransactionContext;
import org.hibernate.search.backend.Work;
import org.hibernate.search.backend.WorkType;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.annotation.NodeModified;
import org.jboss.cache.notifications.event.NodeModifiedEvent;
@@ -20,10 +21,10 @@
@CacheListener
public class SearchableCoreListener
{
- private SearchFactoryImpl searchFactory;
+ private SearchFactoryImplementor searchFactory;
private static final Log log = LogFactory.getLog(SearchableCoreListener.class);
- public SearchableCoreListener(SearchFactoryImpl searchFactory)
+ public SearchableCoreListener(SearchFactoryImplementor searchFactory)
{
this.searchFactory = searchFactory;
@@ -68,7 +69,7 @@
*/
- protected void handlePutData(NodeModifiedEvent event, SearchFactoryImpl searchFactory) throws InvalidKeyException
+ protected void handlePutData(NodeModifiedEvent event, SearchFactoryImplementor searchFactory) throws InvalidKeyException
{
Map dataMap = event.getData();
if (log.isTraceEnabled()) log.trace("Called event.getData() and saved to a Map");
@@ -109,7 +110,7 @@
* @param searchFactory - a SearchFactoryImpl instance.
* @throws InvalidKeyException
*/
- protected void handleDeleteData(NodeModifiedEvent event, SearchFactoryImpl searchFactory) throws InvalidKeyException
+ protected void handleDeleteData(NodeModifiedEvent event, SearchFactoryImplementor searchFactory) throws InvalidKeyException
{
Map dataMap = event.getData();
More information about the jbosscache-commits
mailing list