fixing TUSCANY-3382

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@885247 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 20 insertions, 7 deletions

diff --git a/sca-java-1.x/trunk/modules/domain-search/pom.xml b/sca-java-1.x/trunk/modules/domain-search/pom.xml
index 577c3b8488..59a34a420c 100644
--- a/sca-java-1.x/trunk/modules/domain-search/pom.xml
+++ b/sca-java-1.x/trunk/modules/domain-search/pom.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
index 59b80ac026..8004ac6faa 100644
--- a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
+++ b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
@@ -87,7 +87,7 @@ public class DomainSearchImpl implements DomainSearch {
 
                 try {
                     this.dir =
-                        new FSDirectory(new File(this.indexDirectoryPath),
+                        FSDirectory.getDirectory(new File(this.indexDirectoryPath),
                                         new SimpleFSLockFactory(this.indexDirectoryPath));
 
                 } catch (IOException e) {
diff --git a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
index 356eb88070..ba8e1bf021 100644
--- a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
+++ b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
@@ -29,7 +29,7 @@ import org.apache.lucene.search.highlight.Highlighter;
 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 @@ final public class HighlightingUtil {
             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();
 
diff --git a/sca-java-1.x/trunk/pom.xml b/sca-java-1.x/trunk/pom.xml
index f8ef2a549d..b846029201 100644
--- a/sca-java-1.x/trunk/pom.xml
+++ b/sca-java-1.x/trunk/pom.xml
@@ -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>