You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2014/08/14 16:37:32 UTC
[1/3] git commit: [FLINK-1047] Fixes main class for start-local.bat
Repository: incubator-flink
Updated Branches:
refs/heads/master e696ff77d -> 2eea26b5e
[FLINK-1047] Fixes main class for start-local.bat
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/c0007b0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/c0007b0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/c0007b0a
Branch: refs/heads/master
Commit: c0007b0a3348fb489441f3ebb8a9e538306ee0bb
Parents: e696ff7
Author: Fabian Hueske <fh...@apache.org>
Authored: Thu Aug 14 15:44:24 2014 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Aug 14 16:37:21 2014 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/start-local.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c0007b0a/flink-dist/src/main/flink-bin/bin/start-local.bat
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-local.bat b/flink-dist/src/main/flink-bin/bin/start-local.bat
index 23a6d74..7e0b28a 100644
--- a/flink-dist/src/main/flink-bin/bin/start-local.bat
+++ b/flink-dist/src/main/flink-bin/bin/start-local.bat
@@ -52,6 +52,6 @@ DEL "%outname%.6" 2> nul
echo Starting Flink job manager. Webinterface by default on http://localhost:8081/.
echo Don't close this batch window. Stop job manager by pressing Ctrl+C.
-java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% org.apache.flink.nephele.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR% > "%out%" 2>&1
+java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% org.apache.flink.runtime.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR% > "%out%" 2>&1
endlocal
[2/3] git commit: [FLINK-1048] Swallow output of SET statements in
./bin/flink.bat
Posted by fh...@apache.org.
[FLINK-1048] Swallow output of SET statements in ./bin/flink.bat
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/1b0bbc07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/1b0bbc07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/1b0bbc07
Branch: refs/heads/master
Commit: 1b0bbc077f560d9dd7359b0414f8133a39bd996e
Parents: c0007b0
Author: Fabian Hueske <fh...@apache.org>
Authored: Thu Aug 14 15:45:59 2014 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Aug 14 16:37:30 2014 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/flink.bat | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1b0bbc07/flink-dist/src/main/flink-bin/bin/flink.bat
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/flink.bat b/flink-dist/src/main/flink-bin/bin/flink.bat
index 2275e07..a51baca 100644
--- a/flink-dist/src/main/flink-bin/bin/flink.bat
+++ b/flink-dist/src/main/flink-bin/bin/flink.bat
@@ -16,6 +16,7 @@
:: limitations under the License.
::###############################################################################
+@echo off
setlocal
SET bin=%~dp0
[3/3] git commit: [FLINK-1051] ./bin/start-local.bat prints error
message if java.exe cannot be found
Posted by fh...@apache.org.
[FLINK-1051] ./bin/start-local.bat prints error message if java.exe cannot be found
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/2eea26b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/2eea26b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/2eea26b5
Branch: refs/heads/master
Commit: 2eea26b5e5f6837d95181d0b3e535ee32c715983
Parents: 1b0bbc0
Author: Fabian Hueske <fh...@apache.org>
Authored: Thu Aug 14 16:05:06 2014 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Aug 14 16:37:41 2014 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/start-local.bat | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/2eea26b5/flink-dist/src/main/flink-bin/bin/start-local.bat
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-local.bat b/flink-dist/src/main/flink-bin/bin/start-local.bat
index 7e0b28a..e77b40c 100644
--- a/flink-dist/src/main/flink-bin/bin/start-local.bat
+++ b/flink-dist/src/main/flink-bin/bin/start-local.bat
@@ -48,6 +48,11 @@ RENAME "%outname%" "%outname%.0" 2> nul
DEL "%logname%.6" 2> nul
DEL "%outname%.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 Flink job manager. Webinterface by default on http://localhost:8081/.
echo Don't close this batch window. Stop job manager by pressing Ctrl+C.