Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 84BA2200C29 for ; Tue, 28 Feb 2017 08:13:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 83679160B7C; Tue, 28 Feb 2017 07:13:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A52E1160B6A for ; Tue, 28 Feb 2017 08:13:32 +0100 (CET) Received: (qmail 30741 invoked by uid 500); 28 Feb 2017 07:13:31 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 30732 invoked by uid 99); 28 Feb 2017 07:13:31 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2017 07:13:31 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id EC8B03A3C4B for ; Tue, 28 Feb 2017 07:13:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1784693 - in /manifoldcf/trunk/connectors/kafka/connector/src: main/resources/org/apache/manifoldcf/agents/output/kafka/ test/java/org/apache/manifoldcf/agents/output/kafka/ Date: Tue, 28 Feb 2017 07:13:30 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170228071330.EC8B03A3C4B@svn01-us-west.apache.org> archived-at: Tue, 28 Feb 2017 07:13:33 -0000 Author: kwright Date: Tue Feb 28 07:13:30 2017 New Revision: 1784693 URL: http://svn.apache.org/viewvc?rev=1784693&view=rev Log: Fix for CONNECTORS-1391. Modified: manifoldcf/trunk/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java Modified: manifoldcf/trunk/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html?rev=1784693&r1=1784692&r2=1784693&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html (original) +++ manifoldcf/trunk/connectors/kafka/connector/src/main/resources/org/apache/manifoldcf/agents/output/kafka/viewConfiguration.html Tue Feb 28 07:13:30 2017 @@ -16,17 +16,16 @@ --> - - + - - + + - - - + + + - - + +
$Encoder.bodyEscape($ResourceBundle.getString('KafkaConnector.IPColon')) - +
$Encoder.bodyEscape($ResourceBundle.getString('KafkaConnector.IPColon')) $Encoder.bodyEscape($IP)
$Encoder.bodyEscape($ResourceBundle.getString('KafkaConnector.PortColon'))$Encoder.bodyEscape($PORT)
$Encoder.bodyEscape($PORT)
$Encoder.bodyEscape($ResourceBundle.getString('KafkaConnector.TopicColon'))$Encoder.bodyEscape($TOPIC)
$Encoder.bodyEscape($TOPIC)
\ No newline at end of file Modified: manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java?rev=1784693&r1=1784692&r2=1784693&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java (original) +++ manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java Tue Feb 28 07:13:30 2017 @@ -26,7 +26,7 @@ import org.junit.Before; public class BaseITHSQLDB extends org.apache.manifoldcf.crawler.tests.BaseITHSQLDB { - static KafkaLocal kafka; + KafkaLocal kafka; protected String[] getConnectorNames() { return new String[]{"CMIS"}; Modified: manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java?rev=1784693&r1=1784692&r2=1784693&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java (original) +++ manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseUIHSQLDB.java Tue Feb 28 07:13:30 2017 @@ -17,8 +17,17 @@ package org.apache.manifoldcf.agents.output.kafka; +import java.io.File; + +import java.util.Properties; +import org.junit.After; +import static org.junit.Assert.fail; +import org.junit.Before; + public class BaseUIHSQLDB extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIHSQLDB { + KafkaLocal kafka; + protected String[] getConnectorNames() { return new String[]{"Test Connector"}; } @@ -35,4 +44,52 @@ public class BaseUIHSQLDB extends org.ap return new String[]{"org.apache.manifoldcf.agents.output.kafka.KafkaOutputConnector"}; } + @Before + public void setupKafka() + throws Exception { + Properties kafkaProperties = new Properties(); + Properties zkProperties = new Properties(); + + String tmpDir = System.getProperty("java.io.tmpdir"); + File logDir = new File(tmpDir, "kafka-logs"); + logDir.mkdir(); + File zookeeperDir = new File(tmpDir, "zookeeper"); + zookeeperDir.mkdir(); + + //load properties + kafkaProperties.put("broker.id", "0"); + kafkaProperties.put("port", "9092"); + kafkaProperties.put("num.network.threads", "3"); + kafkaProperties.put("num.io.threads", "8"); + kafkaProperties.put("socket.send.buffer.bytes", "102400"); + kafkaProperties.put("socket.receive.buffer.bytes", "102400"); + kafkaProperties.put("socket.request.max.bytes", "104857600"); + kafkaProperties.put("log.dirs", logDir.getAbsolutePath()); + kafkaProperties.put("num.partitions", "1"); + kafkaProperties.put("num.recovery.threads.per.data.dir", "1"); + kafkaProperties.put("log.retention.hours", "168"); + kafkaProperties.put("log.segment.bytes", "1073741824"); + kafkaProperties.put("log.retention.check.interval.ms", "300000"); + kafkaProperties.put("log.cleaner.enable", "false"); + kafkaProperties.put("zookeeper.connect", "localhost:2181"); + kafkaProperties.put("zookeeper.connection.timeout.ms", "6000"); + + zkProperties.put("dataDir", zookeeperDir.getAbsolutePath()); + zkProperties.put("clientPort", "2181"); + zkProperties.put("maxClientCnxns", "0"); + + //kafkaProperties.load(Class.class.getResourceAsStream("/kafkalocal.properties")); + //zkProperties.load(Class.class.getResourceAsStream("/zklocal.properties")); + System.out.println("Kafka is starting..."); + + //start kafka + kafka = new KafkaLocal(kafkaProperties, zkProperties); + Thread.sleep(5000); + } + + @After + public void cleanUpKafka() { + kafka.stop(); + } + } Modified: manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java?rev=1784693&r1=1784692&r2=1784693&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java Tue Feb 28 07:13:30 2017 @@ -26,7 +26,6 @@ import org.junit.Ignore; public class NavigationHSQLDBUI extends BaseUIHSQLDB { @Test - @Ignore public void createConnectionsAndJob() throws Exception { testerInstance.newTest(Locale.US);