You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2015/11/04 18:14:08 UTC
kafka git commit: KAFKA-2740: Convert Windows bin scripts from CRLF
to LF line encodings
Repository: kafka
Updated Branches:
refs/heads/trunk 70a7d5786 -> 7ded64bc2
KAFKA-2740: Convert Windows bin scripts from CRLF to LF line encodings
There are no functional changes to the modified scripts.
Author: Michael G. Noll <mi...@confluent.io>
Reviewers: Guozhang Wang
Closes #419 from miguno/KAFKA-2740
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7ded64bc
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7ded64bc
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7ded64bc
Branch: refs/heads/trunk
Commit: 7ded64bc2edf8645d7fd113633a56791bf1e8e4a
Parents: 70a7d57
Author: Michael G. Noll <mi...@confluent.io>
Authored: Wed Nov 4 09:19:49 2015 -0800
Committer: Guozhang Wang <wa...@gmail.com>
Committed: Wed Nov 4 09:19:49 2015 -0800
----------------------------------------------------------------------
bin/windows/kafka-run-class.bat | 266 ++++++++++++++---------------
bin/windows/kafka-server-stop.bat | 36 ++--
bin/windows/zookeeper-server-stop.bat | 34 ++--
3 files changed, 168 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/7ded64bc/bin/windows/kafka-run-class.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index 644969e..f5b8faa 100644
--- a/bin/windows/kafka-run-class.bat
+++ b/bin/windows/kafka-run-class.bat
@@ -1,133 +1,133 @@
-@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 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:+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"
-)
+@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 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:+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"
+)
http://git-wip-us.apache.org/repos/asf/kafka/blob/7ded64bc/bin/windows/kafka-server-stop.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-server-stop.bat b/bin/windows/kafka-server-stop.bat
index b9496ce..676577c 100644
--- a/bin/windows/kafka-server-stop.bat
+++ b/bin/windows/kafka-server-stop.bat
@@ -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
http://git-wip-us.apache.org/repos/asf/kafka/blob/7ded64bc/bin/windows/zookeeper-server-stop.bat
----------------------------------------------------------------------
diff --git a/bin/windows/zookeeper-server-stop.bat b/bin/windows/zookeeper-server-stop.bat
index 29bdee8..8b57dd8 100644
--- a/bin/windows/zookeeper-server-stop.bat
+++ b/bin/windows/zookeeper-server-stop.bat
@@ -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