cosmetics : tidy up schema.xml solrconfig.xml files, add missing override, remove unused imports
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914@1583745 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/collection1/conf/solrconfig-auth-load.xml b/solr/collection1/conf/solrconfig-auth-load.xml
index ed0304a..587f3a1 100644
--- a/solr/collection1/conf/solrconfig-auth-load.xml
+++ b/solr/collection1/conf/solrconfig-auth-load.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" ?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,12 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
diff --git a/solr/collection1/conf/solrconfig-auth-qparser.xml b/solr/collection1/conf/solrconfig-auth-qparser.xml
index edfae47..16caec9 100644
--- a/solr/collection1/conf/solrconfig-auth-qparser.xml
+++ b/solr/collection1/conf/solrconfig-auth-qparser.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" ?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,12 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
diff --git a/solr/collection1/conf/solrconfig-auth.xml b/solr/collection1/conf/solrconfig-auth.xml
index 106c2b6..c25e7c7 100644
--- a/solr/collection1/conf/solrconfig-auth.xml
+++ b/solr/collection1/conf/solrconfig-auth.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" ?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,12 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
diff --git a/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index ff505c3..5b0cb3f 100644
--- a/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -18,33 +18,17 @@
import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
-import org.apache.lucene.queries.*;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.QParser;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.StrUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ShardParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.handler.component.ResponseBuilder;
-import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.core.CloseHook;
-import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.solr.core.SolrCore;
-import org.apache.http.client.HttpClient;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpException;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.HttpResponse;
import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.util.EntityUtils;
import org.apache.http.impl.client.DefaultHttpClient;
diff --git a/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 11177e8..2c38152 100644
--- a/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -18,7 +18,6 @@
import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
-import org.apache.lucene.queries.*;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ShardParams;
@@ -29,14 +28,9 @@
import org.apache.solr.core.CloseHook;
import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.solr.core.SolrCore;
-import org.apache.http.client.HttpClient;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpException;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.HttpResponse;
import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.util.EntityUtils;
import org.apache.http.impl.client.DefaultHttpClient;
@@ -338,6 +332,7 @@
return "$URL$";
}
+ @Override
public void inform(SolrCore core)
{
core.addCloseHook(new CloseHandler());
