7 a.m.
Author: sannegrinovero
Date: 2010-02-09 08:00:22 -0500 (Tue, 09 Feb 2010)
New Revision: 18745
Modified:
search/trunk/hibernate-search-archetype/pom.xml
search/trunk/hibernate-search-archetype/src/test/java/example/IndexAndSearchTest.java
Log:
HSEARCH-459 Update quickstart archetype (version definitions, test cleanup, use the
massindexer)
Modified: search/trunk/hibernate-search-archetype/pom.xml
===================================================================
--- search/trunk/hibernate-search-archetype/pom.xml 2010-02-09 12:49:20 UTC (rev 18744)
+++ search/trunk/hibernate-search-archetype/pom.xml 2010-02-09 13:00:22 UTC (rev 18745)
@@ -1,12 +1,20 @@
<?xml version="1.0"?>
-<project>
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-quickstart</artifactId>
<packaging>jar</packaging>
- <version>3.2.0-Beta1</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>A custom project</name>
<url>http://www.myorganization.org</url>
+
+ <properties>
+ <slf4jVersion>1.5.8</slf4jVersion>
+ <luceneVersion>2.9.1</luceneVersion> <!-- Remember to change code
constants too: Version.LUCENE_29 -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
@@ -16,7 +24,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-Beta-4</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
@@ -59,41 +67,42 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
- <version>2.4.1</version>
+ <version>${luceneVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
- <version>2.4.1</version>
+ <version>${luceneVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.4.2</version>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
+ <version>1.8.0.10</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified:
search/trunk/hibernate-search-archetype/src/test/java/example/IndexAndSearchTest.java
===================================================================
---
search/trunk/hibernate-search-archetype/src/test/java/example/IndexAndSearchTest.java 2010-02-09
12:49:20 UTC (rev 18744)
+++
search/trunk/hibernate-search-archetype/src/test/java/example/IndexAndSearchTest.java 2010-02-09
13:00:22 UTC (rev 18745)
@@ -27,6 +27,7 @@
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.util.Version;
import org.hibernate.Session;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.search.FullTextSession;
@@ -113,16 +114,18 @@
private void index() {
FullTextSession ftSession =
org.hibernate.search.Search.getFullTextSession((Session) em.getDelegate());
- List results = ftSession.createCriteria(Book.class).list();
- for (Object obj : results) {
- ftSession.index(obj);
- }
- ftSession.flushToIndexes();
+ try {
+ ftSession.createIndexer().startAndWait();
+ }
+ catch (InterruptedException e) {
+ log.error( "Was interrupted during indexing", e );
+ }
}
private void purge() {
FullTextSession ftSession =
org.hibernate.search.Search.getFullTextSession((Session) em.getDelegate());
ftSession.purgeAll(Book.class);
+ ftSession.flushToIndexes();
}
private List<Book> search(String searchQuery) throws ParseException {
@@ -149,7 +152,7 @@
FullTextEntityManager ftEm =
org.hibernate.search.jpa.Search.getFullTextEntityManager((EntityManager) em);
- QueryParser parser = new MultiFieldQueryParser(bookFields,
ftEm.getSearchFactory().getAnalyzer("customanalyzer"),
+ QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_29, bookFields,
ftEm.getSearchFactory().getAnalyzer("customanalyzer"),
boostPerField);
org.apache.lucene.search.Query luceneQuery;