commit a7ec073e2d598e55184893dc82eeec1e37328c02
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Mar 10 16:01:06 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Mar 11 23:21:58 2014 -0700
tree 9aa417bbf0467e0178cab7dfa0e0c7e058cd2741
parent 1d6a22a0b6aee1679a9db5cfeb672f734ef003e0

Switch RAMCloud to Stanford release version

- Switch RAMCloud source code to 1.0 release + patches
- WARN: RAMCloud binary is going to be built to obj.master instead of obj.blueprint-java
- Fix JNI code to follow TableEnumerator related API change
- Build JNI library inside ONOS directory
- Remove non-source code artifact related to BluePrint
- Output ZooKeeper log to onos-logs

Change-Id: Id6fbf9418d6b3ce2e560bbf24b405c4ccc80a8e6

start-ramcloud-server.sh

diff --git a/start-ramcloud-server.sh b/start-ramcloud-server.sh
index f48f831..0158be2 100755
--- a/start-ramcloud-server.sh
+++ b/start-ramcloud-server.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 ulimit -c unlimited
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/ramcloud/bindings/java/edu/stanford/ramcloud:${HOME}/ramcloud/obj.blueprint-java
 
 # Set paths
 ONOS_HOME=`dirname $0`
@@ -14,6 +13,7 @@
 serverip=`grep serverIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
 serverport=`grep serverPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
 RAMCLOUD_SERVER=`echo $serverip","$serverport`
+RAMCLOUD_BRANCH=${RAMCLOUD_BRANCH:-master}
 
 function lotate {
     logfile=$1
@@ -39,12 +39,12 @@
 
   # Run ramcloud
   echo "Starting ramcloud"
-  $RAMCLOUD_DIR/obj.blueprint-java/server -M -L $RAMCLOUD_SERVER -C $RAMCLOUD_COORDINATOR --masterServiceThreads 1 --logCleanerThreads 1 --detectFailures 0 > $RAMCLOUD_LOG 2>&1 &
+  $RAMCLOUD_DIR/obj.${RAMCLOUD_BRANCH}/server -M -L $RAMCLOUD_SERVER -C $RAMCLOUD_COORDINATOR --masterServiceThreads 1 --logCleanerThreads 1 --detectFailures 0 > $RAMCLOUD_LOG 2>&1 &
 }
 
 function stop {
   # Kill the existing processes
-  capid=`pgrep -f obj.blueprint-java/server | awk '{print $1}'`
+  capid=`pgrep -f obj.${RAMCLOUD_BRANCH}/server | awk '{print $1}'`
   pids="$capid"
   for p in ${pids}; do
     if [ x$p != "x" ]; then
@@ -76,7 +76,7 @@
 #    deldb
 #    ;;
   status)
-    n=`pgrep -f obj.blueprint-java/server | wc -l`
+    n=`pgrep -f obj.${RAMCLOUD_BRANCH}/server | wc -l`
     echo "$n ramcloud server running"
     ;;
   *)