You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/10/25 18:33:16 UTC

[10/15] storm git commit: changes done

changes done


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b73dc74
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b73dc74
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b73dc74

Branch: refs/heads/master
Commit: 1b73dc74ad7b1129a7e242be152ad25399ba0252
Parents: dcd4de6
Author: kamleshbhatt <kb...@gmail.com>
Authored: Sun Oct 2 23:22:13 2016 +0530
Committer: kamleshbhatt <kb...@gmail.com>
Committed: Sun Oct 2 23:22:13 2016 +0530

----------------------------------------------------------------------
 bin/storm-config.cmd | 4 ++--
 bin/storm.cmd        | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/1b73dc74/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 0a9ae5e..790b3be 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -90,7 +90,7 @@ if not defined CMD_TEMP_FILE (
   set CMD_TEMP_FILE=tmpfile
 )
 
-"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value storm.log4j2.conf.dir > %CMD_TEMP_FILE%
+"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.ConfigValue storm.log4j2.conf.dir > %CMD_TEMP_FILE%
 
 FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
 	FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -117,7 +117,7 @@ if not defined STORM_LOG4J2_CONFIGURATION_FILE (
   set STORM_LOG4J2_CONFIGURATION_FILE="file:///%STORM_HOME%\log4j2\cluster.xml"
 )
 
-"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value java.library.path > %CMD_TEMP_FILE%
+"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.ConfigValue java.library.path > %CMD_TEMP_FILE%
 
 FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
     FOR /F "tokens=1,* delims= " %%a in ("%%i") do (

http://git-wip-us.apache.org/repos/asf/storm/blob/1b73dc74/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 281caca..6c05a4f 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -60,7 +60,7 @@
     goto :eof
   )
 
-  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus logviewer rebalance remoteconfvalue repl shell supervisor ui
+  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus logviewer rebalance remoteconfvalue repl shell supervisor ui admin
   for %%i in ( %corecommands% ) do (
     if %storm-command% == %%i set corecommand=true  
   )
@@ -129,6 +129,11 @@
   set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
   goto :eof
 
+:admin
+  set CLASS=org.apache.storm.command.AdminCommands
+  set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
+  goto :eof
+
 :classpath
   echo %CLASSPATH% 
   goto :eof
@@ -296,6 +301,7 @@
   @echo   supervisor           launches the supervisor daemon
   @echo   ui                   launches the UI daemon
   @echo   version              print the version
+  @echo   admin                run admin commands
   @echo.
   @echo  or
   @echo   CLASSNAME            run the class named CLASSNAME