Author: kwright
Date: Sat Oct 28 14:34:43 2023
New Revision: 1913408
URL: http://svn.apache.org/viewvc?rev=1913408&view=rev
Log:
Pull up fixes for Kafka and Solr connector tests
Modified:
manifoldcf/branches/release-2.26-branch/ (props changed)
manifoldcf/branches/release-2.26-branch/build.xml
manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml
manifoldcf/branches/release-2.26-branch/connectors/solr/build.xml
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
manifoldcf/branches/release-2.26-branch/connectors/solr/pom.xml
manifoldcf/branches/release-2.26-branch/framework/build.xml
manifoldcf/branches/release-2.26-branch/framework/buildfiles/connector-build.xml
Propchange: manifoldcf/branches/release-2.26-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1913330,1913407
Modified: manifoldcf/branches/release-2.26-branch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/build.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/build.xml (original)
+++ manifoldcf/branches/release-2.26-branch/build.xml Sat Oct 28 14:34:43 2023
@@ -2520,13 +2520,6 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="netty-handler"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven">
- <param name="target" value="lib"/>
- <param name="project-path" value="org/scala-lang/modules"/>
- <param name="artifact-version" value="1.0.2"/>
- <param name="artifact-name" value="scala-java8-compat_3"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
</target>
<target name="download-commons-exec">
Modified: manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
(original)
+++ manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml Sat Oct
28 14:34:43 2023
@@ -24,9 +24,9 @@
<property name="abs-dist" location="../../dist"/>
<condition property="mcf-dist" value="${abs-dist}">
<not>
- <isset property="env.MCFDISTPATH"/>
- </not>
- </condition>
+ <isset property="env.MCFDISTPATH"/>
+ </not>
+ </condition>
<import file="${mcf-dist}/connector-build.xml"/>
@@ -34,9 +34,9 @@
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
- <fileset dir="../../lib">
- <include name="kafka-clients*.jar"/>
- <include name="lz4*.jar"/>
+ <fileset dir="../../lib">
+ <include name="kafka-clients*.jar"/>
+ <include name="lz4*.jar"/>
<include name="snappy-java*.jar"/>
</fileset>
</path>
@@ -52,9 +52,9 @@
</copy>
</target>
- <target name="download-dependencies">
- <mkdir dir="test-materials"/>
- <antcall target="download-via-maven">
+ <target name="download-dependencies">
+ <mkdir dir="test-materials"/>
+ <antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="org/apache/kafka"/>
<param name="artifact-version" value="${kafka.version}"/>
@@ -111,9 +111,9 @@
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="org/apache/commons"/>
- <param name="artifact-version" value="3.4"/>
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/commons"/>
+ <param name="artifact-version" value="3.4"/>
<param name="artifact-name" value="commons-lang3"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -121,9 +121,9 @@
<param name="target" value="test-materials"/>
<param name="project-path" value="com/yammer/metrics"/>
<param name="artifact-version" value="2.2.0"/>
- <param name="artifact-name" value="metrics-core"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
+ <param name="artifact-name" value="metrics-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
<antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="org/scala-lang"/>
@@ -153,18 +153,25 @@
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="com/101tec"/>
- <param name="artifact-version" value="0.6"/>
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="com/101tec"/>
+ <param name="artifact-version" value="0.6"/>
<param name="artifact-name" value="zkclient"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/scala-lang/modules"/>
+ <param name="artifact-version" value="1.0.2"/>
+ <param name="artifact-name" value="scala-java8-compat_3"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-cleanup">
- <delete>
- <fileset dir="test-materials" excludes="README*.txt"/>
- </delete>
+ <delete>
+ <fileset dir="test-materials" excludes="README*.txt"/>
+ </delete>
</target>
<target name="calculate-testcode-condition">
@@ -172,13 +179,13 @@
</target>
<target name="pretest-warn" depends="calculate-testcode-condition"
unless="tests-present">
- <echo message="Need Kafka download in order to compile tests - run ant
make-deps"/>
- </target>
-
+ <echo message="Need Kafka download in order to compile tests - run ant
make-deps"/>
+ </target>
+
<path id="connector-test-classpath">
- <path refid="mcf-connector-build.connector-test-classpath"/>
- <fileset dir="../../lib">
- <include name="zookeeper*.jar"/>
+ <path refid="mcf-connector-build.connector-test-classpath"/>
+ <fileset dir="../../lib">
+ <include name="zookeeper*.jar"/>
<include name="kafka-clients*.jar"/>
<include name="lz4*.jar"/>
<include name="snappy-java*.jar"/>
@@ -186,7 +193,7 @@
</fileset>
<fileset dir="test-materials">
<include name="zkclient*.jar"/>
- <include name="commons-lang3*.jar"/>
+ <include name="commons-lang3*.jar"/>
<include name="metrics-core*.jar"/>
<include name="jopt-simple*.jar"/>
<include name="scala-library*.jar"/>
@@ -204,9 +211,9 @@
</fileset>
</path>
- <target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
- <antcall target="general-add-output-connector">
- <param name="connector-label" value="Kafka"/>
+ <target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
+ <antcall target="general-add-output-connector">
+ <param name="connector-label" value="Kafka"/>
<param name="connector-class"
value="org.apache.manifoldcf.agents.output.kafka.KafkaOutputConnector"/>
</antcall>
</target>
Modified: manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml (original)
+++ manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml Sat Oct 28
14:34:43 2023
@@ -218,9 +218,9 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-ui-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
@@ -233,8 +233,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -305,8 +305,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
+ <groupId>com.yammer.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
<version>2.2.0</version>
<scope>test</scope>
</dependency>
@@ -321,12 +321,12 @@
<artifactId>scala-java8-compat_3</artifactId>
<version>1.0.2</version>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mcf-agents</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <artifactId>mcf-agents</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -509,9 +509,9 @@
<version>${zookeeper.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: manifoldcf/branches/release-2.26-branch/connectors/solr/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/solr/build.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/solr/build.xml (original)
+++ manifoldcf/branches/release-2.26-branch/connectors/solr/build.xml Sat Oct
28 14:34:43 2023
@@ -86,6 +86,38 @@
</copy>
</target>
+ <target name="download-dependencies">
+ <mkdir dir="test-materials"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/eclipse/jetty/http2"/>
+ <param name="artifact-version" value="9.4.48.v20220622"/>
+ <param name="artifact-name" value="http2-server"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/eclipse/jetty/http2"/>
+ <param name="artifact-version" value="9.4.48.v20220622"/>
+ <param name="artifact-name" value="http2-common"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-cleanup">
+ <delete>
+ <fileset dir="test-materials" excludes="README*.txt"/>
+ </delete>
+ </target>
+
+ <path id="connector-test-classpath">
+ <path refid="mcf-connector-build.connector-test-classpath"/>
+ <fileset dir="test-materials">
+ <include name="http2-server*.jar"/>
+ <include name="http2-common*.jar"/>
+ </fileset>
+ </path>
+
<target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-output-connector">
<param name="connector-label" value="Solr"/>
Modified:
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
---
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
(original)
+++
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java
Sat Oct 28 14:34:43 2023
@@ -18,10 +18,14 @@
*/
package org.apache.manifoldcf.agents.output.solr.tests;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import javax.servlet.http.HttpServlet;
@@ -39,15 +43,27 @@ public class MockSolrService
public MockSolrService()
{
- server = new Server(new QueuedThreadPool(35));
- ServerConnector connector = new ServerConnector(server);
+ QueuedThreadPool qtp = new QueuedThreadPool();
+ qtp.setMaxThreads(35);
+ qtp.setIdleTimeout(60000);
+ qtp.setReservedThreads(0);
+ server = new Server(qtp);
+ server.manage(qtp);
+ server.setStopAtShutdown(true);
+
+ HttpConfiguration config = new HttpConfiguration();
+ ServerConnector connector = new ServerConnector(server, new
HttpConnectionFactory(config), new HTTP2CServerConnectionFactory(config));
+ connector.setReuseAddress(true);
+ connector.setIdleTimeout(60000);
connector.setPort(8188);
- server.addConnector(connector);
- servlet = new SolrServlet();
- ServletContextHandler context = new
ServletContextHandler(ServletContextHandler.SESSIONS);
+ server.setConnectors(new Connector[] {connector});
+
+ // Initialize the servlets
+ final ServletContextHandler context = new
ServletContextHandler(ServletContextHandler.SESSIONS);
context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none");
- context.setContextPath("/solr");
+ context.setContextPath("/solr/collection1");
server.setHandler(context);
+ servlet = new SolrServlet();
context.addServlet(new ServletHolder(servlet), "/*");
}
Modified:
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
---
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
(original)
+++
manifoldcf/branches/release-2.26-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
Sat Oct 28 14:34:43 2023
@@ -68,10 +68,12 @@ public class SolrTester
configParams.setParameter(SolrConfig.PARAM_SERVER,"localhost");
configParams.setParameter(SolrConfig.PARAM_PORT,"8188");
configParams.setParameter(SolrConfig.PARAM_WEBAPPNAME,"solr");
+ configParams.setParameter(SolrConfig.PARAM_COLLECTION,"collection1");
configParams.setParameter(SolrConfig.PARAM_UPDATEPATH,"/update/extract");
configParams.setParameter(SolrConfig.PARAM_REMOVEPATH,"/update");
configParams.setParameter(SolrConfig.PARAM_STATUSPATH,"/admin/ping");
configParams.setParameter(SolrConfig.PARAM_IDFIELD,"id");
+ configParams.setParameter(SolrConfig.PARAM_COMMITS,"true");
// Now, save
outputMgr.save(outputConn);
Modified: manifoldcf/branches/release-2.26-branch/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/solr/pom.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/release-2.26-branch/connectors/solr/pom.xml Sat Oct 28
14:34:43 2023
@@ -398,6 +398,16 @@
<version>${glassfish.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-common</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: manifoldcf/branches/release-2.26-branch/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/framework/build.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.26-branch/framework/build.xml Sat Oct 28
14:34:43 2023
@@ -44,7 +44,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="metrics-core*.jar" />
<include name="snappy-java*.jar" />
<include name="json-simple*.jar"/>
@@ -526,7 +525,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -577,7 +575,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -634,7 +631,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -686,7 +682,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -745,7 +740,6 @@
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -811,7 +805,6 @@
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -885,7 +878,6 @@
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -951,7 +943,6 @@
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -1086,7 +1077,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -1338,7 +1328,6 @@
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="slf4j-api*.jar"/>
<include name="slf4j-simple*.jar"/>
<include name="log4j-1.2.*.jar"/>
@@ -1381,7 +1370,6 @@
<include name="jna*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="javax.activation*.jar"/>
@@ -1693,7 +1681,6 @@
<include name="kafka*.jar"/>
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="bcmail-jdk15*.jar"/>
<include name="bcutil-jdk15*.jar"/>
<include name="bcprov-jdk15*.jar"/>
Modified:
manifoldcf/branches/release-2.26-branch/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/framework/buildfiles/connector-build.xml?rev=1913408&r1=1913407&r2=1913408&view=diff
==============================================================================
---
manifoldcf/branches/release-2.26-branch/framework/buildfiles/connector-build.xml
(original)
+++
manifoldcf/branches/release-2.26-branch/framework/buildfiles/connector-build.xml
Sat Oct 28 14:34:43 2023
@@ -117,7 +117,6 @@
<fileset dir="${mcf-dist}/lib">
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
- <include name="scala-java8-compat_3*.jar"/>
<include name="javax.mail*.jar"/>
<include name="commons-exec*.jar"/>
<include name="guava*.jar"/>
