Use Golang 1.6 vendor structure

60 files changed, 15 insertions, 26 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ad2a373
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+
+GOPATH := ${PWD}
+export GOPATH
+
+default: build
+
+build: dict2rest
+
+dict2rest:
+	go install dict2rest
+
+clean:
+	rm bin/*
+
+.PHONY: build dict2rest clean
diff --git a/vendor/src/github.com/julienschmidt/httprouter/.travis.yml b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/.travis.yml
index 9a3c1a8..9a3c1a8 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/.travis.yml
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/.travis.yml
diff --git a/vendor/src/github.com/julienschmidt/httprouter/LICENSE b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/LICENSE
index b829abc..b829abc 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/LICENSE
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/LICENSE
diff --git a/vendor/src/github.com/julienschmidt/httprouter/README.md b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/README.md
index 7b467f5..7b467f5 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/README.md
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/README.md
diff --git a/vendor/src/github.com/julienschmidt/httprouter/path.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/path.go
index 486134d..486134d 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/path.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/path.go
diff --git a/vendor/src/github.com/julienschmidt/httprouter/path_test.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/path_test.go
index c4ceda5..c4ceda5 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/path_test.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/path_test.go
diff --git a/vendor/src/github.com/julienschmidt/httprouter/router.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/router.go
index 8b5ff34..8b5ff34 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/router.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/router.go
diff --git a/vendor/src/github.com/julienschmidt/httprouter/router_test.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/router_test.go
index e3141bd..e3141bd 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/router_test.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/router_test.go
diff --git a/vendor/src/github.com/julienschmidt/httprouter/tree.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/tree.go
index faf5fdc..faf5fdc 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/tree.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/tree.go
diff --git a/vendor/src/github.com/julienschmidt/httprouter/tree_test.go b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/tree_test.go
index 46d3299..46d3299 100644
--- a/vendor/src/github.com/julienschmidt/httprouter/tree_test.go
+++ b/src/dict2rest/vendor/github.com/julienschmidt/httprouter/tree_test.go
diff --git a/vendor/src/github.com/justinas/alice/.travis.yml b/src/dict2rest/vendor/github.com/justinas/alice/.travis.yml
index 9398694..9398694 100644
--- a/vendor/src/github.com/justinas/alice/.travis.yml
+++ b/src/dict2rest/vendor/github.com/justinas/alice/.travis.yml
diff --git a/vendor/src/github.com/justinas/alice/LICENSE b/src/dict2rest/vendor/github.com/justinas/alice/LICENSE
index 0d0d352..0d0d352 100644
--- a/vendor/src/github.com/justinas/alice/LICENSE
+++ b/src/dict2rest/vendor/github.com/justinas/alice/LICENSE
diff --git a/vendor/src/github.com/justinas/alice/README.md b/src/dict2rest/vendor/github.com/justinas/alice/README.md
index 88d2134..88d2134 100644
--- a/vendor/src/github.com/justinas/alice/README.md
+++ b/src/dict2rest/vendor/github.com/justinas/alice/README.md
diff --git a/vendor/src/github.com/justinas/alice/chain.go b/src/dict2rest/vendor/github.com/justinas/alice/chain.go
index d281ad3..d281ad3 100644
--- a/vendor/src/github.com/justinas/alice/chain.go
+++ b/src/dict2rest/vendor/github.com/justinas/alice/chain.go
diff --git a/vendor/src/github.com/justinas/alice/chain_test.go b/src/dict2rest/vendor/github.com/justinas/alice/chain_test.go
index 49c0470..49c0470 100644
--- a/vendor/src/github.com/justinas/alice/chain_test.go
+++ b/src/dict2rest/vendor/github.com/justinas/alice/chain_test.go
diff --git a/vendor/src/github.com/rs/cors/.travis.yml b/src/dict2rest/vendor/github.com/rs/cors/.travis.yml
index bbb5185..bbb5185 100644
--- a/vendor/src/github.com/rs/cors/.travis.yml
+++ b/src/dict2rest/vendor/github.com/rs/cors/.travis.yml
diff --git a/vendor/src/github.com/rs/cors/LICENSE b/src/dict2rest/vendor/github.com/rs/cors/LICENSE
index d8e2df5..d8e2df5 100644
--- a/vendor/src/github.com/rs/cors/LICENSE
+++ b/src/dict2rest/vendor/github.com/rs/cors/LICENSE
diff --git a/vendor/src/github.com/rs/cors/README.md b/src/dict2rest/vendor/github.com/rs/cors/README.md
index 4bf5672..4bf5672 100644
--- a/vendor/src/github.com/rs/cors/README.md
+++ b/src/dict2rest/vendor/github.com/rs/cors/README.md
diff --git a/vendor/src/github.com/rs/cors/bench_test.go b/src/dict2rest/vendor/github.com/rs/cors/bench_test.go
index b6e3721..b6e3721 100644
--- a/vendor/src/github.com/rs/cors/bench_test.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/bench_test.go
diff --git a/vendor/src/github.com/rs/cors/cors.go b/src/dict2rest/vendor/github.com/rs/cors/cors.go
index 6616061..6616061 100644
--- a/vendor/src/github.com/rs/cors/cors.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/cors.go
diff --git a/vendor/src/github.com/rs/cors/cors_test.go b/src/dict2rest/vendor/github.com/rs/cors/cors_test.go
index 28672a0..28672a0 100644
--- a/vendor/src/github.com/rs/cors/cors_test.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/cors_test.go
diff --git a/vendor/src/github.com/rs/cors/examples/alice/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/alice/server.go
index 0a3e15c..0a3e15c 100644
--- a/vendor/src/github.com/rs/cors/examples/alice/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/alice/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/default/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/default/server.go
index ccb5e1b..ccb5e1b 100644
--- a/vendor/src/github.com/rs/cors/examples/default/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/default/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/goji/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/goji/server.go
index 1fb4073..1fb4073 100644
--- a/vendor/src/github.com/rs/cors/examples/goji/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/goji/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/martini/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/martini/server.go
index 081af32..081af32 100644
--- a/vendor/src/github.com/rs/cors/examples/martini/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/martini/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/negroni/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/negroni/server.go
index 3cb33bf..3cb33bf 100644
--- a/vendor/src/github.com/rs/cors/examples/negroni/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/negroni/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/nethttp/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/nethttp/server.go
index eaa775e..eaa775e 100644
--- a/vendor/src/github.com/rs/cors/examples/nethttp/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/nethttp/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/openbar/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/openbar/server.go
index 0940423..0940423 100644
--- a/vendor/src/github.com/rs/cors/examples/openbar/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/openbar/server.go
diff --git a/vendor/src/github.com/rs/cors/examples/xhandler/server.go b/src/dict2rest/vendor/github.com/rs/cors/examples/xhandler/server.go
index 649a1c7..649a1c7 100644
--- a/vendor/src/github.com/rs/cors/examples/xhandler/server.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/examples/xhandler/server.go
diff --git a/vendor/src/github.com/rs/cors/utils.go b/src/dict2rest/vendor/github.com/rs/cors/utils.go
index cd24831..cd24831 100644
--- a/vendor/src/github.com/rs/cors/utils.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/utils.go
diff --git a/vendor/src/github.com/rs/cors/utils_test.go b/src/dict2rest/vendor/github.com/rs/cors/utils_test.go
index 83053b3..83053b3 100644
--- a/vendor/src/github.com/rs/cors/utils_test.go
+++ b/src/dict2rest/vendor/github.com/rs/cors/utils_test.go
diff --git a/vendor/src/github.com/rs/xhandler/.travis.yml b/src/dict2rest/vendor/github.com/rs/xhandler/.travis.yml
index b65c7a9..b65c7a9 100644
--- a/vendor/src/github.com/rs/xhandler/.travis.yml
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/.travis.yml
diff --git a/vendor/src/github.com/rs/xhandler/LICENSE b/src/dict2rest/vendor/github.com/rs/xhandler/LICENSE
index 47c5e9d..47c5e9d 100644
--- a/vendor/src/github.com/rs/xhandler/LICENSE
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/LICENSE
diff --git a/vendor/src/github.com/rs/xhandler/README.md b/src/dict2rest/vendor/github.com/rs/xhandler/README.md
index 91c594b..91c594b 100644
--- a/vendor/src/github.com/rs/xhandler/README.md
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/README.md
diff --git a/vendor/src/github.com/rs/xhandler/chain.go b/src/dict2rest/vendor/github.com/rs/xhandler/chain.go
index 042274d..042274d 100644
--- a/vendor/src/github.com/rs/xhandler/chain.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/chain.go
diff --git a/vendor/src/github.com/rs/xhandler/chain_example_test.go b/src/dict2rest/vendor/github.com/rs/xhandler/chain_example_test.go
index 005b5b2..005b5b2 100644
--- a/vendor/src/github.com/rs/xhandler/chain_example_test.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/chain_example_test.go
diff --git a/vendor/src/github.com/rs/xhandler/chain_test.go b/src/dict2rest/vendor/github.com/rs/xhandler/chain_test.go
index 0ce9410..0ce9410 100644
--- a/vendor/src/github.com/rs/xhandler/chain_test.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/chain_test.go
diff --git a/vendor/src/github.com/rs/xhandler/middleware.go b/src/dict2rest/vendor/github.com/rs/xhandler/middleware.go
index 5de1364..5de1364 100644
--- a/vendor/src/github.com/rs/xhandler/middleware.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/middleware.go
diff --git a/vendor/src/github.com/rs/xhandler/middleware_test.go b/src/dict2rest/vendor/github.com/rs/xhandler/middleware_test.go
index 51306e3..51306e3 100644
--- a/vendor/src/github.com/rs/xhandler/middleware_test.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/middleware_test.go
diff --git a/vendor/src/github.com/rs/xhandler/xhandler.go b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler.go
index 0dfcddf..0dfcddf 100644
--- a/vendor/src/github.com/rs/xhandler/xhandler.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler.go
diff --git a/vendor/src/github.com/rs/xhandler/xhandler_example_test.go b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler_example_test.go
index 9f6f8a5..9f6f8a5 100644
--- a/vendor/src/github.com/rs/xhandler/xhandler_example_test.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler_example_test.go
diff --git a/vendor/src/github.com/rs/xhandler/xhandler_test.go b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler_test.go
index 3f5021f..3f5021f 100644
--- a/vendor/src/github.com/rs/xhandler/xhandler_test.go
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/xhandler_test.go
diff --git a/vendor/src/github.com/rs/xhandler/xmux/README.md b/src/dict2rest/vendor/github.com/rs/xhandler/xmux/README.md
index 6ea3c0f..6ea3c0f 100644
--- a/vendor/src/github.com/rs/xhandler/xmux/README.md
+++ b/src/dict2rest/vendor/github.com/rs/xhandler/xmux/README.md
diff --git a/vendor/src/github.com/stretchr/graceful/.gitignore b/src/dict2rest/vendor/github.com/stretchr/graceful/.gitignore
index 8365624..8365624 100644
--- a/vendor/src/github.com/stretchr/graceful/.gitignore
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/.gitignore
diff --git a/vendor/src/github.com/stretchr/graceful/LICENSE b/src/dict2rest/vendor/github.com/stretchr/graceful/LICENSE
index a4f2f28..a4f2f28 100644
--- a/vendor/src/github.com/stretchr/graceful/LICENSE
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/LICENSE
diff --git a/vendor/src/github.com/stretchr/graceful/README.md b/src/dict2rest/vendor/github.com/stretchr/graceful/README.md
index 531249a..531249a 100644
--- a/vendor/src/github.com/stretchr/graceful/README.md
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/README.md
diff --git a/vendor/src/github.com/stretchr/graceful/graceful.go b/src/dict2rest/vendor/github.com/stretchr/graceful/graceful.go
index d3a7175..d3a7175 100644
--- a/vendor/src/github.com/stretchr/graceful/graceful.go
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/graceful.go
diff --git a/vendor/src/github.com/stretchr/graceful/graceful_test.go b/src/dict2rest/vendor/github.com/stretchr/graceful/graceful_test.go
index 83acac3..83acac3 100644
--- a/vendor/src/github.com/stretchr/graceful/graceful_test.go
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/graceful_test.go
diff --git a/vendor/src/github.com/stretchr/graceful/tests/main.go b/src/dict2rest/vendor/github.com/stretchr/graceful/tests/main.go
index 8c8fa20..8c8fa20 100644
--- a/vendor/src/github.com/stretchr/graceful/tests/main.go
+++ b/src/dict2rest/vendor/github.com/stretchr/graceful/tests/main.go
diff --git a/vendor/src/golang.org/x/net/context/context.go b/src/dict2rest/vendor/golang.org/x/net/context/context.go
index 77b64d0..77b64d0 100644
--- a/vendor/src/golang.org/x/net/context/context.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/context.go
diff --git a/vendor/src/golang.org/x/net/context/context_test.go b/src/dict2rest/vendor/golang.org/x/net/context/context_test.go
index 05345fc..05345fc 100644
--- a/vendor/src/golang.org/x/net/context/context_test.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/context_test.go
diff --git a/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq.go b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/cancelreq.go
index e3170e3..e3170e3 100644
--- a/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/cancelreq.go
diff --git a/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
index 56bcbad..56bcbad 100644
--- a/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
diff --git a/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp.go b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
index 62620d4..62620d4 100644
--- a/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
diff --git a/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
index 77c25ba..77c25ba 100644
--- a/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
diff --git a/vendor/src/golang.org/x/net/context/withtimeout_test.go b/src/dict2rest/vendor/golang.org/x/net/context/withtimeout_test.go
index a6754dc..a6754dc 100644
--- a/vendor/src/golang.org/x/net/context/withtimeout_test.go
+++ b/src/dict2rest/vendor/golang.org/x/net/context/withtimeout_test.go
diff --git a/vendor/src/golang.org/x/net/dict/dict.go b/src/dict2rest/vendor/golang.org/x/net/dict/dict.go
index 58fef89..58fef89 100644
--- a/vendor/src/golang.org/x/net/dict/dict.go
+++ b/src/dict2rest/vendor/golang.org/x/net/dict/dict.go
diff --git a/vendor/src/golang.org/x/net/netutil/listen.go b/src/dict2rest/vendor/golang.org/x/net/netutil/listen.go
index b317ba2..b317ba2 100644
--- a/vendor/src/golang.org/x/net/netutil/listen.go
+++ b/src/dict2rest/vendor/golang.org/x/net/netutil/listen.go
diff --git a/vendor/src/golang.org/x/net/netutil/listen_test.go b/src/dict2rest/vendor/golang.org/x/net/netutil/listen_test.go
index c1a3d55..c1a3d55 100644
--- a/vendor/src/golang.org/x/net/netutil/listen_test.go
+++ b/src/dict2rest/vendor/golang.org/x/net/netutil/listen_test.go
diff --git a/vendor/manifest b/vendor/manifest
deleted file mode 100644
index 13683ad..0000000
--- a/vendor/manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"version": 0,
-	"dependencies": [
-		{
-			"importpath": "golang.org/x/net/context",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "04b9de9b512f58addf28c9853d50ebef61c3953e",
-			"branch": "master",
-			"path": "/context"
-		},
-		{
-			"importpath": "golang.org/x/net/dict",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "04b9de9b512f58addf28c9853d50ebef61c3953e",
-			"branch": "master",
-			"path": "/dict"
-		},
-		{
-			"importpath": "golang.org/x/net/netutil",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "04b9de9b512f58addf28c9853d50ebef61c3953e",
-			"branch": "master",
-			"path": "/netutil"
-		}
-	]
-}
\ No newline at end of file