kafka-1210; Windows Bat files are not working properly; patched by Stevo Slavic; reviewed by Jun Rao

bin/windows/kafka-console-consumer.bat

@@ -15,6 +15,6 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
 SetLocal
-set KAFKA_OPTS=-Xmx512M -server -Dcom.sun.management.jmxremote -Dlog4j.configuration=file:"%CD%\kafka-console-consumer-log4j.properties"
+set KAFKA_HEAP_OPTS=-Xmx512M
-kafka-run-class.bat kafka.consumer.ConsoleConsumer %*
+%~dp0kafka-run-class.bat kafka.consumer.ConsoleConsumer %*
 EndLocal

bin/windows/kafka-console-producer.bat

@@ -14,4 +14,7 @@ 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.
 
-kafka-run-class.bat kafka.producer.ConsoleProducer %*
+SetLocal
+set KAFKA_HEAP_OPTS=-Xmx512M
+%~dp0kafka-run-class.bat kafka.producer.ConsoleProducer %*
+EndLocal

bin/windows/kafka-run-class.bat

@@ -17,76 +17,113 @@ rem limitations under the License.
 setlocal enabledelayedexpansion
 
 IF [%1] EQU [] (
-	echo "USAGE: $0 classname [opts]"
+	echo USAGE: %0 classname [opts]
-	goto :eof
+	EXIT /B 1
 )
 
-set BASE_DIR=%CD%\..
+rem Using pushd popd to set BASE_DIR to the absolute path
+pushd %~dp0..\..
+set BASE_DIR=%CD%
+popd
 set CLASSPATH=
-echo %BASE_DIR%
 
-set ivyPath=%USERPROFILE%\.ivy2\cache
+IF ["%SCALA_VERSION%"] EQU [""] (
+  set SCALA_VERSION=2.8.0
+)
 
-set snappy=%ivyPath%/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.5.jar
+rem Classpath addition for kafka-core dependencies
-	call :concat %snappy%
+for %%i in (%BASE_DIR%\core\build\dependant-libs-%SCALA_VERSION%\*.jar) do (
-
-set library=%ivyPath%/org.scala-lang/scala-library/jars/scala-library-2.8.0.jar
-	call :concat %library%
-
-set compiler=%ivyPath%/org.scala-lang/scala-compiler/jars/scala-compiler-2.8.0.jar
-	call :concat %compiler%
-
-set log4j=%ivyPath%/log4j/log4j/jars/log4j-1.2.15.jar
-	call :concat %log4j%
-
-set slf=%ivyPath%/org.slf4j/slf4j-api/jars/slf4j-api-1.6.4.jar
-	call :concat %slf%
-
-set zookeeper=%ivyPath%/org.apache.zookeeper/zookeeper/jars/zookeeper-3.3.4.jar
-	call :concat %zookeeper%
-
-set jopt=%ivyPath%/net.sf.jopt-simple/jopt-simple/jars/jopt-simple-3.2.jar
-	call :concat %jopt%
-
-for %%i in (%BASE_DIR%\core\target\scala-2.8.0\*.jar) do (
 	call :concat %%i
 )
 
-for %%i in (%BASE_DIR%\core\lib\*.jar) do (
+rem Classpath addition for kafka-perf dependencies
+for %%i in (%BASE_DIR%\perf\build\dependant-libs-%SCALA_VERSION%\*.jar) do (
 	call :concat %%i
 )
 
-for %%i in (%BASE_DIR%\perf\target\scala-2.8.0/kafka*.jar) do (
+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_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
 )
 
-IF ["%KAFKA_OPTS%"] EQU [""] (
+rem JMX port to use
-	set KAFKA_OPTS=-Xmx512M -server -Dlog4j.configuration=file:"%BASE_DIR%\config\log4j.properties"
-)
-
 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"
 )
 
-set SEARCHTEXT=\bin\..
+rem Memory options
-set REPLACETEXT=
+IF ["%KAFKA_HEAP_OPTS%"] EQU [""] (
-set CLASSPATH=!CLASSPATH:%SEARCHTEXT%=%REPLACETEXT%!
+	set KAFKA_HEAP_OPTS=-Xmx256M
-set COMMAND= %JAVA% %KAFKA_OPTS% %KAFKA_JMX_OPTS% -cp %CLASSPATH% %*
+)
-set SEARCHTEXT=-cp ;
+
-set REPLACETEXT=-cp 
+rem JVM performance options
-set COMMAND=!COMMAND:%SEARCHTEXT%=%REPLACETEXT%!
+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
-set CLASSPATH=%CLASSPATH%;"%1"
+IF ["%CLASSPATH%"] EQU [""] (
+  set CLASSPATH="%1"
+) ELSE (
+  set CLASSPATH=%CLASSPATH%;"%1"
+)

bin/windows/kafka-server-start.bat

@@ -15,13 +15,12 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
 IF [%1] EQU [] (
-	echo "USAGE: $0 server.properties [consumer.properties producer.properties]"
+	echo USAGE: %0 server.properties
-	goto :eof
+	EXIT /B 1
 )
 
-IF [%JMX_PORT%] EQU [] (
+SetLocal
-	echo Set JMX_PORT to default value : 9999
+set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%~dp0../../config/log4j.properties
-	set JMX_PORT=9999
+set KAFKA_HEAP_OPTS=-Xmx1G -Xms1G
-)
+%~dp0kafka-run-class.bat kafka.Kafka %*
-
+EndLocal
-kafka-run-class.bat kafka.Kafka %*

bin/windows/kafka-topics.bat

@@ -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.TopicCommand %*

bin/windows/zookeeper-server-start.bat

@@ -15,8 +15,12 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
 IF [%1] EQU [] (
-	echo "USAGE: $0 zookeeper.properties"
+	echo USAGE: %0 zookeeper.properties
-	goto :eof
+	EXIT /B 1
 )
 
-kafka-run-class.bat org.apache.zookeeper.server.quorum.QuorumPeerMain %*
+SetLocal
+set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%~dp0../../config/log4j.properties
+set KAFKA_HEAP_OPTS=-Xmx512M -Xms512M
+%~dp0kafka-run-class.bat org.apache.zookeeper.server.quorum.QuorumPeerMain %*
+EndLocal