From ffef43df4f85a2a0112449ee5450242694b93e79 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Fri, 31 Dec 2010 18:36:14 +0000
Subject: [PATCH] SOLR-1930: remove some CoreContainer deprecations

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1054157 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/solr/core/CoreContainer.java  | 15 +--------------
 .../apache/solr/servlet/SolrDispatchFilter.java   |  1 -
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/solr/src/java/org/apache/solr/core/CoreContainer.java b/solr/src/java/org/apache/solr/core/CoreContainer.java
index 22abadfa1f0..2ea9b9255bb 100644
--- a/solr/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/src/java/org/apache/solr/core/CoreContainer.java
@@ -78,8 +78,6 @@ public class CoreContainer
   protected String adminHandler;
   protected boolean shareSchema;
   protected String solrHome;
-  @Deprecated
-  protected String solrConfigFilenameOverride;
   protected String defaultCoreName = "";
   private ZkController zkController;
   private SolrZkServer zkServer;
@@ -219,15 +217,6 @@ public class CoreContainer
            "Setting abortOnConfigurationError==false is no longer supported");
     }
 
-    public String getSolrConfigFilename() {
-      return solrConfigFilename;
-    }
-
-    @Deprecated
-    public void setSolrConfigFilename(String solrConfigFilename) {
-      this.solrConfigFilename = solrConfigFilename;
-    }
-
     // core container instantiation
     public CoreContainer initialize() throws IOException,
         ParserConfigurationException, SAXException {
@@ -379,9 +368,7 @@ public class CoreContainer
           // deal with optional settings
           String opt = DOMUtil.getAttr(node, "config", null);
 
-          if(solrConfigFilenameOverride != null) {
-            p.setConfigName(solrConfigFilenameOverride);
-          } else if (opt != null) {
+          if (opt != null) {
             p.setConfigName(opt);
           }
           opt = DOMUtil.getAttr(node, "schema", null);
diff --git a/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
index 52cf4d3fb2f..93bdddc1720 100644
--- a/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -81,7 +81,6 @@ public class SolrDispatchFilter implements Filter
     try {
       // web.xml configuration
       this.pathPrefix = config.getInitParameter( "path-prefix" );
-      init.setSolrConfigFilename(config.getInitParameter("solrconfig-filename"));
 
       this.cores = init.initialize();
       abortOnConfigurationError = init.isAbortOnConfigurationError();