From 0a2ff65814170276208d64fb2d98aae1970ab930 Mon Sep 17 00:00:00 2001
From: sears <sears@8dad8b1f-cf64-0410-95b6-bcf113ffbcfe>
Date: Wed, 22 Feb 2012 23:36:18 +0000
Subject: [PATCH] rename sherpa/ to servers/mapkeeper/

git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@3778 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
---
 .../mapkeeper}/LSMServerHandler.cc            |  0
 .../mapkeeper}/LSMServerHandler.h             |  0
 {sherpa => servers/mapkeeper}/Makefile        |  0
 servers/mapkeeper/Makefile.local              | 25 ++++++++++++++++
 {sherpa => servers/mapkeeper}/main/Makefile   |  0
 .../mapkeeper}/main/lsm_client.cc             |  0
 .../mapkeeper}/main/lsm_server.cc             |  0
 sherpa/Makefile.local                         | 30 -------------------
 8 files changed, 25 insertions(+), 30 deletions(-)
 rename {sherpa => servers/mapkeeper}/LSMServerHandler.cc (100%)
 rename {sherpa => servers/mapkeeper}/LSMServerHandler.h (100%)
 rename {sherpa => servers/mapkeeper}/Makefile (100%)
 create mode 100644 servers/mapkeeper/Makefile.local
 rename {sherpa => servers/mapkeeper}/main/Makefile (100%)
 rename {sherpa => servers/mapkeeper}/main/lsm_client.cc (100%)
 rename {sherpa => servers/mapkeeper}/main/lsm_server.cc (100%)
 delete mode 100644 sherpa/Makefile.local

diff --git a/sherpa/LSMServerHandler.cc b/servers/mapkeeper/LSMServerHandler.cc
similarity index 100%
rename from sherpa/LSMServerHandler.cc
rename to servers/mapkeeper/LSMServerHandler.cc
diff --git a/sherpa/LSMServerHandler.h b/servers/mapkeeper/LSMServerHandler.h
similarity index 100%
rename from sherpa/LSMServerHandler.h
rename to servers/mapkeeper/LSMServerHandler.h
diff --git a/sherpa/Makefile b/servers/mapkeeper/Makefile
similarity index 100%
rename from sherpa/Makefile
rename to servers/mapkeeper/Makefile
diff --git a/servers/mapkeeper/Makefile.local b/servers/mapkeeper/Makefile.local
new file mode 100644
index 0000000..a5e98f7
--- /dev/null
+++ b/servers/mapkeeper/Makefile.local
@@ -0,0 +1,25 @@
+THRIFT_DIR = /home/sears/local/thrift
+
+CPPFLAGS =-I../../../stasis -I../.. -I. -I $(THRIFT_DIR)/include/thrift -I../../../mapkeeper/thrift/gen-cpp
+CXXFLAGS =-g -O3
+
+LDFLAGS=-lpthread -llogstore -lstasis -lmapkeeper -lthrift 	\
+	   -L $(THRIFT_DIR)/lib -L ../../../mapkeeper/thrift/gen-cpp	 		\
+	   -L ../../build -L ../../../stasis/build/src/stasis 				\
+	   -Wl,-rpath,\$$ORIGIN/../../../build						\
+           -Wl,-rpath,\$$ORIGIN/../../../../stasis/build/src/stasis			\
+           -Wl,-rpath,\$$ORIGIN/../../../../mapkeeper/thrift/gen-cpp			\
+           -Wl,-rpath,/usr/local/lib							\
+           -Wl,-rpath,$(THRIFT_DIR)/lib
+
+all: main/lsm_client main/lsm_server main/lsm_shutdown
+
+main/lsm_client :
+main/lsm_shutdown :
+
+main/lsm_server : LSMServerHandler.cc
+
+clean:
+	rm -f main/lsm_client main/lsm_server
+
+#		 $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
diff --git a/sherpa/main/Makefile b/servers/mapkeeper/main/Makefile
similarity index 100%
rename from sherpa/main/Makefile
rename to servers/mapkeeper/main/Makefile
diff --git a/sherpa/main/lsm_client.cc b/servers/mapkeeper/main/lsm_client.cc
similarity index 100%
rename from sherpa/main/lsm_client.cc
rename to servers/mapkeeper/main/lsm_client.cc
diff --git a/sherpa/main/lsm_server.cc b/servers/mapkeeper/main/lsm_server.cc
similarity index 100%
rename from sherpa/main/lsm_server.cc
rename to servers/mapkeeper/main/lsm_server.cc
diff --git a/sherpa/Makefile.local b/sherpa/Makefile.local
deleted file mode 100644
index 1bbf41f..0000000
--- a/sherpa/Makefile.local
+++ /dev/null
@@ -1,30 +0,0 @@
-THRIFT_DIR = /home/sears/local/thrift
-
-CPPFLAGS =-I../../stasis -I.. -I. -I $(THRIFT_DIR)/include/thrift -I../../mapkeeper/thrift/gen-cpp
-CXXFLAGS =-g -O3
-
-LDFLAGS=-lpthread -llogstore -lstasis -lmapkeeper -lthrift 	\
-	   -L $(THRIFT_DIR)/lib -L ../../mapkeeper/thrift/gen-cpp	 		\
-	   -L ../build -L ../../stasis/build/src/stasis 				\
-	   -Wl,-rpath,\$$ORIGIN/../../build						\
-           -Wl,-rpath,\$$ORIGIN/../../../stasis/build/src/stasis			\
-           -Wl,-rpath,\$$ORIGIN/../../../mapkeeper/thrift/gen-cpp			\
-           -Wl,-rpath,/usr/local/lib							\
-           -Wl,-rpath,$(THRIFT_DIR)/lib
-
-all: main/lsm_client main/lsm_server main/lsm_shutdown
-
-dht_thrift.jar :
-	cd ../thrift/gen-java;
-	bash -c 'javac \`find . -name *.java\` -cp $(THRIFT_DIR)/lib/libthrift.jar:/usr/share/java/slf4j-api-1.5.11.jar'
-	cd ../../sherpa
-
-main/lsm_client :
-main/lsm_shutdown :
-
-main/lsm_server : LSMServerHandler.cc
-
-clean:
-	rm -f main/lsm_client main/lsm_server
-
-#		 $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS)