Author: kwright
Date: Sat Nov 21 12:37:25 2020
New Revision: 1883693
URL: http://svn.apache.org/viewvc?rev=1883693&view=rev
Log:
Pull up branch CONNECTORS-1653.
Added:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/
- copied from r1883692,
manifoldcf/branches/CONNECTORS-1653/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/
- copied from r1883692,
manifoldcf/branches/CONNECTORS-1653/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/
manifoldcf/trunk/connectors/solr/connector/src/main/resources/
- copied from r1883692,
manifoldcf/branches/CONNECTORS-1653/connectors/solr/connector/src/main/resources/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/solr/build.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1653:r1883684-1883692
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1883693&r1=1883692&r2=1883693&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Nov 21 12:37:25 2020
@@ -3,6 +3,12 @@ $Id$
======================= 2.18-dev =====================
+NOTICKET: Add missing Jetty JSP jar so crawler UI works in the examples.
+(Karl Wright)
+
+CONNECTORS-1653: Add contributed solr repository connector.
+(Olivier Tavard)
+
CONNECTORS-1655: Handle some forms of illegal content type.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1883693&r1=1883692&r2=1883693&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Nov 21 12:37:25 2020
@@ -1393,6 +1393,10 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-jetty">
<mkdir dir="lib"/>
<property name="jetty-package" value="org/eclipse/jetty"/>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="9.2.30.v20200428"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-jsp"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-client"/>
<param name="artifact-type" value="jar"/>
Modified: manifoldcf/trunk/connectors/solr/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/build.xml?rev=1883693&r1=1883692&r2=1883693&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/build.xml (original)
+++ manifoldcf/trunk/connectors/solr/build.xml Sat Nov 21 12:37:25 2020
@@ -90,6 +90,10 @@
<param name="connector-label" value="Solr"/>
<param name="connector-class"
value="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>
</antcall>
+ <antcall target="general-add-repository-connector">
+ <param name="connector-label" value="Solr"/>
+ <param name="connector-class"
value="org.apache.manifoldcf.crawler.connectors.solr.SolrIngesterConnector"/>
+ </antcall>
</target>
</project>
