You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/31 19:36:15 UTC
svn commit: r1054157 - in /lucene/dev/trunk/solr/src:
java/org/apache/solr/core/CoreContainer.java
webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
Author: yonik
Date: Fri Dec 31 18:36:14 2010
New Revision: 1054157
URL: http://svn.apache.org/viewvc?rev=1054157&view=rev
Log:
SOLR-1930: remove some CoreContainer deprecations
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java?rev=1054157&r1=1054156&r2=1054157&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreContainer.java Fri Dec 31 18:36:14 2010
@@ -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);
Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1054157&r1=1054156&r2=1054157&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java Fri Dec 31 18:36:14 2010
@@ -81,7 +81,6 @@ public class SolrDispatchFilter implemen
try {
// web.xml configuration
this.pathPrefix = config.getInitParameter( "path-prefix" );
- init.setSolrConfigFilename(config.getInitParameter("solrconfig-filename"));
this.cores = init.initialize();
abortOnConfigurationError = init.isAbortOnConfigurationError();