flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject flink git commit: [FLINK-1405] [windows] Fix Windows scripts (flink.bat and start-local.bat) - Fix for paths with blank characters - Fix for single entry wildcard classpaths (http://bugs.java.com, bugID: 7146578)
Date Thu, 15 Jan 2015 10:54:18 GMT
Repository: flink
Updated Branches:
  refs/heads/master 9fea951f8 -> 5634ee2ef


[FLINK-1405] [windows] Fix Windows scripts (flink.bat and start-local.bat)
- Fix for paths with blank characters
- Fix for single entry wildcard classpaths (http://bugs.java.com, bugID: 7146578)


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5634ee2e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5634ee2e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5634ee2e

Branch: refs/heads/master
Commit: 5634ee2effe035ecb6886cc88a609066a0f5d409
Parents: 9fea951
Author: Fabian Hueske <fhueske@apache.org>
Authored: Thu Jan 15 11:42:49 2015 +0100
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Thu Jan 15 11:52:27 2015 +0100

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/bin/flink.bat       | 8 ++++----
 flink-dist/src/main/flink-bin/bin/start-local.bat | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5634ee2e/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 a51baca..279acd2 100644
--- a/flink-dist/src/main/flink-bin/bin/flink.bat
+++ b/flink-dist/src/main/flink-bin/bin/flink.bat
@@ -20,13 +20,13 @@
 setlocal
 
 SET bin=%~dp0
-SET NEPHELE_ROOT_DIR=%bin%..
-SET NEPHELE_LIB_DIR=%NEPHELE_ROOT_DIR%\lib
+SET FLINK_ROOT_DIR=%bin%..
+SET FLINK_LIB_DIR=%FLINK_ROOT_DIR%\lib
 
 SET JVM_ARGS=-Xmx512m
 
-SET NEPHELE_JM_CLASSPATH=%NEPHELE_LIB_DIR%\*
+SET FLINK_JM_CLASSPATH=%FLINK_LIB_DIR%\*
 
-java %JVM_ARGS% -cp "%NEPHELE_JM_CLASSPATH%" org.apache.flink.client.CliFrontend %*
+java %JVM_ARGS% -cp "%FLINK_JM_CLASSPATH%"; org.apache.flink.client.CliFrontend %*
 
 endlocal

http://git-wip-us.apache.org/repos/asf/flink/blob/5634ee2e/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 374254f..386a631 100644
--- a/flink-dist/src/main/flink-bin/bin/start-local.bat
+++ b/flink-dist/src/main/flink-bin/bin/start-local.bat
@@ -33,11 +33,11 @@ SET logname=flink-%username%-jobmanager-%computername%.log
 SET log=%FLINK_LOG_DIR%\%logname%
 SET outname=flink-%username%-jobmanager-%computername%.out
 SET out=%FLINK_LOG_DIR%\%outname%
-SET log_setting=-Dlog.file=%log% -Dlogback.configurationFile=file:%FLINK_CONF_DIR%/logback.xml
-Dlog4j.configuration=file:%FLINK_CONF_DIR%/log4j.properties
+SET log_setting=-Dlog.file="%log%" -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%
+CD "%FLINK_LOG_DIR%"
 for /l %%x in (5, -1, 1) do ( 
 SET /A y = %%x+1 
 RENAME "%logname%.%%x" "%logname%.!y!" 2> nul
@@ -57,6 +57,6 @@ if not defined FOUND (
 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 %FLINK_JM_CLASSPATH% org.apache.flink.runtime.jobmanager.JobManager
--executionMode local --configDir %FLINK_CONF_DIR%  > "%out%"  2>&1
+java %JVM_ARGS% %log_setting% -cp "%FLINK_JM_CLASSPATH%"; org.apache.flink.runtime.jobmanager.JobManager
--executionMode local --configDir "%FLINK_CONF_DIR%" > "%out%" 2>&1
 
 endlocal


Mime
View raw message