Author: phunt
Date: Fri Jan 6 01:23:41 2012
New Revision: 1227923
URL: http://svn.apache.org/viewvc?rev=1227923&view=rev
Log:
ZOOKEEPER-1050. zooinspector shell scripts do not work (Will Johnson via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/contrib/zooinspector/build.xml
zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd
zookeeper/trunk/src/contrib/zooinspector/zooInspector.sh
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1227923&r1=1227922&r2=1227923&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Jan 6 01:23:41 2012
@@ -91,6 +91,9 @@ BUGFIXES:
option of nc (Roman Shaposhnik via phunt)
ZOOKEEPER-1343. getEpochToPropose should check if lastAcceptedEpoch is greater or equal
than epoch (fpj via breed)
+
+ ZOOKEEPER-1050. zooinspector shell scripts do not work
+ (Will Johnson via phunt)
IMPROVEMENTS:
Modified: zookeeper/trunk/src/contrib/zooinspector/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/build.xml?rev=1227923&r1=1227922&r2=1227923&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/build.xml (original)
+++ zookeeper/trunk/src/contrib/zooinspector/build.xml Fri Jan 6 01:23:41 2012
@@ -54,7 +54,6 @@
<jar jarfile="${jarname}">
<manifest>
<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
- <attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/zookeeper-${version}.jar
lib" />
<attribute name="Built-By" value="${user.name}" />
<attribute name="Built-At" value="${build.time}" />
<attribute name="Built-On" value="${host.name}" />
Modified: zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd?rev=1227923&r1=1227922&r2=1227923&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd (original)
+++ zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd Fri Jan 6 01:23:41 2012
@@ -15,4 +15,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-java -cp zookeeper-dev-ZooInspector.jar;lib/log4j-1.2.15.jar;lib/zookeeper-3.5.0.jar;lib
org.apache.zookeeper.inspector.ZooInspector
+java -cp "zookeeper-dev-ZooInspector.jar;lib\*;lib" org.apache.zookeeper.inspector.ZooInspector
Modified: zookeeper/trunk/src/contrib/zooinspector/zooInspector.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/zooInspector.sh?rev=1227923&r1=1227922&r2=1227923&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/zooInspector.sh (original)
+++ zookeeper/trunk/src/contrib/zooinspector/zooInspector.sh Fri Jan 6 01:23:41 2012
@@ -15,4 +15,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-java -cp zookeeper-dev-ZooInspector.jar:lib/log4j-1.2.15.jar:lib/zookeeper-3.5.0.jar:lib
org.apache.zookeeper.inspector.ZooInspector
+java -cp "zookeeper-dev-ZooInspector.jar:lib/*:lib" org.apache.zookeeper.inspector.ZooInspector
|