diff -Nru kafka-2.9.2-0.8.2.0/bin/connect-distributed.sh kafka-2.11-0.9.0.1/bin/connect-distributed.sh --- kafka-2.9.2-0.8.2.0/bin/connect-distributed.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/connect-distributed.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh +# 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. + +base_dir=$(dirname $0) + +if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then + export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/connect-log4j.properties" +fi + +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.connect.cli.ConnectDistributed "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/connect-standalone.sh kafka-2.11-0.9.0.1/bin/connect-standalone.sh --- kafka-2.9.2-0.8.2.0/bin/connect-standalone.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/connect-standalone.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh +# 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. + +base_dir=$(dirname $0) + +if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then + export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/connect-log4j.properties" +fi + +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.connect.cli.ConnectStandalone "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-acls.sh kafka-2.11-0.9.0.1/bin/kafka-acls.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-acls.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-acls.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,17 @@ +#!/bin/bash +# 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. + +exec $(dirname $0)/kafka-run-class.sh kafka.admin.AclCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-configs.sh kafka-2.11-0.9.0.1/bin/kafka-configs.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-configs.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-configs.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,17 @@ +#!/bin/bash +# 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. + +exec $(dirname $0)/kafka-run-class.sh kafka.admin.ConfigCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-console-consumer.sh kafka-2.11-0.9.0.1/bin/kafka-console-consumer.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-console-consumer.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-console-consumer.sh 2016-02-12 00:37:25.000000000 +0000 @@ -18,4 +18,4 @@ export KAFKA_HEAP_OPTS="-Xmx512M" fi -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleConsumer $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleConsumer "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-console-producer.sh kafka-2.11-0.9.0.1/bin/kafka-console-producer.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-console-producer.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-console-producer.sh 2016-02-12 00:37:25.000000000 +0000 @@ -17,4 +17,4 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then export KAFKA_HEAP_OPTS="-Xmx512M" fi -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleProducer $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleProducer "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-consumer-groups.sh kafka-2.11-0.9.0.1/bin/kafka-consumer-groups.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-consumer-groups.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-consumer-groups.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,17 @@ +#!/bin/bash +# 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. + +exec $(dirname $0)/kafka-run-class.sh kafka.admin.ConsumerGroupCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-consumer-offset-checker.sh kafka-2.11-0.9.0.1/bin/kafka-consumer-offset-checker.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-consumer-offset-checker.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-consumer-offset-checker.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsumerOffsetChecker $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsumerOffsetChecker "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-consumer-perf-test.sh kafka-2.11-0.9.0.1/bin/kafka-consumer-perf-test.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-consumer-perf-test.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-consumer-perf-test.sh 2016-02-12 00:37:25.000000000 +0000 @@ -17,4 +17,4 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then export KAFKA_HEAP_OPTS="-Xmx512M" fi -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsumerPerformance $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsumerPerformance "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-mirror-maker.sh kafka-2.11-0.9.0.1/bin/kafka-mirror-maker.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-mirror-maker.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-mirror-maker.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.tools.MirrorMaker $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.MirrorMaker "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-preferred-replica-election.sh kafka-2.11-0.9.0.1/bin/kafka-preferred-replica-election.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-preferred-replica-election.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-preferred-replica-election.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.admin.PreferredReplicaLeaderElectionCommand $@ +exec $(dirname $0)/kafka-run-class.sh kafka.admin.PreferredReplicaLeaderElectionCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-producer-perf-test.sh kafka-2.11-0.9.0.1/bin/kafka-producer-perf-test.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-producer-perf-test.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-producer-perf-test.sh 2016-02-12 00:37:25.000000000 +0000 @@ -17,4 +17,4 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then export KAFKA_HEAP_OPTS="-Xmx512M" fi -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ProducerPerformance $@ +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.ProducerPerformance "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-reassign-partitions.sh kafka-2.11-0.9.0.1/bin/kafka-reassign-partitions.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-reassign-partitions.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-reassign-partitions.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.admin.ReassignPartitionsCommand $@ +exec $(dirname $0)/kafka-run-class.sh kafka.admin.ReassignPartitionsCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-replay-log-producer.sh kafka-2.11-0.9.0.1/bin/kafka-replay-log-producer.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-replay-log-producer.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-replay-log-producer.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplayLogProducer $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplayLogProducer "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-replica-verification.sh kafka-2.11-0.9.0.1/bin/kafka-replica-verification.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-replica-verification.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-replica-verification.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplicaVerificationTool $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplicaVerificationTool "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-run-class.sh kafka-2.11-0.9.0.1/bin/kafka-run-class.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-run-class.sh 2015-01-29 04:22:30.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-run-class.sh 2016-02-12 00:38:00.000000000 +0000 @@ -22,17 +22,8 @@ base_dir=$(dirname $0)/.. -# create logs directory -if [ "x$LOG_DIR" = "x" ]; then - LOG_DIR="$base_dir/logs" -fi - -if [ ! -d "$LOG_DIR" ]; then - mkdir -p "$LOG_DIR" -fi - if [ -z "$SCALA_VERSION" ]; then - SCALA_VERSION=2.10.4 + SCALA_VERSION=2.10.5 fi if [ -z "$SCALA_BINARY_VERSION" ]; then @@ -40,9 +31,10 @@ fi # run ./gradlew copyDependantLibs to get all dependant jars in a local dir -for file in $base_dir/core/build/dependant-libs-${SCALA_VERSION}*/*.jar; +shopt -s nullglob +for dir in $base_dir/core/build/dependant-libs-${SCALA_VERSION}*; do - CLASSPATH=$CLASSPATH:$file + CLASSPATH=$CLASSPATH:$dir/* done for file in $base_dir/examples/build/libs//kafka-examples*.jar; @@ -50,31 +42,40 @@ CLASSPATH=$CLASSPATH:$file done -for file in $base_dir/contrib/hadoop-consumer/build/libs//kafka-hadoop-consumer*.jar; +for file in $base_dir/clients/build/libs/kafka-clients*.jar; do CLASSPATH=$CLASSPATH:$file done -for file in $base_dir/contrib/hadoop-producer/build/libs//kafka-hadoop-producer*.jar; +for file in $base_dir/tools/build/libs/kafka-tools*.jar; do CLASSPATH=$CLASSPATH:$file done -for file in $base_dir/clients/build/libs/kafka-clients*.jar; +for dir in $base_dir/tools/build/dependant-libs-${SCALA_VERSION}*; do - CLASSPATH=$CLASSPATH:$file + CLASSPATH=$CLASSPATH:$dir/* done -# classpath addition for release -for file in $base_dir/libs/*.jar; +for cc_pkg in "api" "runtime" "file" "json" do - CLASSPATH=$CLASSPATH:$file + for file in $base_dir/connect/${cc_pkg}/build/libs/connect-${cc_pkg}*.jar; + do + CLASSPATH=$CLASSPATH:$file + done + if [ -d "$base_dir/connect/${cc_pkg}/build/dependant-libs" ] ; then + CLASSPATH=$CLASSPATH:$base_dir/connect/${cc_pkg}/build/dependant-libs/* + fi done +# classpath addition for release +CLASSPATH=$CLASSPATH:$base_dir/libs/* + for file in $base_dir/core/build/libs/kafka_${SCALA_BINARY_VERSION}*.jar; do CLASSPATH=$CLASSPATH:$file done +shopt -u nullglob # JMX settings if [ -z "$KAFKA_JMX_OPTS" ]; then @@ -86,9 +87,20 @@ KAFKA_JMX_OPTS="$KAFKA_JMX_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT " fi +# Log directory to use +if [ "x$LOG_DIR" = "x" ]; then + LOG_DIR="$base_dir/logs" +fi + # Log4j settings if [ -z "$KAFKA_LOG4J_OPTS" ]; then + # Log to console. This is a tool. KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/config/tools-log4j.properties" +else + # create logs directory + if [ ! -d "$LOG_DIR" ]; then + mkdir -p "$LOG_DIR" + fi fi KAFKA_LOG4J_OPTS="-Dkafka.logs.dir=$LOG_DIR $KAFKA_LOG4J_OPTS" @@ -112,7 +124,7 @@ # JVM performance options if [ -z "$KAFKA_JVM_PERFORMANCE_OPTS" ]; then - KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC -Djava.awt.headless=true" + KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+DisableExplicitGC -Djava.awt.headless=true" fi @@ -125,7 +137,7 @@ shift 2 ;; -loggc) - if [ -z "$KAFKA_GC_LOG_OPTS"] ; then + if [ -z "$KAFKA_GC_LOG_OPTS" ]; then GC_LOG_ENABLED="true" fi shift diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-server-start.sh kafka-2.11-0.9.0.1/bin/kafka-server-start.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-server-start.sh 2015-01-29 04:22:30.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-server-start.sh 2016-02-12 00:37:25.000000000 +0000 @@ -16,7 +16,7 @@ if [ $# -lt 1 ]; then - echo "USAGE: $0 [-daemon] server.properties" + echo "USAGE: $0 [-daemon] server.properties [--override property=value]*" exit 1 fi base_dir=$(dirname $0) @@ -41,4 +41,4 @@ ;; esac -exec $base_dir/kafka-run-class.sh $EXTRA_ARGS kafka.Kafka $@ +exec $base_dir/kafka-run-class.sh $EXTRA_ARGS kafka.Kafka "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-simple-consumer-shell.sh kafka-2.11-0.9.0.1/bin/kafka-simple-consumer-shell.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-simple-consumer-shell.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-simple-consumer-shell.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.tools.SimpleConsumerShell $@ +exec $(dirname $0)/kafka-run-class.sh kafka.tools.SimpleConsumerShell "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-topics.sh kafka-2.11-0.9.0.1/bin/kafka-topics.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-topics.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-topics.sh 2016-02-12 00:37:25.000000000 +0000 @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec $(dirname $0)/kafka-run-class.sh kafka.admin.TopicCommand $@ +exec $(dirname $0)/kafka-run-class.sh kafka.admin.TopicCommand "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-verifiable-consumer.sh kafka-2.11-0.9.0.1/bin/kafka-verifiable-consumer.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-verifiable-consumer.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-verifiable-consumer.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/bash +# 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. + +if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then + export KAFKA_HEAP_OPTS="-Xmx512M" +fi +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.VerifiableConsumer "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/kafka-verifiable-producer.sh kafka-2.11-0.9.0.1/bin/kafka-verifiable-producer.sh --- kafka-2.9.2-0.8.2.0/bin/kafka-verifiable-producer.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/kafka-verifiable-producer.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/bash +# 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. + +if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then + export KAFKA_HEAP_OPTS="-Xmx512M" +fi +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.VerifiableProducer "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/windows/kafka-acls.bat kafka-2.11-0.9.0.1/bin/windows/kafka-acls.bat --- kafka-2.9.2-0.8.2.0/bin/windows/kafka-acls.bat 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/windows/kafka-acls.bat 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,17 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +%~dp0kafka-run-class.bat kafka.admin.AclCommand %* diff -Nru kafka-2.9.2-0.8.2.0/bin/windows/kafka-producer-perf-test.bat kafka-2.11-0.9.0.1/bin/windows/kafka-producer-perf-test.bat --- kafka-2.9.2-0.8.2.0/bin/windows/kafka-producer-perf-test.bat 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/windows/kafka-producer-perf-test.bat 2016-02-12 00:37:25.000000000 +0000 @@ -16,5 +16,5 @@ SetLocal set KAFKA_HEAP_OPTS=-Xmx512M -%~dp0kafka-run-class.bat kafka.tools.ProducerPerformance %* +%~dp0kafka-run-class.bat org.apache.kafka.tools.ProducerPerformance %* EndLocal diff -Nru kafka-2.9.2-0.8.2.0/bin/windows/kafka-run-class.bat kafka-2.11-0.9.0.1/bin/windows/kafka-run-class.bat --- kafka-2.9.2-0.8.2.0/bin/windows/kafka-run-class.bat 2015-01-29 04:22:30.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/windows/kafka-run-class.bat 2016-02-12 00:38:00.000000000 +0000 @@ -1,133 +1,123 @@ -@echo off -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -setlocal enabledelayedexpansion - -IF [%1] EQU [] ( - echo USAGE: %0 classname [opts] - EXIT /B 1 -) - -rem Using pushd popd to set BASE_DIR to the absolute path -pushd %~dp0..\.. -set BASE_DIR=%CD% -popd -set CLASSPATH= - -IF ["%SCALA_VERSION%"] EQU [""] ( - set SCALA_VERSION=2.10.4 -) - -IF ["%SCALA_BINARY_VERSION%"] EQU [""] ( - set SCALA_BINARY_VERSION=2.10 -) - -rem Classpath addition for kafka-core dependencies -for %%i in (%BASE_DIR%\core\build\dependant-libs-%SCALA_VERSION%\*.jar) do ( - call :concat %%i -) - -rem Classpath addition for kafka-perf dependencies -for %%i in (%BASE_DIR%\perf\build\dependant-libs-%SCALA_VERSION%\*.jar) do ( - call :concat %%i -) - -rem Classpath addition for kafka-clients -for %%i in (%BASE_DIR%\clients\build\libs\kafka-clients-*.jar) do ( - call :concat %%i -) - -rem Classpath addition for kafka-examples -for %%i in (%BASE_DIR%\examples\build\libs\kafka-examples-*.jar) do ( - call :concat %%i -) - -rem Classpath addition for contrib/hadoop-consumer -for %%i in (%BASE_DIR%\contrib\hadoop-consumer\build\libs\kafka-hadoop-consumer-*.jar) do ( - call :concat %%i -) - -rem Classpath addition for contrib/hadoop-producer -for %%i in (%BASE_DIR%\contrib\hadoop-producer\build\libs\kafka-hadoop-producer-*.jar) do ( - call :concat %%i -) - -rem Classpath addition for release -for %%i in (%BASE_DIR%\libs\*.jar) do ( - call :concat %%i -) - -rem Classpath addition for core -for %%i in (%BASE_DIR%\core\build\libs\kafka_%SCALA_BINARY_VERSION%*.jar) do ( - call :concat %%i -) - -rem JMX settings -IF ["%KAFKA_JMX_OPTS%"] EQU [""] ( - set KAFKA_JMX_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -) - -rem JMX port to use -IF ["%JMX_PORT%"] NEQ [""] ( - set KAFKA_JMX_OPTS=%KAFKA_JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT% -) - -rem Log4j settings -IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] ( - set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/tools-log4j.properties -) - -rem Generic jvm settings you want to add -IF ["%KAFKA_OPTS%"] EQU [""] ( - set KAFKA_OPTS= -) - -rem Which java to use -IF ["%JAVA_HOME%"] EQU [""] ( - set JAVA=java -) ELSE ( - set JAVA="%JAVA_HOME%/bin/java" -) - -rem Memory options -IF ["%KAFKA_HEAP_OPTS%"] EQU [""] ( - set KAFKA_HEAP_OPTS=-Xmx256M -) - -rem JVM performance options -IF ["%KAFKA_JVM_PERFORMANCE_OPTS%"] EQU [""] ( - set KAFKA_JVM_PERFORMANCE_OPTS=-server -XX:+UseCompressedOops -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC -Djava.awt.headless=true -) - -IF ["%CLASSPATH%"] EQU [""] ( - echo Classpath is empty. Please build the project first e.g. by running 'gradlew jarAll' - EXIT /B 2 -) - -set COMMAND=%JAVA% %KAFKA_HEAP_OPTS% %KAFKA_JVM_PERFORMANCE_OPTS% %KAFKA_JMX_OPTS% %KAFKA_LOG4J_OPTS% -cp %CLASSPATH% %KAFKA_OPTS% %* -rem echo. -rem echo %COMMAND% -rem echo. - -%COMMAND% - -goto :eof -:concat -IF ["%CLASSPATH%"] EQU [""] ( - set CLASSPATH="%1" -) ELSE ( - set CLASSPATH=%CLASSPATH%;"%1" -) +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +setlocal enabledelayedexpansion + +IF [%1] EQU [] ( + echo USAGE: %0 classname [opts] + EXIT /B 1 +) + +rem Using pushd popd to set BASE_DIR to the absolute path +pushd %~dp0..\.. +set BASE_DIR=%CD% +popd +set CLASSPATH= + +IF ["%SCALA_VERSION%"] EQU [""] ( + set SCALA_VERSION=2.10.5 +) + +IF ["%SCALA_BINARY_VERSION%"] EQU [""] ( + set SCALA_BINARY_VERSION=2.10 +) + +rem Classpath addition for kafka-core dependencies +for %%i in (%BASE_DIR%\core\build\dependant-libs-%SCALA_VERSION%\*.jar) do ( + call :concat %%i +) + +rem Classpath addition for kafka-perf dependencies +for %%i in (%BASE_DIR%\perf\build\dependant-libs-%SCALA_VERSION%\*.jar) do ( + call :concat %%i +) + +rem Classpath addition for kafka-clients +for %%i in (%BASE_DIR%\clients\build\libs\kafka-clients-*.jar) do ( + call :concat %%i +) + +rem Classpath addition for kafka-examples +for %%i in (%BASE_DIR%\examples\build\libs\kafka-examples-*.jar) do ( + call :concat %%i +) + +rem Classpath addition for release +for %%i in (%BASE_DIR%\libs\*.jar) do ( + call :concat %%i +) + +rem Classpath addition for core +for %%i in (%BASE_DIR%\core\build\libs\kafka_%SCALA_BINARY_VERSION%*.jar) do ( + call :concat %%i +) + +rem JMX settings +IF ["%KAFKA_JMX_OPTS%"] EQU [""] ( + set KAFKA_JMX_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false +) + +rem JMX port to use +IF ["%JMX_PORT%"] NEQ [""] ( + set KAFKA_JMX_OPTS=%KAFKA_JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT% +) + +rem Log4j settings +IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] ( + set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/tools-log4j.properties +) + +rem Generic jvm settings you want to add +IF ["%KAFKA_OPTS%"] EQU [""] ( + set KAFKA_OPTS= +) + +rem Which java to use +IF ["%JAVA_HOME%"] EQU [""] ( + set JAVA=java +) ELSE ( + set JAVA="%JAVA_HOME%/bin/java" +) + +rem Memory options +IF ["%KAFKA_HEAP_OPTS%"] EQU [""] ( + set KAFKA_HEAP_OPTS=-Xmx256M +) + +rem JVM performance options +IF ["%KAFKA_JVM_PERFORMANCE_OPTS%"] EQU [""] ( + set KAFKA_JVM_PERFORMANCE_OPTS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+DisableExplicitGC -Djava.awt.headless=true +) + +IF ["%CLASSPATH%"] EQU [""] ( + echo Classpath is empty. Please build the project first e.g. by running 'gradlew jarAll' + EXIT /B 2 +) + +set COMMAND=%JAVA% %KAFKA_HEAP_OPTS% %KAFKA_JVM_PERFORMANCE_OPTS% %KAFKA_JMX_OPTS% %KAFKA_LOG4J_OPTS% -cp %CLASSPATH% %KAFKA_OPTS% %* +rem echo. +rem echo %COMMAND% +rem echo. + +%COMMAND% + +goto :eof +:concat +IF ["%CLASSPATH%"] EQU [""] ( + set CLASSPATH="%1" +) ELSE ( + set CLASSPATH=%CLASSPATH%;"%1" +) diff -Nru kafka-2.9.2-0.8.2.0/bin/windows/kafka-server-stop.bat kafka-2.11-0.9.0.1/bin/windows/kafka-server-stop.bat --- kafka-2.9.2-0.8.2.0/bin/windows/kafka-server-stop.bat 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/windows/kafka-server-stop.bat 2016-02-12 00:37:25.000000000 +0000 @@ -1,18 +1,18 @@ -@echo off -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -wmic process where (commandline like "%%kafka.Kafka%%" and not name="wmic.exe") delete -rem ps ax | grep -i 'kafka.Kafka' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +wmic process where (commandline like "%%kafka.Kafka%%" and not name="wmic.exe") delete +rem ps ax | grep -i 'kafka.Kafka' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM diff -Nru kafka-2.9.2-0.8.2.0/bin/windows/zookeeper-server-stop.bat kafka-2.11-0.9.0.1/bin/windows/zookeeper-server-stop.bat --- kafka-2.9.2-0.8.2.0/bin/windows/zookeeper-server-stop.bat 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/windows/zookeeper-server-stop.bat 2016-02-12 00:37:25.000000000 +0000 @@ -1,17 +1,17 @@ -@echo off -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -wmic process where (commandline like "%%zookeeper%%" and not name="wmic.exe") delete +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +wmic process where (commandline like "%%zookeeper%%" and not name="wmic.exe") delete diff -Nru kafka-2.9.2-0.8.2.0/bin/zookeeper-security-migration.sh kafka-2.11-0.9.0.1/bin/zookeeper-security-migration.sh --- kafka-2.9.2-0.8.2.0/bin/zookeeper-security-migration.sh 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/zookeeper-security-migration.sh 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,17 @@ +#!/bin/bash +# 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. + +exec $(dirname $0)/kafka-run-class.sh kafka.admin.ZkSecurityMigrator "$@" diff -Nru kafka-2.9.2-0.8.2.0/bin/zookeeper-server-start.sh kafka-2.11-0.9.0.1/bin/zookeeper-server-start.sh --- kafka-2.9.2-0.8.2.0/bin/zookeeper-server-start.sh 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/bin/zookeeper-server-start.sh 2016-02-12 00:38:00.000000000 +0000 @@ -41,5 +41,4 @@ ;; esac -exec $base_dir/kafka-run-class.sh $EXTRA_ARGS org.apache.zookeeper.server.quorum.QuorumPeerMain $@ - +exec $base_dir/kafka-run-class.sh $EXTRA_ARGS org.apache.zookeeper.server.quorum.QuorumPeerMain "$@" diff -Nru kafka-2.9.2-0.8.2.0/config/connect-console-sink.properties kafka-2.11-0.9.0.1/config/connect-console-sink.properties --- kafka-2.9.2-0.8.2.0/config/connect-console-sink.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-console-sink.properties 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +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. + +name=local-console-sink +connector.class=org.apache.kafka.connect.file.FileStreamSinkConnector +tasks.max=1 +topics=connect-test \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-console-source.properties kafka-2.11-0.9.0.1/config/connect-console-source.properties --- kafka-2.9.2-0.8.2.0/config/connect-console-source.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-console-source.properties 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +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. + +name=local-console-source +connector.class=org.apache.kafka.connect.file.FileStreamSourceConnector +tasks.max=1 +topic=connect-test \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-distributed.properties kafka-2.11-0.9.0.1/config/connect-distributed.properties --- kafka-2.9.2-0.8.2.0/config/connect-distributed.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-distributed.properties 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,42 @@ +## +# 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. +## + +# These are defaults. This file just demonstrates how to override some settings. +bootstrap.servers=localhost:9092 + +group.id=connect-cluster + +# The converters specify the format of data in Kafka and how to translate it into Connect data. Every Connect user will +# need to configure these based on the format they want their data in when loaded from or stored into Kafka +key.converter=org.apache.kafka.connect.json.JsonConverter +value.converter=org.apache.kafka.connect.json.JsonConverter +# Converter-specific settings can be passed in by prefixing the Converter's setting with the converter we want to apply +# it to +key.converter.schemas.enable=true +value.converter.schemas.enable=true + +# The internal converter used for offsets and config data is configurable and must be specified, but most users will +# always want to use the built-in default. Offset and config data is never visible outside of Copcyat in this format. +internal.key.converter=org.apache.kafka.connect.json.JsonConverter +internal.value.converter=org.apache.kafka.connect.json.JsonConverter +internal.key.converter.schemas.enable=false +internal.value.converter.schemas.enable=false + +offset.storage.topic=connect-offsets +# Flush much faster than normal, which is useful for testing/debugging +offset.flush.interval.ms=10000 +config.storage.topic=connect-configs \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-file-sink.properties kafka-2.11-0.9.0.1/config/connect-file-sink.properties --- kafka-2.9.2-0.8.2.0/config/connect-file-sink.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-file-sink.properties 2016-02-12 00:38:00.000000000 +0000 @@ -0,0 +1,20 @@ +# 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. + +name=local-file-sink +connector.class=org.apache.kafka.connect.file.FileStreamSinkConnector +tasks.max=1 +file=test.sink.txt +topics=connect-test \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-file-source.properties kafka-2.11-0.9.0.1/config/connect-file-source.properties --- kafka-2.9.2-0.8.2.0/config/connect-file-source.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-file-source.properties 2016-02-12 00:38:00.000000000 +0000 @@ -0,0 +1,20 @@ +# 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. + +name=local-file-source +connector.class=org.apache.kafka.connect.file.FileStreamSourceConnector +tasks.max=1 +file=test.txt +topic=connect-test \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-log4j.properties kafka-2.11-0.9.0.1/config/connect-log4j.properties --- kafka-2.9.2-0.8.2.0/config/connect-log4j.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-log4j.properties 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,23 @@ +# 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. + +log4j.rootLogger=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n + +log4j.logger.org.apache.zookeeper=ERROR +log4j.logger.org.I0Itec.zkclient=ERROR \ No newline at end of file diff -Nru kafka-2.9.2-0.8.2.0/config/connect-standalone.properties kafka-2.11-0.9.0.1/config/connect-standalone.properties --- kafka-2.9.2-0.8.2.0/config/connect-standalone.properties 1970-01-01 00:00:00.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/connect-standalone.properties 2016-02-12 00:37:25.000000000 +0000 @@ -0,0 +1,37 @@ +# 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. + +# These are defaults. This file just demonstrates how to override some settings. +bootstrap.servers=localhost:9092 + +# The converters specify the format of data in Kafka and how to translate it into Connect data. Every Connect user will +# need to configure these based on the format they want their data in when loaded from or stored into Kafka +key.converter=org.apache.kafka.connect.json.JsonConverter +value.converter=org.apache.kafka.connect.json.JsonConverter +# Converter-specific settings can be passed in by prefixing the Converter's setting with the converter we want to apply +# it to +key.converter.schemas.enable=true +value.converter.schemas.enable=true + +# The internal converter used for offsets and config data is configurable and must be specified, but most users will +# always want to use the built-in default. Offset and config data is never visible outside of Copcyat in this format. +internal.key.converter=org.apache.kafka.connect.json.JsonConverter +internal.value.converter=org.apache.kafka.connect.json.JsonConverter +internal.key.converter.schemas.enable=false +internal.value.converter.schemas.enable=false + +offset.storage.file.filename=/tmp/connect.offsets +# Flush much faster than normal, which is useful for testing/debugging +offset.flush.interval.ms=10000 diff -Nru kafka-2.9.2-0.8.2.0/config/log4j.properties kafka-2.11-0.9.0.1/config/log4j.properties --- kafka-2.9.2-0.8.2.0/config/log4j.properties 2015-01-29 04:22:30.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/log4j.properties 2016-02-12 00:37:25.000000000 +0000 @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -kafka.logs.dir=logs - log4j.rootLogger=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -51,6 +49,12 @@ log4j.appender.controllerAppender.layout=org.apache.log4j.PatternLayout log4j.appender.controllerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n +log4j.appender.authorizerAppender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.authorizerAppender.DatePattern='.'yyyy-MM-dd-HH +log4j.appender.authorizerAppender.File=${kafka.logs.dir}/kafka-authorizer.log +log4j.appender.authorizerAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.authorizerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n + # Turn on all our debugging info #log4j.logger.kafka.producer.async.DefaultEventHandler=DEBUG, kafkaAppender #log4j.logger.kafka.client.ClientUtils=DEBUG, kafkaAppender @@ -76,3 +80,8 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender log4j.additivity.state.change.logger=false + +#Change this to debug to get the actual audit log for authorizer. +log4j.logger.kafka.authorizer.logger=WARN, authorizerAppender +log4j.additivity.kafka.authorizer.logger=false + diff -Nru kafka-2.9.2-0.8.2.0/config/server.properties kafka-2.11-0.9.0.1/config/server.properties --- kafka-2.9.2-0.8.2.0/config/server.properties 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/server.properties 2016-02-12 00:37:25.000000000 +0000 @@ -4,9 +4,9 @@ # 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. @@ -21,8 +21,10 @@ ############################# Socket Server Settings ############################# +listeners=PLAINTEXT://:9092 + # The port the socket server listens on -port=9092 +#port=9092 # Hostname the broker will bind to. If not set, the server will bind to all interfaces #host.name=localhost @@ -38,7 +40,7 @@ # The number of threads handling network requests num.network.threads=3 - + # The number of threads doing disk I/O num.io.threads=8 @@ -69,11 +71,11 @@ ############################# Log Flush Policy ############################# # Messages are immediately written to the filesystem but by default we only fsync() to sync -# the OS cache lazily. The following configurations control the flush of data to disk. +# the OS cache lazily. The following configurations control the flush of data to disk. # There are a few important trade-offs here: # 1. Durability: Unflushed data may be lost if you are not using replication. # 2. Latency: Very large flush intervals may lead to latency spikes when the flush does occur as there will be a lot of data to flush. -# 3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks. +# 3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks. # The settings below allow one to configure the flush policy to flush data after a period of time or # every N messages (or both). This can be done globally and overridden on a per-topic basis. @@ -100,14 +102,10 @@ # The maximum size of a log segment file. When this size is reached a new log segment will be created. log.segment.bytes=1073741824 -# The interval at which log segments are checked to see if they can be deleted according +# The interval at which log segments are checked to see if they can be deleted according # to the retention policies log.retention.check.interval.ms=300000 -# By default the log cleaner is disabled and the log retention policy will default to just delete segments after their retention expires. -# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs can then be marked for log compaction. -log.cleaner.enable=false - ############################# Zookeeper ############################# # Zookeeper connection string (see zookeeper docs for details). diff -Nru kafka-2.9.2-0.8.2.0/config/tools-log4j.properties kafka-2.11-0.9.0.1/config/tools-log4j.properties --- kafka-2.9.2-0.8.2.0/config/tools-log4j.properties 2015-01-29 04:22:05.000000000 +0000 +++ kafka-2.11-0.9.0.1/config/tools-log4j.properties 2016-02-12 00:37:25.000000000 +0000 @@ -13,8 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -log4j.rootLogger=WARN, stdout +log4j.rootLogger=WARN, stderr -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n +log4j.appender.stderr=org.apache.log4j.ConsoleAppender +log4j.appender.stderr.layout=org.apache.log4j.PatternLayout +log4j.appender.stderr.layout.ConversionPattern=[%d] %p %m (%c)%n +log4j.appender.stderr.Target=System.err diff -Nru kafka-2.9.2-0.8.2.0/debian/changelog kafka-2.11-0.9.0.1/debian/changelog --- kafka-2.9.2-0.8.2.0/debian/changelog 2015-02-11 17:34:42.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/changelog 2016-02-24 19:29:31.000000000 +0000 @@ -1,5 +1,5 @@ -kafka (2.9.2-0.8.2.0-0contrail0) precise; urgency=low +kafka (2.11-0.9.0.1-0contrail0) trusty; urgency=low - * Initial release (Closes: #nnnn) + * This is package version without any changes - -- Arvind Viswanathan (new gpg) Tue, 10 Feb 2015 16:58:34 -0800 + -- Arvind Viswanathan (New pgp key) Fri, 05 Dec 2014 11:17:38 -0800 diff -Nru kafka-2.9.2-0.8.2.0/debian/control kafka-2.11-0.9.0.1/debian/control --- kafka-2.9.2-0.8.2.0/debian/control 2015-02-11 17:48:12.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/control 2016-02-24 19:29:31.000000000 +0000 @@ -1,8 +1,8 @@ Source: kafka Section: database Priority: extra -Maintainer: ubuntu -Build-Depends: debhelper (>= 8.0.0) +Maintainer: Arvind Viswanathan +Build-Depends: debhelper (>= 8.0.0), javahelper Standards-Version: 3.9.2 Homepage: #Vcs-Git: git://git.debian.org/collab-maint/kafka.git diff -Nru kafka-2.9.2-0.8.2.0/debian/copyright kafka-2.11-0.9.0.1/debian/copyright --- kafka-2.9.2-0.8.2.0/debian/copyright 2015-02-11 00:58:39.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/copyright 2016-02-24 19:29:31.000000000 +0000 @@ -14,7 +14,7 @@ # If you want to use GPL v2 or later for the /debian/* files use # the following clauses, or change it to suit. Delete these two lines Files: debian/* -Copyright: 2015 ubuntu +Copyright: 2014 Arvind Viswanathan License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru kafka-2.9.2-0.8.2.0/debian/init.d.ex kafka-2.11-0.9.0.1/debian/init.d.ex --- kafka-2.9.2-0.8.2.0/debian/init.d.ex 2015-02-11 00:58:39.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/init.d.ex 2016-02-24 19:29:31.000000000 +0000 @@ -11,7 +11,7 @@ # <...> ### END INIT INFO -# Author: ubuntu +# Author: Arvind Viswanathan # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin diff -Nru kafka-2.9.2-0.8.2.0/debian/manpage.1.ex kafka-2.11-0.9.0.1/debian/manpage.1.ex --- kafka-2.9.2-0.8.2.0/debian/manpage.1.ex 2015-02-11 00:58:39.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/manpage.1.ex 2016-02-24 19:29:31.000000000 +0000 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH KAFKA SECTION "February 10, 2015" +.TH KAFKA SECTION "December 5, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -55,5 +55,5 @@ .SH AUTHOR kafka was written by . .PP -This manual page was written by ubuntu , +This manual page was written by Arvind Viswanathan , for the Debian project (and may be used by others). diff -Nru kafka-2.9.2-0.8.2.0/debian/manpage.sgml.ex kafka-2.11-0.9.0.1/debian/manpage.sgml.ex --- kafka-2.9.2-0.8.2.0/debian/manpage.sgml.ex 2015-02-11 00:58:39.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/manpage.sgml.ex 2016-02-24 19:29:31.000000000 +0000 @@ -20,12 +20,12 @@ FIRSTNAME"> SURNAME"> - February 10, 2015"> + December 5, 2014"> SECTION"> ubuntu@unknown"> - + KAFKA"> diff -Nru kafka-2.9.2-0.8.2.0/debian/manpage.xml.ex kafka-2.11-0.9.0.1/debian/manpage.xml.ex --- kafka-2.9.2-0.8.2.0/debian/manpage.xml.ex 2015-02-11 00:58:39.000000000 +0000 +++ kafka-2.11-0.9.0.1/debian/manpage.xml.ex 2016-02-24 19:29:31.000000000 +0000 @@ -48,7 +48,7 @@ - +