commit b0f33102c2bb206b5a7b3c929f7b5fcb50cb622c
author P. Taylor Goetz <ptgoetz@gmail.com> Sun Feb 09 21:20:20 2014 -0500
committer P. Taylor Goetz <ptgoetz@gmail.com> Sun Feb 09 21:20:20 2014 -0500
tree e6e61df67ca7fe1df7dce4d10f4217dd9e894e57
parent dd5e9d7505dd64351c9c2f6665d81b879fbe7cd1

fixes for 0.9.1-incubating on windows

bin/storm-config.cmd

diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index e7a1604..ccf1d4f 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -25,7 +25,7 @@
   set STORM_HOME=%STORM_HOME:~0,-1%
 )
 
-if not exist %STORM_HOME%\storm*.jar (
+if not exist %STORM_HOME%\lib\storm*.jar (
     @echo +================================================================+
     @echo ^|      Error: STORM_HOME is not set correctly                   ^|
     @echo +----------------------------------------------------------------+
@@ -36,7 +36,6 @@
 )
 
 set STORM_BIN_DIR=%STORM_HOME%\bin
-set STORM_SBIN_DIR=%STORM_HOME%\sbin
 
 if not defined STORM_CONF_DIR (
   set STORM_CONF_DIR=%STORM_HOME%\conf
@@ -77,16 +76,8 @@
 @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
-@rem add sbin to CLASSPATH
-@rem
-
-set CLASSPATH=!CLASSPATH!;%STORM_HOME%\sbin\*
-
 if not defined STORM_LOG_DIR (
   set STORM_LOG_DIR=%STORM_HOME%\logs
 )
@@ -103,18 +94,10 @@
   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 (

bin/storm.cmd

diff --git a/bin/storm.cmd b/bin/storm.cmd
index 24f0842..a656ac8 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -55,7 +55,7 @@
     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
   for %%i in ( %corecommands% ) do (
     if %storm-command% == %%i set corecommand=true  
   )
@@ -124,8 +124,7 @@
 
 :nimbus
   set CLASS=backtype.storm.daemon.nimbus
-  set JMX_REMOTE_PORT=7627
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
+  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
   goto :eof
 
 :rebalance
@@ -145,8 +144,7 @@
   
 :supervisor
   set CLASS=backtype.storm.daemon.supervisor
-  set JMX_REMOTE_PORT=7699
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
+  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
   goto :eof
 
 :ui
@@ -155,12 +153,6 @@
   set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
   goto :eof
 
-:zookeeper
-  set CLASS=org.apache.zookeeper.server.quorum.QuorumPeerMain
-  set JMX_REMOTE_PORT=3181
-  set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_REMOTE_PORT%
-  goto :eof
-
 :version
   type RELEASE
   goto :eof