You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2009/11/29 18:15:00 UTC
svn commit: r885247 - in /tuscany/sca-java-1.x/trunk: ./
modules/domain-search/
modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/
Author: adrianocrestani
Date: Sun Nov 29 17:14:59 2009
New Revision: 885247
URL: http://svn.apache.org/viewvc?rev=885247&view=rev
Log:
fixing TUSCANY-3382
Modified:
tuscany/sca-java-1.x/trunk/modules/domain-search/pom.xml
tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
tuscany/sca-java-1.x/trunk/pom.xml
Modified: tuscany/sca-java-1.x/trunk/modules/domain-search/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/domain-search/pom.xml?rev=885247&r1=885246&r2=885247&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/domain-search/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/modules/domain-search/pom.xml Sun Nov 29 17:14:59 2009
@@ -68,19 +68,19 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.9.1</version>
</dependency>
</dependencies>
Modified: tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java?rev=885247&r1=885246&r2=885247&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java (original)
+++ tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java Sun Nov 29 17:14:59 2009
@@ -87,7 +87,7 @@
try {
this.dir =
- new FSDirectory(new File(this.indexDirectoryPath),
+ FSDirectory.getDirectory(new File(this.indexDirectoryPath),
new SimpleFSLockFactory(this.indexDirectoryPath));
} catch (IOException e) {
Modified: tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java?rev=885247&r1=885246&r2=885247&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java (original)
+++ tuscany/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java Sun Nov 29 17:14:59 2009
@@ -29,7 +29,7 @@
import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
import org.apache.lucene.search.highlight.NullFragmenter;
import org.apache.lucene.search.highlight.SimpleFragmenter;
-import org.apache.lucene.search.highlight.SpanScorer;
+import org.apache.lucene.search.highlight.QueryScorer;
import org.apache.tuscany.sca.domain.search.Result;
/**
@@ -83,8 +83,11 @@
CachingTokenFilter tokenStream =
new CachingTokenFilter(new DomainSearchAnalyzer().tokenStream(field, new StringReader(text)));
+ QueryScorer scorer = new QueryScorer(query, field, "");
+ scorer.init(tokenStream);
+
Highlighter highlighter =
- new Highlighter(new DomainSearchFormatter(), new SpanScorer(query, field, tokenStream, ""));
+ new Highlighter(new DomainSearchFormatter(), scorer);
highlighter.setTextFragmenter(fragmenter);
tokenStream.reset();
Modified: tuscany/sca-java-1.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/pom.xml?rev=885247&r1=885246&r2=885247&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/pom.xml Sun Nov 29 17:14:59 2009
@@ -125,7 +125,17 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
- </repository>
+ </repository>
+ <repository>
+ <id>maven2.repo</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>