[Openutils-svn] SF.net SVN: openutils:[3197] trunk/openutils-mgnlcriteria

[<fg...@us...>]

Revision: 3197
          http://openutils.svn.sourceforge.net/openutils/?rev=3197&view=rev
Author:   fgiust
Date:     2011-01-01 19:33:47 +0000 (Sat, 01 Jan 2011)

Log Message:
-----------
fix test analyzer to make it work with jackrabbit 2.2.0

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/ItalianSnowballAnalyzer.java

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-12-28 14:33:32 UTC (rev 3196)
+++ trunk/openutils-mgnlcriteria/pom.xml	2011-01-01 19:33:47 UTC (rev 3197)
@@ -1,4 +1,5 @@
-<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">
+<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>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -133,16 +134,6 @@
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>${jackrabbit.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.poi</groupId>
-          <artifactId>poi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.poi</groupId>
-          <artifactId>poi-scratchpad</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
@@ -165,19 +156,6 @@
       </exclusions>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>repository.magnolia.info</id>
-      <name>magnolia repository</name>
-      <url>http://nexus.magnolia-cms.com/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
   <properties>
     <magnolia.version>4.4.1</magnolia.version>
     <jackrabbit.version>1.6.2</jackrabbit.version>

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/ItalianSnowballAnalyzer.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/ItalianSnowballAnalyzer.java	2010-12-28 14:33:32 UTC (rev 3196)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/ItalianSnowballAnalyzer.java	2011-01-01 19:33:47 UTC (rev 3197)
@@ -19,25 +19,62 @@
 
 package net.sourceforge.openutils.mgnlcriteria.tests;
 
+import java.io.IOException;
 import java.io.Reader;
 
+import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.ISOLatin1AccentFilter;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.standard.StandardFilter;
+import org.apache.lucene.analysis.standard.StandardTokenizer;
 
 
 /**
  * @author molaschi
  * @version $Id$
  */
-public class ItalianSnowballAnalyzer extends StandardAnalyzer
+public class ItalianSnowballAnalyzer extends Analyzer
 {
 
     @Override
     public TokenStream tokenStream(String fieldName, Reader reader)
     {
-        return new ISOLatin1AccentFilter(new LowerCaseFilter((super.tokenStream(fieldName, reader))));
+        StandardTokenizer tokenStream = new StandardTokenizer(reader);
+
+        TokenStream result = new StandardFilter(tokenStream);
+        result = new LowerCaseFilter(result);
+        result = new ISOLatin1AccentFilter(result);
+        return result;
     }
 
+    @Override
+    public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException
+    {
+        SavedStreams streams = (SavedStreams) getPreviousTokenStream();
+        if (streams == null)
+        {
+            streams = new SavedStreams();
+            setPreviousTokenStream(streams);
+            streams.tokenStream = new StandardTokenizer(reader);
+            streams.filteredTokenStream = new StandardFilter(streams.tokenStream);
+            streams.filteredTokenStream = new LowerCaseFilter(streams.filteredTokenStream);
+            streams.filteredTokenStream = new ISOLatin1AccentFilter(streams.filteredTokenStream);
+        }
+        else
+        {
+            streams.tokenStream.reset(reader);
+        }
+
+        return streams.filteredTokenStream;
+    }
+
+    private static final class SavedStreams
+    {
+
+        StandardTokenizer tokenStream;
+
+        TokenStream filteredTokenStream;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.