storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptgo...@apache.org
Subject [08/12] git commit: add most recent changes from davidlao2k/storm-windows
Date Thu, 19 Dec 2013 06:25:20 GMT
add most recent changes from davidlao2k/storm-windows


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

Branch: refs/heads/master
Commit: a0c2ec732fa772fe7d9649626e6edc37ee1514db
Parents: 697849d
Author: P. Taylor Goetz <ptgoetz@gmail.com>
Authored: Mon Dec 16 16:33:09 2013 -0500
Committer: P. Taylor Goetz <ptgoetz@gmail.com>
Committed: Mon Dec 16 16:33:09 2013 -0500

----------------------------------------------------------------------
 bin/storm-config.cmd | 22 +++++++++++++++++++---
 bin/storm.cmd        | 21 ++++++++++++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a0c2ec73/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 9b3d777..9f38c25 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -13,7 +13,7 @@ if not exist %STORM_HOME%\storm*.jar (
     @echo ^|      Error: STORM_HOME is not set correctly                   ^|
     @echo +----------------------------------------------------------------+
     @echo ^| Please set your STORM_HOME variable to the absolute path of   ^|
-    @echo ^| the directory that contains the storm distribution            ^|
+    @echo ^| the directory that contains the storm distribution      ^|
     @echo +================================================================+
     exit /b 1
 )
@@ -54,12 +54,14 @@ if defined STORM_HEAPSIZE (
 @rem
 
 set CLASSPATH=%STORM_HOME%\*;%STORM_CONF_DIR%
-set CLASSPATH=!CLASSPATH!;%JAVA_HOME%\lib\tools.jar
+set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
 
 @rem
 @rem add libs to CLASSPATH
 @rem
 
+set CLASSPATH=!CLASSPATH!;%STORM_HOME%\lib\storm\*
+set CLASSPATH=!CLASSPATH!;%STORM_HOME%\lib\common\*
 set CLASSPATH=!CLASSPATH!;%STORM_HOME%\lib\*
 
 @rem
@@ -80,9 +82,23 @@ if not defined STORM_ROOT_LOGGER (
   set STORM_ROOT_LOGGER=INFO,console,DRFA
 )
 
-set STORM_OPTS=-Dstorm.home=%STORM_HOME% -Djava.library.path=sbin -Dlog4j.configuration=storm.log.properties
+if not defined STORM_LOGBACK_CONFIGURATION_FILE (
+  set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_CONF_DIR%\logback.xml
+)
+
+if not defined STORM_WORKER_JMXREMOTE_PORT_OFFSET (
+  set STORM_WORKER_JMXREMOTE_PORT_OFFSET=1000
+)
+
+set STORM_OPTS=-Dstorm.home=%STORM_HOME% -Djava.library.path=sbin
+set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
 set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
 set STORM_OPTS=%STORM_OPTS% -Dstorm.root.logger=%STORM_ROOT_LOGGER%
+set STORM_OPTS=%STORM_OPTS% -Dstorm.worker.jmxremote.port.offset=%STORM_WORKER_JMXREMOTE_PORT_OFFSET%
+set STORM_OPTS=%STORM_OPTS% -Dcom.sun.management.jmxremote
+set STORM_OPTS=%STORM_OPTS% -Dcom.sun.management.jmxremote.authenticate=false
+set STORM_OPTS=%STORM_OPTS% -Dcom.sun.management.jmxremote.ssl=false
+
 
 if not defined STORM_SERVER_OPTS (
   set STORM_SERVER_OPTS=-server

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a0c2ec73/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 5d97753..951ff5e 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -34,11 +34,11 @@
     if %storm-command% == %%i set shellcommand=true
   )
   if defined shellcommand (
-    call :%storm-command%
+    call :%storm-command% %*
     goto :eof
   )
 
-  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus rebalance repl
shell supervisor ui zookeeper
+  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus rebalance repl
shell supervisor ui zookeeper compile
   for %%i in ( %corecommands% ) do (
     if %storm-command% == %%i set corecommand=true  
   )
@@ -50,6 +50,7 @@
 
   if %storm-command% == jar (
     set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% -Dstorm.jar=%2
+    set CLASSPATH=%CLASSPATH%;%2
     set CLASS=%3
     set storm-command-arguments=%4 %5 %6 %7 %8 %9
   )
@@ -65,6 +66,7 @@
   call %JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments%
   goto :eof
 
+
 :activate
   set CLASS=backtype.storm.command.activate
   set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
@@ -105,7 +107,8 @@
 
 :nimbus
   set CLASS=backtype.storm.daemon.nimbus
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+  set JMX_REMOTE_PORT=7627
+  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
   goto :eof
 
 :rebalance
@@ -125,7 +128,8 @@
   
 :supervisor
   set CLASS=backtype.storm.daemon.supervisor
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+  set JMX_REMOTE_PORT=7699
+  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
   goto :eof
 
 :ui
@@ -135,7 +139,14 @@
 
 :zookeeper
   set CLASS=org.apache.zookeeper.server.quorum.QuorumPeerMain
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+  set JMX_REMOTE_PORT=3181
+  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
+  goto :eof
+
+:compile
+  echo Compiling %1...
+  set CLASS=scp.spec.compile
+  set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
   goto :eof
 
 :version


Mime
View raw message