Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6496B200C72 for ; Fri, 12 May 2017 15:59:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 62F52160BB8; Fri, 12 May 2017 13:59:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A9B7A160BA3 for ; Fri, 12 May 2017 15:59:08 +0200 (CEST) Received: (qmail 72803 invoked by uid 500); 12 May 2017 13:59:07 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 72794 invoked by uid 99); 12 May 2017 13:59:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 May 2017 13:59:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 98C9FDFFAC; Fri, 12 May 2017 13:59:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpoerschke@apache.org To: commits@lucene.apache.org Message-Id: <9c0cf8ae27874a4c9bc65dde754a74d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:master: Revert "SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts." Date: Fri, 12 May 2017 13:59:07 +0000 (UTC) archived-at: Fri, 12 May 2017 13:59:09 -0000 Repository: lucene-solr Updated Branches: refs/heads/master e61b5b34b -> 6d74a9e85 Revert "SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts." This reverts commit a96f39449b48c7c2b4f2a82c808a97fb0c60ffc5. Resolved Conflicts: solr/CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6d74a9e8 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6d74a9e8 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6d74a9e8 Branch: refs/heads/master Commit: 6d74a9e858d464fbfa6fc9e0fc90abf437565c3b Parents: e61b5b3 Author: Christine Poerschke Authored: Fri May 12 14:45:24 2017 +0100 Committer: Christine Poerschke Committed: Fri May 12 14:58:47 2017 +0100 ---------------------------------------------------------------------- solr/CHANGES.txt | 2 -- .../java/org/apache/solr/update/SolrIndexConfig.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d74a9e8/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 10edc52..5b0c8f7 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -141,8 +141,6 @@ Other Changes * SOLR-10310: By default, stop splitting on whitespace prior to analysis in edismax and standard/"lucene" query parsers. (Steve Rowe) -* SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts. (Christine Poerschke) - * SOLR-10647: Move the V1 <-> V2 API mapping to SolrJ (noble) ================== 6.7.0 ================== http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d74a9e8/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java index d7635f2..d484e85 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java @@ -127,6 +127,18 @@ public class SolrIndexConfig implements MapSerializable { luceneVersion = solrConfig.luceneMatchVersion; + // Assert that end-of-life parameters or syntax is not in our config. + // Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above + assertWarnOrFail("The myclass syntax is no longer supported in solrconfig.xml. Please use syntax instead.", + !((solrConfig.getNode(prefix + "/mergeScheduler", false) != null) && (solrConfig.get(prefix + "/mergeScheduler/@class", null) == null)), + true); + assertWarnOrFail("The myclass syntax is no longer supported in solrconfig.xml. Please use syntax instead.", + !((solrConfig.getNode(prefix + "/mergePolicy", false) != null) && (solrConfig.get(prefix + "/mergePolicy/@class", null) == null)), + true); + assertWarnOrFail("The true|false parameter is no longer valid in solrconfig.xml.", + solrConfig.get(prefix + "/luceneAutoCommit", null) == null, + true); + effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile()); maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs); maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);