svn commit: r1759720 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/contrib/zooinspector/zooInspector.cmd

[ph...@apache.org]

Author: phunt
Date: Wed Sep  7 22:12:54 2016
New Revision: 1759720

URL: http://svn.apache.org/viewvc?rev=1759720&view=rev
Log:
ZOOKEEPER-2548: zooInspector does not start on Windows (Arshad Mohammad via phunt)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/contrib/zooinspector/zooInspector.cmd

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1759720&r1=1759719&r2=1759720&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Wed Sep  7 22:12:54 2016
@@ -32,6 +32,9 @@ BUGFIXES:
   ZOOKEEPER-2152: Intermittent failure in TestReconfig.cc
   (Michael Han via phunt)
 
+  ZOOKEEPER-2548: zooInspector does not start on Windows
+  (Arshad Mohammad via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2505: Use shared library instead of static library in C

Modified: zookeeper/branches/branch-3.5/src/contrib/zooinspector/zooInspector.cmd
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/zooinspector/zooInspector.cmd?rev=1759720&r1=1759719&r2=1759720&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/zooinspector/zooInspector.cmd (original)
+++ zookeeper/branches/branch-3.5/src/contrib/zooinspector/zooInspector.cmd Wed Sep  7 22:12:54 2016
@@ -1,18 +1,21 @@
-#!/bin/sh
+@echo off
+@rem Licensed to the Apache Software Foundation (ASF) under one or more
+@rem contributor license agreements.  See the NOTICE file distributed with
+@rem this work for additional information regarding copyright ownership.
+@rem The ASF licenses this file to You under the Apache License, Version 2.0
+@rem (the "License"); you may not use this file except in compliance with
+@rem the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
 
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-java -cp "zookeeper-dev-ZooInspector.jar;lib\*;lib" org.apache.zookeeper.inspector.ZooInspector
+set CLASSPATH=lib\*;lib
+for /F %%f in ('dir /b "%~dp0%\*.jar" 2^>nul') do (
+   set CLASSPATH=%%f;%CLASSPATH%
+)
+java -cp "%CLASSPATH%" org.apache.zookeeper.inspector.ZooInspector