From e76b7d1e8b1a2bde0d63e84fe2bd63f9480bb745 Mon Sep 17 00:00:00 2001
From: Ben Johnson <benbjohnson@yahoo.com>
Date: Wed, 4 Dec 2013 22:24:04 -0700
Subject: [PATCH] Add mod/lock version.

---
 mod/lock/{ => v2}/acquire_handler.go    | 2 +-
 mod/lock/{ => v2}/get_index_handler.go  | 2 +-
 mod/lock/{ => v2}/handler.go            | 2 +-
 mod/lock/{ => v2}/release_handler.go    | 2 +-
 mod/lock/{ => v2}/renew_handler.go      | 2 +-
 mod/lock/{ => v2}/tests/handler_test.go | 8 ++++----
 mod/mod.go                              | 4 ++--
 test.sh                                 | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename mod/lock/{ => v2}/acquire_handler.go (99%)
 rename mod/lock/{ => v2}/get_index_handler.go (98%)
 rename mod/lock/{ => v2}/handler.go (99%)
 rename mod/lock/{ => v2}/release_handler.go (97%)
 rename mod/lock/{ => v2}/renew_handler.go (98%)
 rename mod/lock/{ => v2}/tests/handler_test.go (92%)

diff --git a/mod/lock/acquire_handler.go b/mod/lock/v2/acquire_handler.go
similarity index 99%
rename from mod/lock/acquire_handler.go
rename to mod/lock/v2/acquire_handler.go
index db5cbba8b..de82cdd16 100644
--- a/mod/lock/acquire_handler.go
+++ b/mod/lock/v2/acquire_handler.go
@@ -1,4 +1,4 @@
-package lock
+package v2
 
 import (
 	"net/http"
diff --git a/mod/lock/get_index_handler.go b/mod/lock/v2/get_index_handler.go
similarity index 98%
rename from mod/lock/get_index_handler.go
rename to mod/lock/v2/get_index_handler.go
index 2bb97a83c..2393da76c 100644
--- a/mod/lock/get_index_handler.go
+++ b/mod/lock/v2/get_index_handler.go
@@ -1,4 +1,4 @@
-package lock
+package v2
 
 import (
 	"net/http"
diff --git a/mod/lock/handler.go b/mod/lock/v2/handler.go
similarity index 99%
rename from mod/lock/handler.go
rename to mod/lock/v2/handler.go
index 43e149145..2713758b3 100644
--- a/mod/lock/handler.go
+++ b/mod/lock/v2/handler.go
@@ -1,4 +1,4 @@
-package lock
+package v2
 
 import (
 	"net/http"
diff --git a/mod/lock/release_handler.go b/mod/lock/v2/release_handler.go
similarity index 97%
rename from mod/lock/release_handler.go
rename to mod/lock/v2/release_handler.go
index 09251f259..b41157ef2 100644
--- a/mod/lock/release_handler.go
+++ b/mod/lock/v2/release_handler.go
@@ -1,4 +1,4 @@
-package lock
+package v2
 
 import (
 	"path"
diff --git a/mod/lock/renew_handler.go b/mod/lock/v2/renew_handler.go
similarity index 98%
rename from mod/lock/renew_handler.go
rename to mod/lock/v2/renew_handler.go
index 7933931e4..cdd65b3aa 100644
--- a/mod/lock/renew_handler.go
+++ b/mod/lock/v2/renew_handler.go
@@ -1,4 +1,4 @@
-package lock
+package v2
 
 import (
 	"path"
diff --git a/mod/lock/tests/handler_test.go b/mod/lock/v2/tests/handler_test.go
similarity index 92%
rename from mod/lock/tests/handler_test.go
rename to mod/lock/v2/tests/handler_test.go
index 7e9091a0f..b589865bf 100644
--- a/mod/lock/tests/handler_test.go
+++ b/mod/lock/v2/tests/handler_test.go
@@ -164,25 +164,25 @@ func TestModLockRenew(t *testing.T) {
 
 
 func testAcquireLock(s *server.Server, key string, ttl int) (string, error) {
-	resp, err := tests.PostForm(fmt.Sprintf("%s/mod/lock/%s?ttl=%d", s.URL(), key, ttl), nil)
+	resp, err := tests.PostForm(fmt.Sprintf("%s/mod/lock/v2/%s?ttl=%d", s.URL(), key, ttl), nil)
 	ret := tests.ReadBody(resp)
 	return string(ret), err
 }
 
 func testGetLockIndex(s *server.Server, key string) (string, error) {
-	resp, err := tests.Get(fmt.Sprintf("%s/mod/lock/%s", s.URL(), key))
+	resp, err := tests.Get(fmt.Sprintf("%s/mod/lock/v2/%s", s.URL(), key))
 	ret := tests.ReadBody(resp)
 	return string(ret), err
 }
 
 func testReleaseLock(s *server.Server, key string, index int) (string, error) {
-	resp, err := tests.DeleteForm(fmt.Sprintf("%s/mod/lock/%s/%d", s.URL(), key, index), nil)
+	resp, err := tests.DeleteForm(fmt.Sprintf("%s/mod/lock/v2/%s/%d", s.URL(), key, index), nil)
 	ret := tests.ReadBody(resp)
 	return string(ret), err
 }
 
 func testRenewLock(s *server.Server, key string, index int, ttl int) (string, error) {
-	resp, err := tests.PutForm(fmt.Sprintf("%s/mod/lock/%s/%d?ttl=%d", s.URL(), key, index, ttl), nil)
+	resp, err := tests.PutForm(fmt.Sprintf("%s/mod/lock/v2/%s/%d?ttl=%d", s.URL(), key, index, ttl), nil)
 	ret := tests.ReadBody(resp)
 	return string(ret), err
 }
diff --git a/mod/mod.go b/mod/mod.go
index 7c0194f56..b5625db3f 100644
--- a/mod/mod.go
+++ b/mod/mod.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/coreos/etcd/mod/dashboard"
-	"github.com/coreos/etcd/mod/lock"
+	lock2 "github.com/coreos/etcd/mod/lock/v2"
 	"github.com/gorilla/mux"
 )
 
@@ -23,6 +23,6 @@ func HttpHandler(addr string) http.Handler {
 	r.PathPrefix("/dashboard/").Handler(http.StripPrefix("/dashboard/", dashboard.HttpHandler()))
 
 	// TODO: Use correct addr.
-	r.PathPrefix("/lock").Handler(http.StripPrefix("/lock", lock.NewHandler(addr)))
+	r.PathPrefix("/lock/v2").Handler(http.StripPrefix("/lock/v2", lock2.NewHandler(addr)))
 	return r
 }
diff --git a/test.sh b/test.sh
index cb4c51fa9..ae40d8200 100755
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 set -e
 
 if [ -z "$PKG" ]; then
-    PKG="./store ./server ./server/v2/tests ./mod/lock/tests"
+    PKG="./store ./server ./server/v2/tests ./mod/lock/v2/tests"
 fi
 
 # Get GOPATH, etc from build