This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.10 by this push:
new 32ab3dd [FLINK-16683][scripts] Remove Windows scripts
32ab3dd is described below
commit 32ab3dd3deceb665faa29ad11c122389fa42eb34
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Fri Apr 17 14:46:16 2020 +0200
[FLINK-16683][scripts] Remove Windows scripts
---
docs/getting-started/tutorials/flink_on_windows.md | 21 +-----
.../tutorials/flink_on_windows.zh.md | 21 +-----
docs/getting-started/tutorials/local_setup.md | 5 +-
docs/getting-started/tutorials/local_setup.zh.md | 4 +-
flink-dist/src/main/flink-bin/bin/flink.bat | 33 ---------
.../src/main/flink-bin/bin/start-cluster.bat | 78 ----------------------
6 files changed, 8 insertions(+), 154 deletions(-)
diff --git a/docs/getting-started/tutorials/flink_on_windows.md
b/docs/getting-started/tutorials/flink_on_windows.md
index 264892a..30a510a 100644
--- a/docs/getting-started/tutorials/flink_on_windows.md
+++ b/docs/getting-started/tutorials/flink_on_windows.md
@@ -22,26 +22,7 @@ specific language governing permissions and limitations
under the License.
-->
-If you want to run Flink locally on a Windows machine you need to
[download](https://flink.apache.org/downloads.html) and unpack the binary Flink
distribution. After that you can either use the **Windows Batch** file
(`.bat`), or use **Cygwin** to run the Flink Jobmanager.
-
-## Starting with Windows Batch Files
-
-To start Flink in from the *Windows Command Line*, open the command window,
navigate to the `bin/` directory of Flink and run `start-cluster.bat`.
-
-Note: The ``bin`` folder of your Java Runtime Environment must be included in
Window's ``%PATH%`` variable. Follow this
[guide](http://www.java.com/en/download/help/path.xml) to add Java to the
``%PATH%`` variable.
-
-{% highlight bash %}
-$ cd flink
-$ cd bin
-$ start-cluster.bat
-Starting a local cluster with one JobManager process and one TaskManager
process.
-You can terminate the processes via CTRL-C in the spawned shell windows.
-Web interface by default on http://localhost:8081/.
-{% endhighlight %}
-
-After that, you need to open a second terminal to run jobs using `flink.bat`.
-
-{% top %}
+If you want to run Flink locally on a Windows machine you need to
[download](https://flink.apache.org/downloads.html) and unpack the binary Flink
distribution. After that you can **WSL** or **Cygwin** to run the Flink
Jobmanager.
## Starting with Cygwin and Unix Scripts
diff --git a/docs/getting-started/tutorials/flink_on_windows.zh.md
b/docs/getting-started/tutorials/flink_on_windows.zh.md
index 513eac0..ec9761b 100644
--- a/docs/getting-started/tutorials/flink_on_windows.zh.md
+++ b/docs/getting-started/tutorials/flink_on_windows.zh.md
@@ -22,26 +22,7 @@ specific language governing permissions and limitations
under the License.
-->
-If you want to run Flink locally on a Windows machine you need to
[download](https://flink.apache.org/downloads.html) and unpack the binary Flink
distribution. After that you can either use the **Windows Batch** file
(`.bat`), or use **Cygwin** to run the Flink Jobmanager.
-
-## Starting with Windows Batch Files
-
-To start Flink in from the *Windows Command Line*, open the command window,
navigate to the `bin/` directory of Flink and run `start-cluster.bat`.
-
-Note: The ``bin`` folder of your Java Runtime Environment must be included in
Window's ``%PATH%`` variable. Follow this
[guide](http://www.java.com/en/download/help/path.xml) to add Java to the
``%PATH%`` variable.
-
-{% highlight bash %}
-$ cd flink
-$ cd bin
-$ start-cluster.bat
-Starting a local cluster with one JobManager process and one TaskManager
process.
-You can terminate the processes via CTRL-C in the spawned shell windows.
-Web interface by default on http://localhost:8081/.
-{% endhighlight %}
-
-After that, you need to open a second terminal to run jobs using `flink.bat`.
-
-{% top %}
+If you want to run Flink locally on a Windows machine you need to
[download](https://flink.apache.org/downloads.html) and unpack the binary Flink
distribution. After that you can **WSL** or **Cygwin** to run the Flink
Jobmanager.
## Starting with Cygwin and Unix Scripts
diff --git a/docs/getting-started/tutorials/local_setup.md
b/docs/getting-started/tutorials/local_setup.md
index 6d1d09b..fad115a 100644
--- a/docs/getting-started/tutorials/local_setup.md
+++ b/docs/getting-started/tutorials/local_setup.md
@@ -30,8 +30,9 @@ Get a Flink example program up and running in a few simple
steps.
## Setup: Download and Start Flink
-Flink runs on __Linux, Mac OS X, and Windows__. To be able to run Flink, the
only requirement is to have a working __Java 8.x__ installation. Windows users,
please take a look at the [Flink on Windows]({{ site.baseurl
}}/getting-started/tutorials/flink_on_windows.html) guide which describes how
to run Flink on Windows for local setups.
-
+Flink runs on __Linux and Mac OS X__.
+<span class="label label-info">Note:</span> Windows users can run Flink in
Cygwin or WSL.
+To be able to run Flink, the only requirement is to have a working __Java 8 or
11__ installation.
You can check the correct installation of Java by issuing the following
command:
{% highlight bash %}
diff --git a/docs/getting-started/tutorials/local_setup.zh.md
b/docs/getting-started/tutorials/local_setup.zh.md
index d6566e4..d3248fc 100644
--- a/docs/getting-started/tutorials/local_setup.zh.md
+++ b/docs/getting-started/tutorials/local_setup.zh.md
@@ -30,7 +30,9 @@ Get a Flink example program up and running in a few simple
steps.
## Setup: Download and Start Flink
-Flink runs on __Linux, Mac OS X, and Windows__. To be able to run Flink, the
only requirement is to have a working __Java 8.x__ installation. Windows users,
please take a look at the [Flink on Windows]({{ site.baseurl
}}/getting-started/tutorials/flink_on_windows.html) guide which describes how
to run Flink on Windows for local setups.
+Flink runs on __Linux and Mac OS X__.
+<span class="label label-info">Note:</span> Windows users can run Flink in
Cygwin or WSL.
+To be able to run Flink, the only requirement is to have a working __Java 8 or
11__ installation.
You can check the correct installation of Java by issuing the following
command:
diff --git a/flink-dist/src/main/flink-bin/bin/flink.bat
b/flink-dist/src/main/flink-bin/bin/flink.bat
deleted file mode 100644
index a88a4db..0000000
--- a/flink-dist/src/main/flink-bin/bin/flink.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-::###############################################################################
-:: 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.
-::###############################################################################
-
-@echo off
-setlocal
-
-SET bin=%~dp0
-SET FLINK_HOME=%bin%..
-SET FLINK_LIB_DIR=%FLINK_HOME%\lib
-SET FLINK_PLUGINS_DIR=%FLINK_HOME%\plugins
-
-SET JVM_ARGS=-Xmx512m
-
-SET FLINK_JM_CLASSPATH=%FLINK_LIB_DIR%\*
-
-java %JVM_ARGS% -cp "%FLINK_JM_CLASSPATH%";
org.apache.flink.client.cli.CliFrontend %*
-
-endlocal
diff --git a/flink-dist/src/main/flink-bin/bin/start-cluster.bat
b/flink-dist/src/main/flink-bin/bin/start-cluster.bat
deleted file mode 100644
index 9c01cb2..0000000
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.bat
+++ /dev/null
@@ -1,78 +0,0 @@
-::###############################################################################
-:: 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.
-::###############################################################################
-
-@echo off
-setlocal EnableDelayedExpansion
-
-SET bin=%~dp0
-SET FLINK_HOME=%bin%..
-SET FLINK_LIB_DIR=%FLINK_HOME%\lib
-SET FLINK_PLUGINS_DIR=%FLINK_HOME%\plugins
-SET FLINK_CONF_DIR=%FLINK_HOME%\conf
-SET FLINK_LOG_DIR=%FLINK_HOME%\log
-
-SET JVM_ARGS=-Xms1024m -Xmx1024m
-
-SET FLINK_CLASSPATH=%FLINK_LIB_DIR%\*
-
-SET logname_jm=flink-%username%-jobmanager.log
-SET logname_tm=flink-%username%-taskmanager.log
-SET log_jm=%FLINK_LOG_DIR%\%logname_jm%
-SET log_tm=%FLINK_LOG_DIR%\%logname_tm%
-SET outname_jm=flink-%username%-jobmanager.out
-SET outname_tm=flink-%username%-taskmanager.out
-SET out_jm=%FLINK_LOG_DIR%\%outname_jm%
-SET out_tm=%FLINK_LOG_DIR%\%outname_tm%
-
-SET log_setting_jm=-Dlog.file="%log_jm%"
-Dlogback.configurationFile=file:"%FLINK_CONF_DIR%/logback.xml"
-Dlog4j.configuration=file:"%FLINK_CONF_DIR%/log4j.properties"
-SET log_setting_tm=-Dlog.file="%log_tm%"
-Dlogback.configurationFile=file:"%FLINK_CONF_DIR%/logback.xml"
-Dlog4j.configuration=file:"%FLINK_CONF_DIR%/log4j.properties"
-
-:: Log rotation (quick and dirty)
-CD "%FLINK_LOG_DIR%"
-for /l %%x in (5, -1, 1) do (
-SET /A y = %%x+1
-RENAME "%logname_jm%.%%x" "%logname_jm%.!y!" 2> nul
-RENAME "%logname_tm%.%%x" "%logname_tm%.!y!" 2> nul
-RENAME "%outname_jm%.%%x" "%outname_jm%.!y!" 2> nul
-RENAME "%outname_tm%.%%x" "%outname_tm%.!y!" 2> nul
-)
-RENAME "%logname_jm%" "%logname_jm%.0" 2> nul
-RENAME "%logname_tm%" "%logname_tm%.0" 2> nul
-RENAME "%outname_jm%" "%outname_jm%.0" 2> nul
-RENAME "%outname_tm%" "%outname_tm%.0" 2> nul
-DEL "%logname_jm%.6" 2> nul
-DEL "%logname_tm%.6" 2> nul
-DEL "%outname_jm%.6" 2> nul
-DEL "%outname_tm%.6" 2> nul
-
-for %%X in (java.exe) do (set FOUND=%%~$PATH:X)
-if not defined FOUND (
- echo java.exe was not found in PATH variable
- goto :eof
-)
-
-echo Starting a local cluster with one JobManager process and one TaskManager
process.
-
-echo You can terminate the processes via CTRL-C in the spawned shell windows.
-
-echo Web interface by default on http://localhost:8081/.
-
-start java %JVM_ARGS% %log_setting_jm% -cp "%FLINK_CLASSPATH%";
org.apache.flink.runtime.entrypoint.StandaloneSessionClusterEntrypoint
--configDir "%FLINK_CONF_DIR%" > "%out_jm%" 2>&1
-start java %JVM_ARGS% %log_setting_tm% -cp "%FLINK_CLASSPATH%";
org.apache.flink.runtime.taskexecutor.TaskManagerRunner --configDir
"%FLINK_CONF_DIR%" > "%out_tm%" 2>&1
-
-endlocal
