# HG changeset patch
# User sugi
# Date 1398078005 -32400
# Node ID 2a8440684441a08482b124b73b81676e9763361c
# Parent  4f534c07d41ef483db72d53074280de91688417c
change Jar Path

diff -r 4f534c07d41e -r 2a8440684441 scripts/aquarium.sh
--- a/scripts/aquarium.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/aquarium.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -6,6 +6,7 @@
 max=$1
 child_num=$2
 java=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java
+jar_path=../build/libs/Alice.jar
 if [ ! -e $java ]; then
     echo "$java not found."
     exit 1
@@ -15,12 +16,12 @@
 dot -Tpng ./topology/tree.dot > ./topology/tree.png
 #open ./topology/tree.png
 $java -version
-$java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
+$java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    $java -cp  ../Alice.jar alice.test.topology.aquarium.FishMovementTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/aquarium${cnt}.log -level debug > ./output/std_aquarium${cnt}.log &
+    $java -cp $jar_path alice.test.topology.aquarium.FishMovementTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/aquarium${cnt}.log -level debug > ./output/std_aquarium${cnt}.log &
     cnt=`expr $cnt + 1`
 done
 wait
diff -r 4f534c07d41e -r 2a8440684441 scripts/fish_run.sh
--- a/scripts/fish_run.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/fish_run.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -1,13 +1,15 @@
 #!/bin/bash
 max=$1
 child_num=$2
+jar_path=../build/libs/Alice.jar
+
 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot
-java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    java -cp ../Alice.jar alice.test.topology.fish.DistributedFish -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/fish${cnt}.log -level debug > ./output/std_fish${cnt}.log &
+    java -cp $jar_path alice.test.topology.fish.DistributedFish -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/fish${cnt}.log -level debug > ./output/std_fish${cnt}.log &
     cnt=`expr $cnt + 1`
 done
 wait
diff -r 4f534c07d41e -r 2a8440684441 scripts/keeparive.sh
--- a/scripts/keeparive.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/keeparive.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -1,26 +1,27 @@
 #!/bin/bash
 if [ $# -ne 2 ]; then 
-    echo "Usage: ./aquarium.sh NODENUM CHILDLENNUM"
+    echo "Usage: ./keeparive.sh NODENUM CHILDLENNUM"
     exit 1
 fi
 max=$1
 child_num=$2
-java=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java
 if [ ! -e $java ]; then
     echo "$java not found."
     exit 1
 fi
 
+jar_path=../build/libs/Alice.jar
+
 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot
 dot -Tpng ./topology/tree.dot > ./topology/tree.png
 #open ./topology/tree.png
-$java -version
-$java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
+java -version
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    $java -cp  ../Alice.jar alice.topology.manager.keeparive.KeepAlive -host `hostname` -port 10000 -p `expr 20000 + $cnt` -level debug > ./output/std_keepalive${cnt}.log &
+    java -cp $jar_path alice.topology.manager.keeparive.KeepAlive -host `hostname` -port 10000 -p `expr 20000 + $cnt` -level debug > ./output/std_keepalive${cnt}.log &
     cnt=`expr $cnt + 1`
 done
 wait
diff -r 4f534c07d41e -r 2a8440684441 scripts/ring_run.sh
--- a/scripts/ring_run.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/ring_run.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -6,15 +6,17 @@
 
 max=$1
 count=$2
+jar_path=../build/libs/Alice.jar
+
 ruby ./topology/ring.rb $1 > ./topology/ring.dot
 #dot -Tpng ./topology/ring.dot > ./topology/ring.png
 #open ./topology/ring.png
-java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/ring.dot -log ./output/manager.log -level debug &
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/ring.dot -log ./output/manager.log -level debug &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    java -cp ../Alice.jar alice.test.topology.ring.RingTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/ring${cnt}.log -level debug -count $count -size 4096 -nodeNum $max &
+    java -cp $jar_path alice.test.topology.ring.RingTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/ring${cnt}.log -level debug -count $count -size 4096 -nodeNum $max &
     cnt=`expr $cnt + 1`
 done
 wait
diff -r 4f534c07d41e -r 2a8440684441 scripts/run_manager.sh
--- a/scripts/run_manager.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/run_manager.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -1,6 +1,8 @@
 #!/bin/bash
 max=$1
 child_num=$2
+jar_path=../build/libs/Alice.jar
+
 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot
 dot -Tpng ./topology/tree.dot > ./topology/tree.png
-java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot &
\ No newline at end of file
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot &
\ No newline at end of file
diff -r 4f534c07d41e -r 2a8440684441 scripts/share_run.sh
--- a/scripts/share_run.sh	Mon Apr 21 19:59:11 2014 +0900
+++ b/scripts/share_run.sh	Mon Apr 21 20:00:05 2014 +0900
@@ -1,15 +1,17 @@
 #!/bin/bash
 max=$1
 child_num=$2
+jar_path=../build/libs/Alice.jar
+
 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot
 dot -Tpng ./topology/tree.dot > ./topology/tree.png
 #open ./topology/tree.png
-java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot &
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    java -cp ../Alice.jar alice.test.topology.share.ShareTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` > ./output/std_share${cnt}.log &
+    java -cp $jar_path alice.test.topology.share.ShareTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` > ./output/std_share${cnt}.log &
     cnt=`expr $cnt + 1`
 done
 wait