You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by sh...@apache.org on 2017/09/20 23:11:16 UTC
svn commit: r1809102 - in /manifoldcf/integration/solr-7.x/trunk:
CHANGES.txt DEPENDENCIES.txt NOTICE.txt README.txt pom.xml
src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Author: shinichiro
Date: Wed Sep 20 23:11:15 2017
New Revision: 1809102
URL: http://svn.apache.org/viewvc?rev=1809102&view=rev
Log:
Fix for CONNECTORS-1443
Modified:
manifoldcf/integration/solr-7.x/trunk/CHANGES.txt
manifoldcf/integration/solr-7.x/trunk/DEPENDENCIES.txt
manifoldcf/integration/solr-7.x/trunk/NOTICE.txt
manifoldcf/integration/solr-7.x/trunk/README.txt
manifoldcf/integration/solr-7.x/trunk/pom.xml
manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Modified: manifoldcf/integration/solr-7.x/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/CHANGES.txt?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-7.x/trunk/CHANGES.txt Wed Sep 20 23:11:15 2017
@@ -1,8 +1,11 @@
-Apache ManifoldCF Plugin for Apache Solr 6.x change Log
+Apache ManifoldCF Plugin for Apache Solr 7.x change Log
$Id$
======================= 2.3-dev ======================
+CONNECTORS-1443: Upgrade to SolrJ 7.0.0.
+(Shinichiro Abe)
+
CONNECTORS-1338: Upgrade to SolrJ 6.3.0.
(Shinichiro Abe)
Modified: manifoldcf/integration/solr-7.x/trunk/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/DEPENDENCIES.txt?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/DEPENDENCIES.txt (original)
+++ manifoldcf/integration/solr-7.x/trunk/DEPENDENCIES.txt Wed Sep 20 23:11:15 2017
@@ -1,9 +1,9 @@
-Apache ManifoldCF Plugin for Apache Solr 6.x requires
+Apache ManifoldCF Plugin for Apache Solr 7.x requires
---------------------------------------------------
* JRE 1.8 or above
* mvn 3.0 or higher
-For building and running Apache ManifoldCF Plugin for Apache Solr 6.x:
+For building and running Apache ManifoldCF Plugin for Apache Solr 7.x:
------------------------------------------------------------------
* Look at README.txt
Modified: manifoldcf/integration/solr-7.x/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/NOTICE.txt?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/NOTICE.txt (original)
+++ manifoldcf/integration/solr-7.x/trunk/NOTICE.txt Wed Sep 20 23:11:15 2017
@@ -1,4 +1,4 @@
-Apache ManifoldCF Plugin for Apache Solr 6.x
+Apache ManifoldCF Plugin for Apache Solr 7.x
Copyright 2010-2017 The Apache Software Foundation
This product includes software developed by
Modified: manifoldcf/integration/solr-7.x/trunk/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/README.txt?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/README.txt (original)
+++ manifoldcf/integration/solr-7.x/trunk/README.txt Wed Sep 20 23:11:15 2017
@@ -22,7 +22,7 @@ above. It is backwards compatible with
that two additional Solr fields are required for this plugin to work.
-Instructions for Building Apache ManifoldCF Plugin for Apache Solr 6.x from Source
+Instructions for Building Apache ManifoldCF Plugin for Apache Solr 7.x from Source
------------------------------------------------------------------------------
1. Download the Java SE 8 JDK (Java Development Kit), or greater, from
@@ -42,7 +42,7 @@ Instructions for Building Apache Manifol
The JAR package can be found in the target folder:
- target/apache-manifoldcf-solr-6.x-plugin-<VERSION>.jar where <VERSION> is the release version
+ target/apache-manifoldcf-solr-7.x-plugin-<VERSION>.jar where <VERSION> is the release version
Getting Started
@@ -59,7 +59,7 @@ index. Depending on your schemaFactory s
use either the schema.xml file for 'ClassicIndexSchemaFactory' or the schema
API for 'ManagedIndexSchemaFactory'.
See section 'Managed Schema Definition in SolrConfig' in the Solr Reference Gude
-https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-6.0.pdf
+https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.0.pdf
For schema.xml simply add the following field definitions to the <schema>
section:
@@ -191,7 +191,7 @@ you will still need to use this Solr com
Licensing
---------
-Apache ManifoldCF Plugin for Apache Solr 6.x is licensed under the
+Apache ManifoldCF Plugin for Apache Solr 7.x is licensed under the
Apache License 2.0. See the files called LICENSE.txt and NOTICE.txt
for more information.
@@ -220,7 +220,7 @@ code and source code.
The following provides more details on the included software that
may be subject to export controls on cryptographic software:
- The Apache ManifoldCF Solr 6.x Plugin does not include any
+ The Apache ManifoldCF Solr 7.x Plugin does not include any
implementation or usage of cryptographic software at this time.
Contact
Modified: manifoldcf/integration/solr-7.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/pom.xml?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/pom.xml (original)
+++ manifoldcf/integration/solr-7.x/trunk/pom.xml Wed Sep 20 23:11:15 2017
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.manifoldcf.solr</groupId>
- <name>ManifoldCF Solr 6.x Plugin</name>
- <artifactId>apache-manifoldcf-solr-6.x-plugin</artifactId>
+ <name>ManifoldCF Solr 7.x Plugin</name>
+ <artifactId>apache-manifoldcf-solr-7.x-plugin</artifactId>
<version>2.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>ManifoldCF Plugin for Apache Solr 6.x</description>
- <inceptionYear>2016</inceptionYear>
+ <description>ManifoldCF Plugin for Apache Solr 7.x</description>
+ <inceptionYear>2017</inceptionYear>
<organization>
<name>The Apache Software Foundation</name>
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <solr.version>6.3.0</solr.version>
+ <solr.version>7.0.0</solr.version>
</properties>
<dependencies>
Modified: manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Wed Sep 20 23:11:15 2017
@@ -127,6 +127,7 @@ public class ManifoldCFQParserPlugin ext
httpConnectionManager = new PoolingHttpClientConnectionManager();
httpConnectionManager.setMaxTotal(poolSize);
httpConnectionManager.setDefaultMaxPerRoute(poolSize);
+ httpConnectionManager.setValidateAfterInactivity(2000);
httpConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeOut)
@@ -135,7 +136,6 @@ public class ManifoldCFQParserPlugin ext
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
.setSocketTimeout(socketTimeOut)
- .setStaleConnectionCheckEnabled(true)
.setExpectContinueEnabled(true)
.setConnectTimeout(connectionTimeOut)
.setConnectionRequestTimeout(socketTimeOut);
Modified: manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1809102&r1=1809101&r2=1809102&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ manifoldcf/integration/solr-7.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Wed Sep 20 23:11:15 2017
@@ -131,6 +131,7 @@ public class ManifoldCFSearchComponent e
httpConnectionManager = new PoolingHttpClientConnectionManager();
httpConnectionManager.setMaxTotal(poolSize);
httpConnectionManager.setDefaultMaxPerRoute(poolSize);
+ httpConnectionManager.setValidateAfterInactivity(2000);
httpConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
.setTcpNoDelay(true)
.setSoTimeout(socketTimeOut)
@@ -139,7 +140,6 @@ public class ManifoldCFSearchComponent e
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
.setSocketTimeout(socketTimeOut)
- .setStaleConnectionCheckEnabled(true)
.setExpectContinueEnabled(true)
.setConnectTimeout(connectionTimeOut)
.setConnectionRequestTimeout(socketTimeOut);
@@ -334,21 +334,9 @@ public class ManifoldCFSearchComponent e
}
@Override
- public String getVersion()
- {
- return "$Revision$";
- }
-
- @Override
public Category getCategory()
{
- return Category.QUERYHANDLER;
- }
-
- @Override
- public String getSource()
- {
- return "$URL$";
+ return Category.QUERY;
}
@Override