You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/02/20 05:15:39 UTC
[1/4] storm git commit: STORM-651: Rename "ui" service to "storm ui"
and temp.txt should be in TEMP folder.Add jdk and jres bin and libs dirs to
lib path.
Repository: storm
Updated Branches:
refs/heads/master a16d1404f -> 3cebc7c9b
STORM-651: Rename "ui" service to "storm ui" and temp.txt should be in TEMP folder.Add jdk and jres bin and libs dirs to lib path.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db1182d7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db1182d7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db1182d7
Branch: refs/heads/master
Commit: db1182d753a6cc911a220d2891c8efd2f093d77c
Parents: 8036109
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Fri Oct 17 11:11:03 2014 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Tue Feb 10 14:07:31 2015 -0800
----------------------------------------------------------------------
bin/storm-config.cmd | 14 +++++++-------
bin/storm.cmd | 33 ++++++++++++++++++++++-----------
2 files changed, 29 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/db1182d7/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 5203241..e185495 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -86,13 +86,13 @@ if not defined STORM_LOG_DIR (
@rem retrieve storm.logback.conf.dir from conf file
@rem
-"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value storm.logback.conf.dir > temp.txt
+"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value storm.logback.conf.dir > %CMD_TEMP_FILE%
-FOR /F "delims=" %%i in (temp.txt) do (
+FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set STORM_LOGBACK_CONFIGURATION_DIR=%%b
- del /F temp.txt)
+ del /F %CMD_TEMP_FILE%)
)
)
)
@@ -113,9 +113,9 @@ if not defined STORM_LOGBACK_CONFIGURATION_FILE (
set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_HOME%\logback\cluster.xml
)
-"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value java.library.path > temp.txt
+"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value java.library.path > %CMD_TEMP_FILE%
-FOR /F "delims=" %%i in (temp.txt) do (
+FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set JAVA_LIBRARY_PATH=%%b
@@ -125,10 +125,10 @@ FOR /F "delims=" %%i in (temp.txt) do (
:storm_opts
- set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
+ set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%;%JAVA_HOME%\bin;%JAVA_HOME%\lib;%JAVA_HOME%\jre\bin;%JAVA_HOME%\jre\lib
set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
- del /F temp.txt
+ del /F %CMD_TEMP_FILE%
if not defined STORM_SERVER_OPTS (
http://git-wip-us.apache.org/repos/asf/storm/blob/db1182d7/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index d9c28f6..3f1804d 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -114,8 +114,8 @@
:drpc
set CLASS=backtype.storm.daemon.drpc
- "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value drpc.childopts > temp.txt
- FOR /F "delims=" %%i in (temp.txt) do (
+ "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value drpc.childopts > %CMD_TEMP_FILE%
+ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set CHILDOPTS=%%b
@@ -140,8 +140,8 @@
:logviewer
set CLASS=backtype.storm.daemon.logviewer
- "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value logviewer.childopts > temp.txt
- FOR /F "delims=" %%i in (temp.txt) do (
+ "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value logviewer.childopts > %CMD_TEMP_FILE%
+ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set CHILDOPTS=%%b
@@ -152,8 +152,8 @@
:nimbus
set CLASS=backtype.storm.daemon.nimbus
- "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value nimbus.childopts > temp.txt
- FOR /F "delims=" %%i in (temp.txt) do (
+ "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value nimbus.childopts > %CMD_TEMP_FILE%
+ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set CHILDOPTS=%%b
@@ -184,8 +184,8 @@
:supervisor
set CLASS=backtype.storm.daemon.supervisor
- "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value supervisor.childopts > temp.txt
- FOR /F "delims=" %%i in (temp.txt) do (
+ "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value supervisor.childopts > %CMD_TEMP_FILE%
+ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set CHILDOPTS=%%b
@@ -197,8 +197,8 @@
:ui
set CLASS=backtype.storm.ui.core
set CLASSPATH=%CLASSPATH%;%STORM_HOME%
- "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value ui.childopts > temp.txt
- FOR /F "delims=" %%i in (temp.txt) do (
+ "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value ui.childopts > %CMD_TEMP_FILE%
+ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
if %%a == VALUE: (
set CHILDOPTS=%%b
@@ -212,6 +212,17 @@
set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
goto :eof
+:makeServiceXml
+ set arguments=%*
+ @echo ^<service^>
+ @echo ^<id^>storm_%storm-command%^</id^>
+ @echo ^<name^>storm_%storm-command%^</name^>
+ @echo ^<description^>This service runs Storm %storm-command%^</description^>
+ @echo ^<executable^>%JAVA%^</executable^>
+ @echo ^<arguments^>%arguments%^</arguments^>
+ @echo ^</service^>
+ goto :eof
+
:make_command_arguments
if "%2" == "" goto :eof
set _count=0
@@ -231,7 +242,7 @@
:set_childopts
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %CHILDOPTS%
- del /F temp.txt
+ del /F %CMD_TEMP_FILE%
goto :eof
:print_usage
[3/4] storm git commit: Added STORM-651 to changelog
Posted by sr...@apache.org.
Added STORM-651 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/67093615
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/67093615
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/67093615
Branch: refs/heads/master
Commit: 670936152be08b6d6f5e6d7cb591f8cb932b4661
Parents: 8e88401
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 19 19:43:54 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 19 19:43:54 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/67093615/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d80807f..67498d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-651: improvements to storm.cmd
* STORM-456: Storm UI: cannot navigate to topology page when name contains spaces.
* STORM-627: Storm-hbase configuration error.
* STORM-248: cluster.xml location is hardcoded for workers
[4/4] storm git commit: Merge branch 'STORM-651'
Posted by sr...@apache.org.
Merge branch 'STORM-651'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3cebc7c9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3cebc7c9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3cebc7c9
Branch: refs/heads/master
Commit: 3cebc7c9bf7c1d0d0f23b60f2f3d731a88cf95eb
Parents: a16d140 6709361
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 19 20:10:31 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 19 20:10:31 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
bin/storm-config.cmd | 14 +++++++-------
bin/storm.cmd | 33 ++++++++++++++++++++++-----------
3 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: Merge branch 'STORM-651' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-651
Posted by sr...@apache.org.
Merge branch 'STORM-651' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-651
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8e884013
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8e884013
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8e884013
Branch: refs/heads/master
Commit: 8e8840134eda28e00ba80fe23c175131e3900032
Parents: 05d3ccf db1182d
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 19 19:37:01 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 19 19:37:01 2015 -0800
----------------------------------------------------------------------
bin/storm-config.cmd | 14 +++++++-------
bin/storm.cmd | 33 ++++++++++++++++++++++-----------
2 files changed, 29 insertions(+), 18 deletions(-)
----------------------------------------------------------------------