Repository: nifi Updated Branches: refs/heads/master 8e031c987 -> 4ab6e3cb3
NIFI-1219: Moved the kafka-tmp directory that gets created to the target directory; added missing license info to beginning of EmbeddedKafkaProducerHelper.java Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4ab6e3cb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4ab6e3cb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4ab6e3cb Branch: refs/heads/master Commit: 4ab6e3cb3fa3ca9aad2df1132d0820042c900b8a Parents: b043d04 Author: Mark Payne <[email protected]> Authored: Fri Jan 1 13:45:54 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Jan 1 13:48:22 2016 -0500 ---------------------------------------------------------------------- .../nifi/processors/kafka/test/EmbeddedKafka.java | 4 ++-- .../kafka/test/EmbeddedKafkaProducerHelper.java | 16 ++++++++++++++++ .../src/test/resources/server.properties | 2 +- .../src/test/resources/zookeeper.properties | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/4ab6e3cb/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java index ed39533..08f5aa7 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java @@ -108,7 +108,7 @@ public class EmbeddedKafka { } /** - * Will start embedded Kafka server. It's data directories will be created + * Will start embedded Kafka server. Its data directories will be created * at 'kafka-tmp' directory relative to the working directory of the current * runtime. The data directories will be deleted upon JVM exit. * @@ -147,7 +147,7 @@ public class EmbeddedKafka { * */ private void cleanupKafkaWorkDir() { - File kafkaTmp = new File("kafka-tmp"); + File kafkaTmp = new File("target/kafka-tmp"); try { FileUtils.deleteDirectory(kafkaTmp); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/nifi/blob/4ab6e3cb/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafkaProducerHelper.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafkaProducerHelper.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafkaProducerHelper.java index 8e3d296..0ed00fb 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafkaProducerHelper.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafkaProducerHelper.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.nifi.processors.kafka.test; import java.io.Closeable; http://git-wip-us.apache.org/repos/asf/nifi/blob/4ab6e3cb/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/server.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/server.properties b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/server.properties index a3d7414..9c44acc 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/server.properties +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/server.properties @@ -55,7 +55,7 @@ socket.request.max.bytes=104857600 ############################# Log Basics ############################# # A comma seperated list of directories under which to store log files -log.dirs=kafka-tmp/kafka-logs +log.dirs=target/kafka-tmp/kafka-logs # The default number of log partitions per topic. More partitions allow greater # parallelism for consumption, but this will also result in more files across http://git-wip-us.apache.org/repos/asf/nifi/blob/4ab6e3cb/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/zookeeper.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/zookeeper.properties b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/zookeeper.properties index 1cb0e68..df271df 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/zookeeper.properties +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/test/resources/zookeeper.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # the directory where the snapshot is stored. -dataDir=kafka-tmp/zookeeper +dataDir=target/kafka-tmp/zookeeper # the port at which the clients will connect #clientPort=2181 # disable the per-ip limit on the number of connections since this is a non-production config
