manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iori...@apache.org
Subject svn commit: r1583745 - in /manifoldcf/integration/solr-4.x/branches/CONNECTORS-914: solr/collection1/conf/ src/main/java/org/apache/solr/mcf/
Date Tue, 01 Apr 2014 17:49:36 GMT
Author: iorixxx
Date: Tue Apr  1 17:49:36 2014
New Revision: 1583745

URL: http://svn.apache.org/r1583745
Log:
cosmetics : tidy up schema.xml solrconfig.xml files, add missing override, remove unused imports

Modified:
    manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-load.xml
    manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-qparser.xml
    manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth.xml
    manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

Modified: manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-load.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-load.xml?rev=1583745&r1=1583744&r2=1583745&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-load.xml
(original)
+++ manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-load.xml
Tue Apr  1 17:49:36 2014
@@ -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>

Modified: manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-qparser.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-qparser.xml?rev=1583745&r1=1583744&r2=1583745&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-qparser.xml
(original)
+++ manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth-qparser.xml
Tue Apr  1 17:49:36 2014
@@ -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>

Modified: manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth.xml?rev=1583745&r1=1583744&r2=1583745&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth.xml
(original)
+++ manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/solr/collection1/conf/solrconfig-auth.xml
Tue Apr  1 17:49:36 2014
@@ -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>

Modified: manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1583745&r1=1583744&r2=1583745&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
(original)
+++ manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
Tue Apr  1 17:49:36 2014
@@ -18,33 +18,17 @@ package org.apache.solr.mcf;
 
 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;

Modified: manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1583745&r1=1583744&r2=1583745&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(original)
+++ manifoldcf/integration/solr-4.x/branches/CONNECTORS-914/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Tue Apr  1 17:49:36 2014
@@ -18,7 +18,6 @@ package org.apache.solr.mcf;
 
 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.handler.component
 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 @@ public class ManifoldCFSearchComponent e
     return "$URL$";
   }
 
+  @Override
   public void inform(SolrCore core)
   {
     core.addCloseHook(new CloseHandler());



Mime
View raw message