Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@locus.apache.org Received: (qmail 48199 invoked from network); 12 Oct 2007 23:14:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Oct 2007 23:14:31 -0000 Received: (qmail 16813 invoked by uid 500); 12 Oct 2007 23:14:19 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 16790 invoked by uid 500); 12 Oct 2007 23:14:18 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 16781 invoked by uid 99); 12 Oct 2007 23:14:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 16:14:18 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 23:14:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7DA361A9838; Fri, 12 Oct 2007 16:14:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584316 - in /lucene/solr/trunk/src/java/org/apache/solr: analysis/BaseTokenFilterFactory.java analysis/BaseTokenizerFactory.java schema/IndexSchema.java Date: Fri, 12 Oct 2007 23:14:08 -0000 To: solr-commits@lucene.apache.org From: ryan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071012231410.7DA361A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ryan Date: Fri Oct 12 16:14:07 2007 New Revision: 584316 URL: http://svn.apache.org/viewvc?rev=584316&view=rev Log: SOLR-215 -- make sure that BaseTokenFilterFactory/BaseTokenizerFactory call the @Deprecated init() method Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java 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/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java?rev=584316&r1=584315&r2=584316&view=diff ============================================================================== --- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java (original) +++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java Fri Oct 12 16:14:07 2007 @@ -34,10 +34,9 @@ /** The init args */ protected Map args; - + @Deprecated public void init(Map args) { - log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map args)"); this.args=args; } @@ -45,6 +44,7 @@ * @since solr 1.3 */ public void init(SolrConfig solrConfig, Map args) { + this.init( args ); // maintain backwards compatibility this.args=args; } 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=584316&r1=584315&r2=584316&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:14:07 2007 @@ -35,11 +35,12 @@ @Deprecated public void init(Map args) { - log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map args)"); + //log.warning("calling the deprecated form of init; should be calling init(SolrConfig solrConfig, Map args)"); this.args=args; } public void init(SolrConfig solrConfig, Map args) { + this.init( 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=584316&r1=584315&r2=584316&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:14:07 2007 @@ -632,7 +632,8 @@ if (tfac instanceof SolrConfig.Initializable) ((SolrConfig.Initializable)tfac).init(solrConfig, DOMUtil.toMapExcept(attrs,"class")); else - tfac.init(DOMUtil.toMapExcept(attrs,"class")); + tfac.init(DOMUtil.toMapExcept(attrs,"class")); + return tfac; } @@ -645,7 +646,8 @@ if (tfac instanceof SolrConfig.Initializable) ((SolrConfig.Initializable)tfac).init(solrConfig, DOMUtil.toMapExcept(attrs,"class")); else - tfac.init(DOMUtil.toMapExcept(attrs,"class")); + tfac.init(DOMUtil.toMapExcept(attrs,"class")); + return tfac; }