svn commit: r584319 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/analysis/BaseTokenizerFactory.java src/java/org/apache/solr/schema/IndexSchema.java

[ry...@apache.org]

Author: ryan
Date: Fri Oct 12 16:27:12 2007
New Revision: 584319

URL: http://svn.apache.org/viewvc?rev=584319&view=rev
Log:
SOLR-215 -- adding CHANGES.txt and moving the deprecation warning from BaseXXXFactory to IndexSchema.java

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
    lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=584319&r1=584318&r2=584319&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Fri Oct 12 16:27:12 2007
@@ -197,6 +197,16 @@
 
  3. Upgraded to Lucene 2.2.0; June 18, 2007.
 
+ 4. SOLR-215: In an push to support multiple SolrCores, the TokenizerFactory
+    and TokenFilterFactory initalization interface has changed to accept the 
+    solrConfig.  Initialization should happen in:
+ 		  init(SolrConfig solrConfig, Map<String,String> args)
+    rather then:
+      init(Map<String,String> args)
+    Existing classes should continue to work, but it is encouraged to update
+    the initialization code.
+ 
+
 ================== Release 1.2, 20070602 ==================
 
 Upgrading from Solr 1.1

Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java?rev=584319&r1=584318&r2=584319&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java Fri Oct 12 16:27:12 2007
@@ -35,7 +35,6 @@
   
   @Deprecated
   public void init(Map<String,String> args) {
-    //log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map<String,String> args)");
     this.args=args;
   }
   

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java?rev=584319&r1=584318&r2=584319&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java Fri Oct 12 16:27:12 2007
@@ -629,10 +629,13 @@
     NamedNodeMap attrs = node.getAttributes();
     String className = DOMUtil.getAttr(attrs,"class","tokenizer");
     TokenizerFactory tfac = (TokenizerFactory)solrConfig.newInstance(className);
-    if (tfac instanceof SolrConfig.Initializable)
+    if (tfac instanceof SolrConfig.Initializable) {
       ((SolrConfig.Initializable)tfac).init(solrConfig, DOMUtil.toMapExcept(attrs,"class"));
-    else
+    }
+    else {
+      log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map<String,String> args) " + className );
       tfac.init(DOMUtil.toMapExcept(attrs,"class"));
+    }
     
     return tfac;
   }
@@ -643,11 +646,13 @@
     NamedNodeMap attrs = node.getAttributes();
     String className = DOMUtil.getAttr(attrs,"class","token filter");
     TokenFilterFactory tfac = (TokenFilterFactory)solrConfig.newInstance(className);
-    if (tfac instanceof SolrConfig.Initializable)
+    if (tfac instanceof SolrConfig.Initializable) {
       ((SolrConfig.Initializable)tfac).init(solrConfig, DOMUtil.toMapExcept(attrs,"class"));
-    else
+    }
+    else {
+      log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map<String,String> args) " + className );
       tfac.init(DOMUtil.toMapExcept(attrs,"class"));
-    
+    }
     return tfac;
   }