You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2012/02/21 02:13:57 UTC
svn commit: r1291543 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/spellchecker/ solr/ solr/core/
solr/core/src/java/org/apache/solr/analysis/
Author: koji
Date: Tue Feb 21 01:13:56 2012
New Revision: 1291543
URL: http://svn.apache.org/viewvc?rev=1291543&view=rev
Log:
SOLR-2909: add support for ResourceLoaderAware tokenizerFactories in synonym filter factories
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1291543&r1=1291542&r2=1291543&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Feb 21 01:13:56 2012
@@ -204,6 +204,9 @@ Bug Fixes
* SOLR-3052: Fixed typo in distributed grouping parameters.
(Martijn van Groningen, Grant Ingersoll)
+* SOLR-2909: Add support for ResourceLoaderAware tokenizerFactories in synonym
+ filter factories. (Tom Klonikowski, Jun Ohtani via Koji Sekiguchi)
+
Other Changes
----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java?rev=1291543&r1=1291542&r2=1291543&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java Tue Feb 21 01:13:56 2012
@@ -156,6 +156,9 @@ final class FSTSynonymFilterFactory exte
private static TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname, Map<String,String> args){
TokenizerFactory tokFactory = (TokenizerFactory) loader.newInstance(cname);
tokFactory.init(args);
+ if (tokFactory instanceof ResourceLoaderAware) {
+ ((ResourceLoaderAware) tokFactory).inform(loader);
+ }
return tokFactory;
}
}
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java?rev=1291543&r1=1291542&r2=1291543&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java Tue Feb 21 01:13:56 2012
@@ -171,6 +171,9 @@ final class SlowSynonymFilterFactory ext
private static TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname, Map<String,String> args){
TokenizerFactory tokFactory = (TokenizerFactory)loader.newInstance( cname );
tokFactory.init( args );
+ if (tokFactory instanceof ResourceLoaderAware) {
+ ((ResourceLoaderAware) tokFactory).inform(loader);
+ }
return tokFactory;
}