You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2011/06/24 11:38:00 UTC
svn commit: r1139221 - in /lucene/pylucene/branches/pylucene_3_3: ./ CHANGES
Makefile java/org/apache/pylucene/search/PythonFieldComparator.java
samples/LuceneInAction/lia/meetlucene/
Author: vajda
Date: Fri Jun 24 09:38:00 2011
New Revision: 1139221
URL: http://svn.apache.org/viewvc?rev=1139221&view=rev
Log:
merged changes from 3.x branch
Modified:
lucene/pylucene/branches/pylucene_3_3/ (props changed)
lucene/pylucene/branches/pylucene_3_3/CHANGES
lucene/pylucene/branches/pylucene_3_3/Makefile
lucene/pylucene/branches/pylucene_3_3/java/org/apache/pylucene/search/PythonFieldComparator.java
lucene/pylucene/branches/pylucene_3_3/samples/LuceneInAction/lia/meetlucene/ (props changed)
Propchange: lucene/pylucene/branches/pylucene_3_3/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/pylucene/branches/branch_3x:1139193-1139220
Modified: lucene/pylucene/branches/pylucene_3_3/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_3_3/CHANGES?rev=1139221&r1=1139220&r2=1139221&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_3_3/CHANGES (original)
+++ lucene/pylucene/branches/pylucene_3_3/CHANGES Fri Jun 24 09:38:00 2011
@@ -1,18 +1,28 @@
-Version 3.0.0 ->
-----------------
+Version 3.2.0 -> 3.3.0
+----------------------
+ - using Lucene 3.3 sources
+ - adapted to FieldComparator becoming generic
+
+Version 3.1.0 -> 3.2.0
+----------------------
+ - using Lucene 3.2 sources
+ - PyLucene built with JCC 2.9
+ - rearranged Lucene source checkout tree to reflect new constraints
+
+Version 3.0.0 -> 3.1.0
+----------------------
+ - using Lucene 3.1 sources
- improved support for building on Windows with mingw32
- added wininst target to Makefile
- - added port of ICUNormalizer2Filter using C++ ICU's Normalizer2 via PyICU
- - added port of ICUFoldingFilter using C++ ICU's Normalizer2 via PyICU
- - added port of ICUTransformFilter using C++ ICU's Transliterator via PyICU
- - PyLucene built with JCC 2.6
+ - added port of ICUNormalizer2Filter using C++ ICU's Normalizer2 via PyICU 1.1
+ - added port of ICUFoldingFilter using C++ ICU's Normalizer2 via PyICU 1.1
+ - added port of ICUTransformFilter using C++ ICU's Transliterator via PyICU 1.1
- fixed "Lucene in Action" samples left over on old API
- improved support for adding optional contrib modules
- added --package java.util.regex to wrap constructors on PatternAnalyzer
- fixed mansearch.py sample to reflect API changes
- - rearranged Lucene source checkout tree to reflect new constraints
- -
+ - PyLucene built with JCC 2.8
Version 2.9.0 -> 3.0.0
----------------------
Modified: lucene/pylucene/branches/pylucene_3_3/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_3_3/Makefile?rev=1139221&r1=1139220&r2=1139221&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_3_3/Makefile (original)
+++ lucene/pylucene/branches/pylucene_3_3/Makefile Fri Jun 24 09:38:00 2011
@@ -15,10 +15,10 @@
# site-packages directory.
#
-VERSION=3.x-0
+VERSION=3.3-0
LUCENE_SVN_VER=HEAD
-LUCENE_VER=3.x
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x
+LUCENE_VER=3.3
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_3
PYLUCENE:=$(shell pwd)
LUCENE_SRC=lucene-java-$(LUCENE_VER)
LUCENE=$(LUCENE_SRC)/lucene
@@ -186,7 +186,6 @@ default: all
$(LUCENE_SRC):
mkdir -p $(LUCENE_SRC)
svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/lucene $(LUCENE_SRC)/lucene
- svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/common-build.xml $(LUCENE_SRC)/common-build.xml
sources: $(LUCENE_SRC)
@@ -308,7 +307,7 @@ clean:
rm -rf $(LUCENE)/build build
realclean:
- if test ! -d $(LUCENE)/.svn; then rm -rf $(LUCENE); else rm -rf $(LUCENE)/build; fi
+ if test ! -d $(LUCENE)/.svn; then rm -rf $(LUCENE_SRC); else rm -rf $(LUCENE)/build; fi
rm -rf build samples/LuceneInAction/index
OS=$(shell uname)
Modified: lucene/pylucene/branches/pylucene_3_3/java/org/apache/pylucene/search/PythonFieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_3_3/java/org/apache/pylucene/search/PythonFieldComparator.java?rev=1139221&r1=1139220&r2=1139221&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_3_3/java/org/apache/pylucene/search/PythonFieldComparator.java (original)
+++ lucene/pylucene/branches/pylucene_3_3/java/org/apache/pylucene/search/PythonFieldComparator.java Fri Jun 24 09:38:00 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexRead
* @author Andi Vajda
*/
-public class PythonFieldComparator extends FieldComparator {
+public class PythonFieldComparator<T> extends FieldComparator<T> {
private long pythonObject;
@@ -56,5 +56,5 @@ public class PythonFieldComparator exten
throws IOException;
public native void setNextReader(IndexReader reader, int docBase)
throws IOException;
- public native Comparable value(int slot);
+ public native T value(int slot);
}
Propchange: lucene/pylucene/branches/pylucene_3_3/samples/LuceneInAction/lia/meetlucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 24 09:38:00 2011
@@ -1 +1,2 @@
+/lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/meetlucene:1139193-1139220
/lucene/pylucene/branches/pylucene_3_0/samples/LuceneInAction/lia/meetlucene:950836,984081