Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1930: remove some CoreContainer deprecations 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1054157 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-12-31 18:36:14 +00:00
parent 2bf47f6bc7
commit ffef43df4f
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
solr/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -78,8 +78,6 @@ public class CoreContainer
protected String adminHandler; protected String adminHandler;
protected boolean shareSchema; protected boolean shareSchema;
protected String solrHome; protected String solrHome;
@Deprecated
protected String solrConfigFilenameOverride;
protected String defaultCoreName = ""; protected String defaultCoreName = "";
private ZkController zkController; private ZkController zkController;
private SolrZkServer zkServer; private SolrZkServer zkServer;
@ -219,15 +217,6 @@ public class CoreContainer
"Setting abortOnConfigurationError==false is no longer supported"); "Setting abortOnConfigurationError==false is no longer supported");
} }
public String getSolrConfigFilename() {
return solrConfigFilename;
}
@Deprecated
public void setSolrConfigFilename(String solrConfigFilename) {
this.solrConfigFilename = solrConfigFilename;
}
// core container instantiation // core container instantiation
public CoreContainer initialize() throws IOException, public CoreContainer initialize() throws IOException,
ParserConfigurationException, SAXException { ParserConfigurationException, SAXException {
@ -379,9 +368,7 @@ public class CoreContainer
// deal with optional settings // deal with optional settings
String opt = DOMUtil.getAttr(node, "config", null); String opt = DOMUtil.getAttr(node, "config", null);
if(solrConfigFilenameOverride != null) { if (opt != null) {
p.setConfigName(solrConfigFilenameOverride);
} else if (opt != null) {
p.setConfigName(opt); p.setConfigName(opt);
} }
opt = DOMUtil.getAttr(node, "schema", null); opt = DOMUtil.getAttr(node, "schema", null);

1
solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
View File

@ -81,7 +81,6 @@ public class SolrDispatchFilter implements Filter
try { try {
// web.xml configuration // web.xml configuration
this.pathPrefix = config.getInitParameter( "path-prefix" ); this.pathPrefix = config.getInitParameter( "path-prefix" );
init.setSolrConfigFilename(config.getInitParameter("solrconfig-filename"));
this.cores = init.initialize(); this.cores = init.initialize();
abortOnConfigurationError = init.isAbortOnConfigurationError(); abortOnConfigurationError = init.isAbortOnConfigurationError();