Mailing-List: contact pylucene-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: pylucene-dev@lucene.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1484350 - in /lucene/pylucene/trunk: Makefile
 java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
Date: Sun, 19 May 2013 21:15:15 -0000
To: pylucene-commits@lucene.apache.org
From: vajda@apache.org
Message-Id: <20130519211515.4A24423889CB@eris.apache.org>

Author: vajda
Date: Sun May 19 21:15:14 2013
New Revision: 1484350

URL: http://svn.apache.org/r1484350
Log:
preparing PyLucene 4.3.0-1 release candidate

Modified:
    lucene/pylucene/trunk/Makefile
    lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1484350&r1=1484349&r2=1484350&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sun May 19 21:15:14 2013
@@ -45,6 +45,13 @@ LUCENE=$(LUCENE_SRC)/lucene
 # limit.
 #
 
+# Mac OS X 10.6 (MacPorts 1.8.0 64-bit Python 2.7, Java 1.6)
+PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install
+ANT=ant
+PYTHON=$(PREFIX_PYTHON)/bin/python
+JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64
+NUM_FILES=8
+
 # Mac OS X 10.6 (64-bit Python 2.6, Java 1.6)
 #PREFIX_PYTHON=/usr
 #ANT=ant
@@ -156,6 +163,7 @@ JARS+=$(QUERIES_JAR)            # regex 
 JARS+=$(QUERYPARSER_JAR)        # query parser
 JARS+=$(SANDBOX_JAR)            # needed by query parser
 #JARS+=$(SMARTCN_JAR)            # smart chinese analyzer
+JARS+=$(STEMPEL_JAR)            # polish analyzer and stemmer
 #JARS+=$(SPATIAL_JAR)            # spatial lucene
 JARS+=$(GROUPING_JAR)           # grouping module
 JARS+=$(JOIN_JAR)               # join module
@@ -184,6 +192,7 @@ QUERIES_JAR=$(LUCENE)/build/queries/luce
 QUERYPARSER_JAR=$(LUCENE)/build/queryparser/lucene-queryparser-$(LUCENE_VER).jar
 SANDBOX_JAR=$(LUCENE)/build/sandbox/lucene-sandbox-$(LUCENE_VER).jar
 SMARTCN_JAR=$(LUCENE)/build/analysis/smartcn/lucene-analyzers-smartcn-$(LUCENE_VER).jar
+STEMPEL_JAR=$(LUCENE)/build/analysis/stempel/lucene-analyzers-stempel-$(LUCENE_VER).jar
 SPATIAL_JAR=$(LUCENE)/build/spatial/lucene-spatial-$(LUCENE_VER).jar
 GROUPING_JAR=$(LUCENE)/build/grouping/lucene-grouping-$(LUCENE_VER).jar
 JOIN_JAR=$(LUCENE)/build/join/lucene-join-$(LUCENE_VER).jar
@@ -254,6 +263,9 @@ $(EXTENSIONS_JAR): $(LUCENE_JAR)
 $(SMARTCN_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/analysis/smartcn; $(ANT) -Dversion=$(LUCENE_VER)
 
+$(STEMPEL_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/analysis/stempel; $(ANT) -Dversion=$(LUCENE_VER)
+
 $(SPATIAL_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/spatial; $(ANT) -Dversion=$(LUCENE_VER)
 
@@ -318,6 +330,7 @@ GENERATE=$(JCC) $(foreach jar,$(JARS),--
            --package java.io java.io.StringReader \
                              java.io.InputStreamReader \
                              java.io.FileInputStream \
+                             java.io.DataInputStream \
            --exclude org.apache.lucene.sandbox.queries.regex.JakartaRegexpCapabilities \
            --exclude org.apache.regexp.RegexpTunnel \
            --python lucene \
@@ -392,8 +405,7 @@ stage:
                            people.apache.org:public_html/staging_area
 
 release:
-	cd distrib; scp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).md5 \
-                           people.apache.org:/www/www.apache.org/dist/lucene/pylucene
+	cd distrib; cp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).md5 ../../dist/pylucene/
 
 print-%:
 	@echo $* = $($*)

Modified: lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java?rev=1484350&r1=1484349&r2=1484350&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java Sun May 19 21:15:14 2013
@@ -17,15 +17,16 @@ package org.apache.pylucene.analysis;
 
 import org.apache.lucene.analysis.util.FilteringTokenFilter;
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.util.Version;
 import java.io.IOException;
 
 
 public class PythonFilteringTokenFilter extends FilteringTokenFilter {
     private long pythonObject;
 
-    public PythonFilteringTokenFilter(boolean enablePositionIncrements, TokenStream tokenStream)
+    public PythonFilteringTokenFilter(Version version, TokenStream tokenStream)
     {
-        super(enablePositionIncrements, tokenStream);
+        super(version, tokenStream);
     }
 
     public void pythonExtension(long pythonObject)