diff --git a/.travis.yml b/.travis.yml index 81f6ea4..3591a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ language: go go: - - 1.4 + - 1.5 + +env + - GO15VENDOREXPERIMENT=1 install: - go install -race -v std diff --git a/Dockerfile b/Dockerfile index 5b713ab..e086ba4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM daaku/arch RUN pacman --noconfirm --sync go ENV GOPATH /go COPY . /go/src/github.com/daaku/rell +ENV GO15VENDOREXPERIMENT=1 RUN go install github.com/daaku/rell COPY Dockerfile.run /go/bin/Dockerfile COPY public /go/bin/public diff --git a/adminweb/adminweb.go b/adminweb/adminweb.go index 73e679a..f3189bb 100644 --- a/adminweb/adminweb.go +++ b/adminweb/adminweb.go @@ -8,9 +8,9 @@ import ( "path" "sync" - "github.com/daaku/rell/internal/github.com/daaku/go.httpdev" - "github.com/daaku/rell/internal/github.com/daaku/go.trustforward" - "github.com/daaku/rell/internal/github.com/daaku/go.viewvar" + "github.com/daaku/go.httpdev" + "github.com/daaku/go.trustforward" + "github.com/daaku/go.viewvar" ) type Handler struct { diff --git a/bin/compile b/bin/compile index 5301059..71ca5ba 100755 --- a/bin/compile +++ b/bin/compile @@ -9,7 +9,7 @@ BUILD_DIR=$(cd "$1/" && pwd) CACHE_DIR=$(cd "$2/" && pwd) GO_IMPORT_PATH=github.com/daaku/rell -GO_VERSION=1.4.2 +GO_VERSION=1.5 GO_URL=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz BUILD_GOPATH=$CACHE_DIR/go GO_PACKAGE_DIR=$BUILD_GOPATH/src/$GO_IMPORT_PATH @@ -18,9 +18,10 @@ OUTPUT_BIN=$BUILD_DIR/$(basename $GO_IMPORT_PATH) export GOROOT=$CACHE_DIR/$GO_VERSION/go export GOPATH=$BUILD_GOPATH export PATH=$GOROOT/bin:$BUILD_GOPATH/bin:$PATH +export GO15VENDOREXPERIMENT=1 -GO_LDFLAGS="-X $GO_IMPORT_PATH/internal/github.com/facebookgo/stack.gopath $GOPATH" -GO_LDFLAGS="$GO_LDFLAGS -X $GO_IMPORT_PATH/rellenv/viewcontext.rev $SOURCE_VERSION" +GO_LDFLAGS="-X github.com/facebookgo/stack.gopath=$GOPATH" +GO_LDFLAGS="$GO_LDFLAGS -X $GO_IMPORT_PATH/rellenv/viewcontext.rev=$SOURCE_VERSION" if test -d $CACHE_DIR/$GO_VERSION/go; then echo "-----> Using existing go $GO_VERSION" diff --git a/examples/examples.go b/examples/examples.go index 90f0eea..b4d8916 100644 --- a/examples/examples.go +++ b/examples/examples.go @@ -14,9 +14,9 @@ import ( "path/filepath" "strings" - "github.com/daaku/rell/internal/github.com/daaku/go.errcode" - "github.com/daaku/rell/internal/github.com/facebookgo/parse" - "github.com/daaku/rell/internal/github.com/golang/groupcache/lru" + "github.com/daaku/go.errcode" + "github.com/facebookgo/parse" + "github.com/golang/groupcache/lru" ) // Some categories are hidden from the listing. diff --git a/examples/viewexamples/examples.go b/examples/viewexamples/examples.go index 9fffa9e..bed38dc 100644 --- a/examples/viewexamples/examples.go +++ b/examples/viewexamples/examples.go @@ -14,17 +14,17 @@ import ( "strings" "github.com/daaku/rell/examples" - "github.com/daaku/rell/internal/github.com/daaku/ctxerr" - "github.com/daaku/rell/internal/github.com/daaku/go.errcode" - "github.com/daaku/rell/internal/github.com/daaku/go.fburl" - "github.com/daaku/rell/internal/github.com/daaku/go.h" - "github.com/daaku/rell/internal/github.com/daaku/go.h.ui" - "github.com/daaku/rell/internal/github.com/daaku/go.htmlwriter" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/github.com/daaku/go.xsrf" - "github.com/daaku/rell/internal/github.com/daaku/sortutil" - "github.com/daaku/rell/internal/github.com/facebookgo/counting" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/ctxerr" + "github.com/daaku/go.errcode" + "github.com/daaku/go.fburl" + "github.com/daaku/go.h" + "github.com/daaku/go.h.ui" + "github.com/daaku/go.htmlwriter" + "github.com/daaku/go.static" + "github.com/daaku/go.xsrf" + "github.com/daaku/sortutil" + "github.com/facebookgo/counting" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" "github.com/daaku/rell/view" ) diff --git a/main.go b/main.go index 0eb65be..cfb0005 100644 --- a/main.go +++ b/main.go @@ -15,18 +15,18 @@ import ( "github.com/daaku/rell/adminweb" "github.com/daaku/rell/examples" "github.com/daaku/rell/examples/viewexamples" - "github.com/daaku/rell/internal/github.com/daaku/go.browserid" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/github.com/daaku/go.trustforward" - "github.com/daaku/rell/internal/github.com/daaku/go.xsrf" - "github.com/daaku/rell/internal/github.com/facebookgo/devrestarter" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapi" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/github.com/facebookgo/flagenv" - "github.com/daaku/rell/internal/github.com/facebookgo/httpcontrol" - "github.com/daaku/rell/internal/github.com/facebookgo/httpdown" - "github.com/daaku/rell/internal/github.com/facebookgo/parse" - "github.com/daaku/rell/internal/github.com/golang/groupcache/lru" + "github.com/daaku/go.browserid" + "github.com/daaku/go.static" + "github.com/daaku/go.trustforward" + "github.com/daaku/go.xsrf" + "github.com/facebookgo/devrestarter" + "github.com/facebookgo/fbapi" + "github.com/facebookgo/fbapp" + "github.com/facebookgo/flagenv" + "github.com/facebookgo/httpcontrol" + "github.com/facebookgo/httpdown" + "github.com/facebookgo/parse" + "github.com/golang/groupcache/lru" "github.com/daaku/rell/oauth" "github.com/daaku/rell/og" "github.com/daaku/rell/og/viewog" diff --git a/oauth/oauth.go b/oauth/oauth.go index 6cb333b..1bc48cf 100644 --- a/oauth/oauth.go +++ b/oauth/oauth.go @@ -10,13 +10,13 @@ import ( "net/url" "strconv" - "github.com/daaku/rell/internal/github.com/daaku/ctxerr" - "github.com/daaku/rell/internal/github.com/daaku/go.browserid" - "github.com/daaku/rell/internal/github.com/daaku/go.fburl" - "github.com/daaku/rell/internal/github.com/daaku/go.h" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/ctxerr" + "github.com/daaku/go.browserid" + "github.com/daaku/go.fburl" + "github.com/daaku/go.h" + "github.com/daaku/go.static" + "github.com/facebookgo/fbapp" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" ) diff --git a/og/og.go b/og/og.go index 7bfa249..a79829b 100644 --- a/og/og.go +++ b/og/og.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - "github.com/daaku/rell/internal/github.com/daaku/go.fburl" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/go.fburl" + "github.com/daaku/go.static" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" ) diff --git a/og/og_test.go b/og/og_test.go index a23f86d..8e8e5ef 100644 --- a/og/og_test.go +++ b/og/og_test.go @@ -5,9 +5,9 @@ import ( "net/url" "testing" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/go.static" + "github.com/facebookgo/fbapp" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" ) diff --git a/og/viewog/og.go b/og/viewog/og.go index b4fa29e..6468bb3 100644 --- a/og/viewog/og.go +++ b/og/viewog/og.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "github.com/daaku/rell/internal/github.com/daaku/go.errcode" - "github.com/daaku/rell/internal/github.com/daaku/go.h" - "github.com/daaku/rell/internal/github.com/daaku/go.h.js.fb" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/go.errcode" + "github.com/daaku/go.h" + "github.com/daaku/go.h.js.fb" + "github.com/daaku/go.static" + "golang.org/x/net/context" "github.com/daaku/rell/og" "github.com/daaku/rell/rellenv" "github.com/daaku/rell/view" diff --git a/readme.md b/readme.md index ec7b2a0..3caa58c 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ Development Environment You'll need [Go](https://golang.org/) to work on rell. Once you have it: ```sh -go get github.com/daaku/rell +GO15VENDOREXPERIMENT=1 go get github.com/daaku/rell rell ``` @@ -48,11 +48,3 @@ A Docker container can be built using: ```sh docker build -t rell-builder . && docker run rell-builder | docker build -t daaku/rell - ``` - -Upgrade Vendored Dependencies ------------------------------ - -```sh -go get github.com/daaku/party -party -c -d=internal -u -t -x=false -``` diff --git a/rellenv/appns/appns.go b/rellenv/appns/appns.go index f7ea4a3..f2ef37a 100644 --- a/rellenv/appns/appns.go +++ b/rellenv/appns/appns.go @@ -7,9 +7,9 @@ import ( "net/url" "strconv" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapi" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/github.com/golang/groupcache/lru" + "github.com/facebookgo/fbapi" + "github.com/facebookgo/fbapp" + "github.com/golang/groupcache/lru" ) type cacheKey uint64 diff --git a/rellenv/context.go b/rellenv/context.go index 222d098..490d829 100644 --- a/rellenv/context.go +++ b/rellenv/context.go @@ -14,13 +14,13 @@ import ( "strconv" "time" - "github.com/daaku/rell/internal/github.com/daaku/ctxerr" - "github.com/daaku/rell/internal/github.com/daaku/go.fburl" - "github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/appdata" - "github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/fbsr" - "github.com/daaku/rell/internal/github.com/daaku/go.trustforward" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/ctxerr" + "github.com/daaku/go.fburl" + "github.com/daaku/go.signedrequest/appdata" + "github.com/daaku/go.signedrequest/fbsr" + "github.com/daaku/go.trustforward" + "github.com/facebookgo/fbapp" + "golang.org/x/net/context" ) var envRegexp = regexp.MustCompile(`^[a-zA-Z0-9-_.]*$`) diff --git a/rellenv/context_test.go b/rellenv/context_test.go index 0fce1a4..5811652 100644 --- a/rellenv/context_test.go +++ b/rellenv/context_test.go @@ -6,10 +6,10 @@ import ( "net/url" "testing" - "github.com/daaku/rell/internal/github.com/daaku/go.trustforward" - "github.com/daaku/rell/internal/github.com/facebookgo/ensure" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/go.trustforward" + "github.com/facebookgo/ensure" + "github.com/facebookgo/fbapp" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" ) diff --git a/rellenv/empcheck/empcheck.go b/rellenv/empcheck/empcheck.go index 471b214..6d20a91 100644 --- a/rellenv/empcheck/empcheck.go +++ b/rellenv/empcheck/empcheck.go @@ -6,9 +6,9 @@ import ( "net/url" "strconv" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapi" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/github.com/golang/groupcache/lru" + "github.com/facebookgo/fbapi" + "github.com/facebookgo/fbapp" + "github.com/golang/groupcache/lru" ) var fields = fbapi.ParamFields("is_employee") diff --git a/rellenv/viewcontext/context.go b/rellenv/viewcontext/context.go index fe8c99c..fd9a604 100644 --- a/rellenv/viewcontext/context.go +++ b/rellenv/viewcontext/context.go @@ -4,8 +4,8 @@ package viewcontext import ( "net/http" - "github.com/daaku/rell/internal/github.com/daaku/go.httpdev" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/go.httpdev" + "golang.org/x/net/context" "github.com/daaku/rell/rellenv" ) diff --git a/internal/github.com/daaku/ctxerr/ctxerr.go b/vendor/github.com/daaku/ctxerr/ctxerr.go similarity index 98% rename from internal/github.com/daaku/ctxerr/ctxerr.go rename to vendor/github.com/daaku/ctxerr/ctxerr.go index bf10da4..8bec544 100644 --- a/internal/github.com/daaku/ctxerr/ctxerr.go +++ b/vendor/github.com/daaku/ctxerr/ctxerr.go @@ -16,8 +16,8 @@ package ctxerr import ( "fmt" - "github.com/daaku/rell/internal/github.com/facebookgo/stack" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/facebookgo/stack" + "golang.org/x/net/context" ) // StackMode defines the variable available modes for capturing stack traces. diff --git a/internal/github.com/daaku/ctxerr/license b/vendor/github.com/daaku/ctxerr/license similarity index 100% rename from internal/github.com/daaku/ctxerr/license rename to vendor/github.com/daaku/ctxerr/license diff --git a/internal/github.com/daaku/ctxerr/readme.md b/vendor/github.com/daaku/ctxerr/readme.md similarity index 100% rename from internal/github.com/daaku/ctxerr/readme.md rename to vendor/github.com/daaku/ctxerr/readme.md diff --git a/internal/github.com/daaku/ctxmux/ctxmux.go b/vendor/github.com/daaku/ctxmux/ctxmux.go similarity index 97% rename from internal/github.com/daaku/ctxmux/ctxmux.go rename to vendor/github.com/daaku/ctxmux/ctxmux.go index 87e24c4..3944d43 100644 --- a/internal/github.com/daaku/ctxmux/ctxmux.go +++ b/vendor/github.com/daaku/ctxmux/ctxmux.go @@ -14,8 +14,8 @@ package ctxmux import ( "net/http" - "github.com/daaku/rell/internal/github.com/julienschmidt/httprouter" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/julienschmidt/httprouter" + "golang.org/x/net/context" ) type contextParamsKeyT int diff --git a/internal/github.com/daaku/ctxmux/license b/vendor/github.com/daaku/ctxmux/license similarity index 100% rename from internal/github.com/daaku/ctxmux/license rename to vendor/github.com/daaku/ctxmux/license diff --git a/internal/github.com/daaku/ctxmux/readme.md b/vendor/github.com/daaku/ctxmux/readme.md similarity index 100% rename from internal/github.com/daaku/ctxmux/readme.md rename to vendor/github.com/daaku/ctxmux/readme.md diff --git a/internal/github.com/daaku/go.browserid/browserid.go b/vendor/github.com/daaku/go.browserid/browserid.go similarity index 95% rename from internal/github.com/daaku/go.browserid/browserid.go rename to vendor/github.com/daaku/go.browserid/browserid.go index d744f82..5182e01 100644 --- a/internal/github.com/daaku/go.browserid/browserid.go +++ b/vendor/github.com/daaku/go.browserid/browserid.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.trustforward" - "github.com/daaku/rell/internal/golang.org/x/net/publicsuffix" + "github.com/daaku/go.trustforward" + "golang.org/x/net/publicsuffix" ) var emptyForwarded trustforward.Forwarded diff --git a/internal/github.com/daaku/go.browserid/readme.md b/vendor/github.com/daaku/go.browserid/readme.md similarity index 100% rename from internal/github.com/daaku/go.browserid/readme.md rename to vendor/github.com/daaku/go.browserid/readme.md diff --git a/internal/github.com/daaku/go.errcode/errcode.go b/vendor/github.com/daaku/go.errcode/errcode.go similarity index 100% rename from internal/github.com/daaku/go.errcode/errcode.go rename to vendor/github.com/daaku/go.errcode/errcode.go diff --git a/internal/github.com/daaku/go.errcode/readme.md b/vendor/github.com/daaku/go.errcode/readme.md similarity index 100% rename from internal/github.com/daaku/go.errcode/readme.md rename to vendor/github.com/daaku/go.errcode/readme.md diff --git a/internal/github.com/daaku/go.fburl/fburl.go b/vendor/github.com/daaku/go.fburl/fburl.go similarity index 100% rename from internal/github.com/daaku/go.fburl/fburl.go rename to vendor/github.com/daaku/go.fburl/fburl.go diff --git a/internal/github.com/daaku/go.fburl/readme.md b/vendor/github.com/daaku/go.fburl/readme.md similarity index 100% rename from internal/github.com/daaku/go.fburl/readme.md rename to vendor/github.com/daaku/go.fburl/readme.md diff --git a/internal/github.com/daaku/go.h.js.fb/fb.go b/vendor/github.com/daaku/go.h.js.fb/fb.go similarity index 93% rename from internal/github.com/daaku/go.h.js.fb/fb.go rename to vendor/github.com/daaku/go.h.js.fb/fb.go index e039450..7423ff1 100644 --- a/internal/github.com/daaku/go.h.js.fb/fb.go +++ b/vendor/github.com/daaku/go.h.js.fb/fb.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/daaku/rell/internal/github.com/daaku/go.h" + "github.com/daaku/go.h" ) // Represents an async load and FB.init call for the Facebook JS SDK. diff --git a/internal/github.com/daaku/go.h.js.ga/ga.go b/vendor/github.com/daaku/go.h.js.ga/ga.go similarity index 92% rename from internal/github.com/daaku/go.h.js.ga/ga.go rename to vendor/github.com/daaku/go.h.js.ga/ga.go index 7c8a560..244b3af 100644 --- a/internal/github.com/daaku/go.h.js.ga/ga.go +++ b/vendor/github.com/daaku/go.h.js.ga/ga.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/daaku/rell/internal/github.com/daaku/go.h" + "github.com/daaku/go.h" ) var ErrMissingID = errors.New("GoogleAnalyics requires an ID.") diff --git a/internal/github.com/daaku/go.h.ui/ui.go b/vendor/github.com/daaku/go.h.ui/ui.go similarity index 98% rename from internal/github.com/daaku/go.h.ui/ui.go rename to vendor/github.com/daaku/go.h.ui/ui.go index 858d502..e18a56f 100644 --- a/internal/github.com/daaku/go.h.ui/ui.go +++ b/vendor/github.com/daaku/go.h.ui/ui.go @@ -3,7 +3,7 @@ package ui import ( "crypto/rand" "fmt" - "github.com/daaku/rell/internal/github.com/daaku/go.h" + "github.com/daaku/go.h" "io" "log" ) diff --git a/internal/github.com/daaku/go.h/attributes.go b/vendor/github.com/daaku/go.h/attributes.go similarity index 100% rename from internal/github.com/daaku/go.h/attributes.go rename to vendor/github.com/daaku/go.h/attributes.go diff --git a/internal/github.com/daaku/go.h/document.go b/vendor/github.com/daaku/go.h/document.go similarity index 100% rename from internal/github.com/daaku/go.h/document.go rename to vendor/github.com/daaku/go.h/document.go diff --git a/internal/github.com/daaku/go.h/frag.go b/vendor/github.com/daaku/go.h/frag.go similarity index 100% rename from internal/github.com/daaku/go.h/frag.go rename to vendor/github.com/daaku/go.h/frag.go diff --git a/internal/github.com/daaku/go.h/h.go b/vendor/github.com/daaku/go.h/h.go similarity index 100% rename from internal/github.com/daaku/go.h/h.go rename to vendor/github.com/daaku/go.h/h.go diff --git a/internal/github.com/daaku/go.h/helper_hidden_inputs.go b/vendor/github.com/daaku/go.h/helper_hidden_inputs.go similarity index 100% rename from internal/github.com/daaku/go.h/helper_hidden_inputs.go rename to vendor/github.com/daaku/go.h/helper_hidden_inputs.go diff --git a/internal/github.com/daaku/go.h/helper_link_style.go b/vendor/github.com/daaku/go.h/helper_link_style.go similarity index 100% rename from internal/github.com/daaku/go.h/helper_link_style.go rename to vendor/github.com/daaku/go.h/helper_link_style.go diff --git a/internal/github.com/daaku/go.h/http.go b/vendor/github.com/daaku/go.h/http.go similarity index 100% rename from internal/github.com/daaku/go.h/http.go rename to vendor/github.com/daaku/go.h/http.go diff --git a/internal/github.com/daaku/go.h/node.go b/vendor/github.com/daaku/go.h/node.go similarity index 100% rename from internal/github.com/daaku/go.h/node.go rename to vendor/github.com/daaku/go.h/node.go diff --git a/internal/github.com/daaku/go.h/readme.md b/vendor/github.com/daaku/go.h/readme.md similarity index 100% rename from internal/github.com/daaku/go.h/readme.md rename to vendor/github.com/daaku/go.h/readme.md diff --git a/internal/github.com/daaku/go.h/reflect_node.go b/vendor/github.com/daaku/go.h/reflect_node.go similarity index 100% rename from internal/github.com/daaku/go.h/reflect_node.go rename to vendor/github.com/daaku/go.h/reflect_node.go diff --git a/internal/github.com/daaku/go.h/string.go b/vendor/github.com/daaku/go.h/string.go similarity index 100% rename from internal/github.com/daaku/go.h/string.go rename to vendor/github.com/daaku/go.h/string.go diff --git a/internal/github.com/daaku/go.h/tags.go b/vendor/github.com/daaku/go.h/tags.go similarity index 100% rename from internal/github.com/daaku/go.h/tags.go rename to vendor/github.com/daaku/go.h/tags.go diff --git a/internal/github.com/daaku/go.h/unsafe.go b/vendor/github.com/daaku/go.h/unsafe.go similarity index 100% rename from internal/github.com/daaku/go.h/unsafe.go rename to vendor/github.com/daaku/go.h/unsafe.go diff --git a/internal/github.com/daaku/go.h/unsafe_bytes.go b/vendor/github.com/daaku/go.h/unsafe_bytes.go similarity index 100% rename from internal/github.com/daaku/go.h/unsafe_bytes.go rename to vendor/github.com/daaku/go.h/unsafe_bytes.go diff --git a/internal/github.com/daaku/go.htmlwriter/htmlwriter.go b/vendor/github.com/daaku/go.htmlwriter/htmlwriter.go similarity index 100% rename from internal/github.com/daaku/go.htmlwriter/htmlwriter.go rename to vendor/github.com/daaku/go.htmlwriter/htmlwriter.go diff --git a/internal/github.com/daaku/go.htmlwriter/readme.md b/vendor/github.com/daaku/go.htmlwriter/readme.md similarity index 100% rename from internal/github.com/daaku/go.htmlwriter/readme.md rename to vendor/github.com/daaku/go.htmlwriter/readme.md diff --git a/internal/github.com/daaku/go.httpdev/httpdev.go b/vendor/github.com/daaku/go.httpdev/httpdev.go similarity index 97% rename from internal/github.com/daaku/go.httpdev/httpdev.go rename to vendor/github.com/daaku/go.httpdev/httpdev.go index 277ff37..344c556 100644 --- a/internal/github.com/daaku/go.httpdev/httpdev.go +++ b/vendor/github.com/daaku/go.httpdev/httpdev.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.h" + "github.com/daaku/go.h" ) var now = time.Now() diff --git a/internal/github.com/daaku/go.signedrequest/appdata/appdata.go b/vendor/github.com/daaku/go.signedrequest/appdata/appdata.go similarity index 94% rename from internal/github.com/daaku/go.signedrequest/appdata/appdata.go rename to vendor/github.com/daaku/go.signedrequest/appdata/appdata.go index 5ddb17b..6bff1ca 100644 --- a/internal/github.com/daaku/go.signedrequest/appdata/appdata.go +++ b/vendor/github.com/daaku/go.signedrequest/appdata/appdata.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/fbsr" + "github.com/daaku/go.signedrequest/fbsr" ) // A handler to allow app_data based request transformation. diff --git a/internal/github.com/daaku/go.signedrequest/fbsr/fbsr.go b/vendor/github.com/daaku/go.signedrequest/fbsr/fbsr.go similarity index 95% rename from internal/github.com/daaku/go.signedrequest/fbsr/fbsr.go rename to vendor/github.com/daaku/go.signedrequest/fbsr/fbsr.go index 7759db8..c4c5e55 100644 --- a/internal/github.com/daaku/go.signedrequest/fbsr/fbsr.go +++ b/vendor/github.com/daaku/go.signedrequest/fbsr/fbsr.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.signedrequest" + "github.com/daaku/go.signedrequest" ) var ErrExpired = errors.New("signed_request has expired.") diff --git a/internal/github.com/daaku/go.signedrequest/readme.md b/vendor/github.com/daaku/go.signedrequest/readme.md similarity index 100% rename from internal/github.com/daaku/go.signedrequest/readme.md rename to vendor/github.com/daaku/go.signedrequest/readme.md diff --git a/internal/github.com/daaku/go.signedrequest/sr.go b/vendor/github.com/daaku/go.signedrequest/sr.go similarity index 100% rename from internal/github.com/daaku/go.signedrequest/sr.go rename to vendor/github.com/daaku/go.signedrequest/sr.go diff --git a/internal/github.com/daaku/go.static/license b/vendor/github.com/daaku/go.static/license similarity index 100% rename from internal/github.com/daaku/go.static/license rename to vendor/github.com/daaku/go.static/license diff --git a/internal/github.com/daaku/go.static/readme.md b/vendor/github.com/daaku/go.static/readme.md similarity index 100% rename from internal/github.com/daaku/go.static/readme.md rename to vendor/github.com/daaku/go.static/readme.md diff --git a/internal/github.com/daaku/go.static/static.go b/vendor/github.com/daaku/go.static/static.go similarity index 99% rename from internal/github.com/daaku/go.static/static.go rename to vendor/github.com/daaku/go.static/static.go index 521d01a..0f78bd8 100644 --- a/internal/github.com/daaku/go.static/static.go +++ b/vendor/github.com/daaku/go.static/static.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.h" + "github.com/daaku/go.h" ) const ( diff --git a/internal/github.com/daaku/go.trustforward/readme.md b/vendor/github.com/daaku/go.trustforward/readme.md similarity index 100% rename from internal/github.com/daaku/go.trustforward/readme.md rename to vendor/github.com/daaku/go.trustforward/readme.md diff --git a/internal/github.com/daaku/go.trustforward/trustforward.go b/vendor/github.com/daaku/go.trustforward/trustforward.go similarity index 100% rename from internal/github.com/daaku/go.trustforward/trustforward.go rename to vendor/github.com/daaku/go.trustforward/trustforward.go diff --git a/internal/github.com/daaku/go.viewvar/readme.md b/vendor/github.com/daaku/go.viewvar/readme.md similarity index 100% rename from internal/github.com/daaku/go.viewvar/readme.md rename to vendor/github.com/daaku/go.viewvar/readme.md diff --git a/internal/github.com/daaku/go.viewvar/viewvar.go b/vendor/github.com/daaku/go.viewvar/viewvar.go similarity index 100% rename from internal/github.com/daaku/go.viewvar/viewvar.go rename to vendor/github.com/daaku/go.viewvar/viewvar.go diff --git a/internal/github.com/daaku/go.xsrf/readme.md b/vendor/github.com/daaku/go.xsrf/readme.md similarity index 100% rename from internal/github.com/daaku/go.xsrf/readme.md rename to vendor/github.com/daaku/go.xsrf/readme.md diff --git a/internal/github.com/daaku/go.xsrf/xsrf.go b/vendor/github.com/daaku/go.xsrf/xsrf.go similarity index 96% rename from internal/github.com/daaku/go.xsrf/xsrf.go rename to vendor/github.com/daaku/go.xsrf/xsrf.go index 7a0d8c8..18361f2 100644 --- a/internal/github.com/daaku/go.xsrf/xsrf.go +++ b/vendor/github.com/daaku/go.xsrf/xsrf.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/daaku/rell/internal/github.com/daaku/go.browserid" + "github.com/daaku/go.browserid" ) var maxUint64Len = uint(len(fmt.Sprintf("%d", uint64(1<<63)))) diff --git a/internal/github.com/daaku/sortutil/LICENSE b/vendor/github.com/daaku/sortutil/LICENSE similarity index 100% rename from internal/github.com/daaku/sortutil/LICENSE rename to vendor/github.com/daaku/sortutil/LICENSE diff --git a/internal/github.com/daaku/sortutil/README b/vendor/github.com/daaku/sortutil/README similarity index 100% rename from internal/github.com/daaku/sortutil/README rename to vendor/github.com/daaku/sortutil/README diff --git a/internal/github.com/daaku/sortutil/sortutil.go b/vendor/github.com/daaku/sortutil/sortutil.go similarity index 100% rename from internal/github.com/daaku/sortutil/sortutil.go rename to vendor/github.com/daaku/sortutil/sortutil.go diff --git a/internal/github.com/davecgh/go-spew/spew/bypass.go b/vendor/github.com/davecgh/go-spew/spew/bypass.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/bypass.go rename to vendor/github.com/davecgh/go-spew/spew/bypass.go diff --git a/internal/github.com/davecgh/go-spew/spew/bypasssafe.go b/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/bypasssafe.go rename to vendor/github.com/davecgh/go-spew/spew/bypasssafe.go diff --git a/internal/github.com/davecgh/go-spew/spew/common.go b/vendor/github.com/davecgh/go-spew/spew/common.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/common.go rename to vendor/github.com/davecgh/go-spew/spew/common.go diff --git a/internal/github.com/davecgh/go-spew/spew/config.go b/vendor/github.com/davecgh/go-spew/spew/config.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/config.go rename to vendor/github.com/davecgh/go-spew/spew/config.go diff --git a/internal/github.com/davecgh/go-spew/spew/doc.go b/vendor/github.com/davecgh/go-spew/spew/doc.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/doc.go rename to vendor/github.com/davecgh/go-spew/spew/doc.go diff --git a/internal/github.com/davecgh/go-spew/spew/dump.go b/vendor/github.com/davecgh/go-spew/spew/dump.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/dump.go rename to vendor/github.com/davecgh/go-spew/spew/dump.go diff --git a/internal/github.com/davecgh/go-spew/spew/format.go b/vendor/github.com/davecgh/go-spew/spew/format.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/format.go rename to vendor/github.com/davecgh/go-spew/spew/format.go diff --git a/internal/github.com/davecgh/go-spew/spew/spew.go b/vendor/github.com/davecgh/go-spew/spew/spew.go similarity index 100% rename from internal/github.com/davecgh/go-spew/spew/spew.go rename to vendor/github.com/davecgh/go-spew/spew/spew.go diff --git a/internal/github.com/facebookgo/clock/LICENSE b/vendor/github.com/facebookgo/clock/LICENSE similarity index 100% rename from internal/github.com/facebookgo/clock/LICENSE rename to vendor/github.com/facebookgo/clock/LICENSE diff --git a/internal/github.com/facebookgo/clock/README.md b/vendor/github.com/facebookgo/clock/README.md similarity index 100% rename from internal/github.com/facebookgo/clock/README.md rename to vendor/github.com/facebookgo/clock/README.md diff --git a/internal/github.com/facebookgo/clock/clock.go b/vendor/github.com/facebookgo/clock/clock.go similarity index 100% rename from internal/github.com/facebookgo/clock/clock.go rename to vendor/github.com/facebookgo/clock/clock.go diff --git a/internal/github.com/facebookgo/counting/license b/vendor/github.com/facebookgo/counting/license similarity index 100% rename from internal/github.com/facebookgo/counting/license rename to vendor/github.com/facebookgo/counting/license diff --git a/internal/github.com/facebookgo/counting/patents b/vendor/github.com/facebookgo/counting/patents similarity index 100% rename from internal/github.com/facebookgo/counting/patents rename to vendor/github.com/facebookgo/counting/patents diff --git a/internal/github.com/facebookgo/counting/reader.go b/vendor/github.com/facebookgo/counting/reader.go similarity index 100% rename from internal/github.com/facebookgo/counting/reader.go rename to vendor/github.com/facebookgo/counting/reader.go diff --git a/internal/github.com/facebookgo/counting/readme.md b/vendor/github.com/facebookgo/counting/readme.md similarity index 100% rename from internal/github.com/facebookgo/counting/readme.md rename to vendor/github.com/facebookgo/counting/readme.md diff --git a/internal/github.com/facebookgo/counting/writer.go b/vendor/github.com/facebookgo/counting/writer.go similarity index 100% rename from internal/github.com/facebookgo/counting/writer.go rename to vendor/github.com/facebookgo/counting/writer.go diff --git a/internal/github.com/facebookgo/devrestarter/devrestarter.go b/vendor/github.com/facebookgo/devrestarter/devrestarter.go similarity index 91% rename from internal/github.com/facebookgo/devrestarter/devrestarter.go rename to vendor/github.com/facebookgo/devrestarter/devrestarter.go index 5435e7a..9acd32c 100644 --- a/internal/github.com/facebookgo/devrestarter/devrestarter.go +++ b/vendor/github.com/facebookgo/devrestarter/devrestarter.go @@ -11,8 +11,8 @@ import ( "syscall" "time" - "github.com/daaku/rell/internal/github.com/facebookgo/stackerr" - "github.com/daaku/rell/internal/github.com/go-fsnotify/fsnotify" + "github.com/facebookgo/stackerr" + "github.com/go-fsnotify/fsnotify" ) var debug func(v ...interface{}) diff --git a/internal/github.com/facebookgo/devrestarter/license b/vendor/github.com/facebookgo/devrestarter/license similarity index 100% rename from internal/github.com/facebookgo/devrestarter/license rename to vendor/github.com/facebookgo/devrestarter/license diff --git a/internal/github.com/facebookgo/devrestarter/patents b/vendor/github.com/facebookgo/devrestarter/patents similarity index 100% rename from internal/github.com/facebookgo/devrestarter/patents rename to vendor/github.com/facebookgo/devrestarter/patents diff --git a/internal/github.com/facebookgo/devrestarter/readme.md b/vendor/github.com/facebookgo/devrestarter/readme.md similarity index 100% rename from internal/github.com/facebookgo/devrestarter/readme.md rename to vendor/github.com/facebookgo/devrestarter/readme.md diff --git a/internal/github.com/facebookgo/ensure/ensure.go b/vendor/github.com/facebookgo/ensure/ensure.go similarity index 97% rename from internal/github.com/facebookgo/ensure/ensure.go rename to vendor/github.com/facebookgo/ensure/ensure.go index b08c511..44fab27 100644 --- a/internal/github.com/facebookgo/ensure/ensure.go +++ b/vendor/github.com/facebookgo/ensure/ensure.go @@ -14,9 +14,9 @@ import ( "regexp" "strings" - "github.com/daaku/rell/internal/github.com/davecgh/go-spew/spew" - "github.com/daaku/rell/internal/github.com/facebookgo/stack" - subsetp "github.com/daaku/rell/internal/github.com/facebookgo/subset" + "github.com/davecgh/go-spew/spew" + "github.com/facebookgo/stack" + subsetp "github.com/facebookgo/subset" ) // Fataler defines the minimal interface necessary to trigger a Fatal when a diff --git a/internal/github.com/facebookgo/ensure/license b/vendor/github.com/facebookgo/ensure/license similarity index 100% rename from internal/github.com/facebookgo/ensure/license rename to vendor/github.com/facebookgo/ensure/license diff --git a/internal/github.com/facebookgo/ensure/patents b/vendor/github.com/facebookgo/ensure/patents similarity index 100% rename from internal/github.com/facebookgo/ensure/patents rename to vendor/github.com/facebookgo/ensure/patents diff --git a/internal/github.com/facebookgo/ensure/readme.md b/vendor/github.com/facebookgo/ensure/readme.md similarity index 100% rename from internal/github.com/facebookgo/ensure/readme.md rename to vendor/github.com/facebookgo/ensure/readme.md diff --git a/internal/github.com/facebookgo/fbapi/client.go b/vendor/github.com/facebookgo/fbapi/client.go similarity index 100% rename from internal/github.com/facebookgo/fbapi/client.go rename to vendor/github.com/facebookgo/fbapi/client.go diff --git a/internal/github.com/facebookgo/fbapi/license b/vendor/github.com/facebookgo/fbapi/license similarity index 100% rename from internal/github.com/facebookgo/fbapi/license rename to vendor/github.com/facebookgo/fbapi/license diff --git a/internal/github.com/facebookgo/fbapi/params.go b/vendor/github.com/facebookgo/fbapi/params.go similarity index 100% rename from internal/github.com/facebookgo/fbapi/params.go rename to vendor/github.com/facebookgo/fbapi/params.go diff --git a/internal/github.com/facebookgo/fbapi/patents b/vendor/github.com/facebookgo/fbapi/patents similarity index 100% rename from internal/github.com/facebookgo/fbapi/patents rename to vendor/github.com/facebookgo/fbapi/patents diff --git a/internal/github.com/facebookgo/fbapi/readme.md b/vendor/github.com/facebookgo/fbapi/readme.md similarity index 100% rename from internal/github.com/facebookgo/fbapi/readme.md rename to vendor/github.com/facebookgo/fbapi/readme.md diff --git a/internal/github.com/facebookgo/fbapp/fbapp.go b/vendor/github.com/facebookgo/fbapp/fbapp.go similarity index 100% rename from internal/github.com/facebookgo/fbapp/fbapp.go rename to vendor/github.com/facebookgo/fbapp/fbapp.go diff --git a/internal/github.com/facebookgo/fbapp/license b/vendor/github.com/facebookgo/fbapp/license similarity index 100% rename from internal/github.com/facebookgo/fbapp/license rename to vendor/github.com/facebookgo/fbapp/license diff --git a/internal/github.com/facebookgo/fbapp/patents b/vendor/github.com/facebookgo/fbapp/patents similarity index 100% rename from internal/github.com/facebookgo/fbapp/patents rename to vendor/github.com/facebookgo/fbapp/patents diff --git a/internal/github.com/facebookgo/flagenv/LICENSE b/vendor/github.com/facebookgo/flagenv/LICENSE similarity index 100% rename from internal/github.com/facebookgo/flagenv/LICENSE rename to vendor/github.com/facebookgo/flagenv/LICENSE diff --git a/internal/github.com/facebookgo/flagenv/README.md b/vendor/github.com/facebookgo/flagenv/README.md similarity index 100% rename from internal/github.com/facebookgo/flagenv/README.md rename to vendor/github.com/facebookgo/flagenv/README.md diff --git a/internal/github.com/facebookgo/flagenv/flagenv.go b/vendor/github.com/facebookgo/flagenv/flagenv.go similarity index 100% rename from internal/github.com/facebookgo/flagenv/flagenv.go rename to vendor/github.com/facebookgo/flagenv/flagenv.go diff --git a/internal/github.com/facebookgo/flagenv/patents b/vendor/github.com/facebookgo/flagenv/patents similarity index 100% rename from internal/github.com/facebookgo/flagenv/patents rename to vendor/github.com/facebookgo/flagenv/patents diff --git a/internal/github.com/facebookgo/httpcontrol/httpcontrol.go b/vendor/github.com/facebookgo/httpcontrol/httpcontrol.go similarity index 100% rename from internal/github.com/facebookgo/httpcontrol/httpcontrol.go rename to vendor/github.com/facebookgo/httpcontrol/httpcontrol.go diff --git a/internal/github.com/facebookgo/httpcontrol/license b/vendor/github.com/facebookgo/httpcontrol/license similarity index 100% rename from internal/github.com/facebookgo/httpcontrol/license rename to vendor/github.com/facebookgo/httpcontrol/license diff --git a/internal/github.com/facebookgo/httpcontrol/patents b/vendor/github.com/facebookgo/httpcontrol/patents similarity index 100% rename from internal/github.com/facebookgo/httpcontrol/patents rename to vendor/github.com/facebookgo/httpcontrol/patents diff --git a/internal/github.com/facebookgo/httpcontrol/readme.md b/vendor/github.com/facebookgo/httpcontrol/readme.md similarity index 100% rename from internal/github.com/facebookgo/httpcontrol/readme.md rename to vendor/github.com/facebookgo/httpcontrol/readme.md diff --git a/internal/github.com/facebookgo/httpdown/httpdown.go b/vendor/github.com/facebookgo/httpdown/httpdown.go similarity index 98% rename from internal/github.com/facebookgo/httpdown/httpdown.go rename to vendor/github.com/facebookgo/httpdown/httpdown.go index 52666e8..2ad031e 100644 --- a/internal/github.com/facebookgo/httpdown/httpdown.go +++ b/vendor/github.com/facebookgo/httpdown/httpdown.go @@ -14,8 +14,8 @@ import ( "syscall" "time" - "github.com/daaku/rell/internal/github.com/facebookgo/clock" - "github.com/daaku/rell/internal/github.com/facebookgo/stats" + "github.com/facebookgo/clock" + "github.com/facebookgo/stats" ) const ( diff --git a/internal/github.com/facebookgo/httpdown/license b/vendor/github.com/facebookgo/httpdown/license similarity index 100% rename from internal/github.com/facebookgo/httpdown/license rename to vendor/github.com/facebookgo/httpdown/license diff --git a/internal/github.com/facebookgo/httpdown/patents b/vendor/github.com/facebookgo/httpdown/patents similarity index 100% rename from internal/github.com/facebookgo/httpdown/patents rename to vendor/github.com/facebookgo/httpdown/patents diff --git a/internal/github.com/facebookgo/httpdown/readme.md b/vendor/github.com/facebookgo/httpdown/readme.md similarity index 100% rename from internal/github.com/facebookgo/httpdown/readme.md rename to vendor/github.com/facebookgo/httpdown/readme.md diff --git a/internal/github.com/facebookgo/parse/license b/vendor/github.com/facebookgo/parse/license similarity index 100% rename from internal/github.com/facebookgo/parse/license rename to vendor/github.com/facebookgo/parse/license diff --git a/internal/github.com/facebookgo/parse/parse.go b/vendor/github.com/facebookgo/parse/parse.go similarity index 100% rename from internal/github.com/facebookgo/parse/parse.go rename to vendor/github.com/facebookgo/parse/parse.go diff --git a/internal/github.com/facebookgo/parse/patents b/vendor/github.com/facebookgo/parse/patents similarity index 100% rename from internal/github.com/facebookgo/parse/patents rename to vendor/github.com/facebookgo/parse/patents diff --git a/internal/github.com/facebookgo/parse/readme.md b/vendor/github.com/facebookgo/parse/readme.md similarity index 100% rename from internal/github.com/facebookgo/parse/readme.md rename to vendor/github.com/facebookgo/parse/readme.md diff --git a/internal/github.com/facebookgo/stack/license b/vendor/github.com/facebookgo/stack/license similarity index 100% rename from internal/github.com/facebookgo/stack/license rename to vendor/github.com/facebookgo/stack/license diff --git a/internal/github.com/facebookgo/stack/patents b/vendor/github.com/facebookgo/stack/patents similarity index 100% rename from internal/github.com/facebookgo/stack/patents rename to vendor/github.com/facebookgo/stack/patents diff --git a/internal/github.com/facebookgo/stack/readme.md b/vendor/github.com/facebookgo/stack/readme.md similarity index 100% rename from internal/github.com/facebookgo/stack/readme.md rename to vendor/github.com/facebookgo/stack/readme.md diff --git a/internal/github.com/facebookgo/stack/stack.go b/vendor/github.com/facebookgo/stack/stack.go similarity index 100% rename from internal/github.com/facebookgo/stack/stack.go rename to vendor/github.com/facebookgo/stack/stack.go diff --git a/internal/github.com/facebookgo/stackerr/license b/vendor/github.com/facebookgo/stackerr/license similarity index 100% rename from internal/github.com/facebookgo/stackerr/license rename to vendor/github.com/facebookgo/stackerr/license diff --git a/internal/github.com/facebookgo/stackerr/patents b/vendor/github.com/facebookgo/stackerr/patents similarity index 100% rename from internal/github.com/facebookgo/stackerr/patents rename to vendor/github.com/facebookgo/stackerr/patents diff --git a/internal/github.com/facebookgo/stackerr/readme.md b/vendor/github.com/facebookgo/stackerr/readme.md similarity index 100% rename from internal/github.com/facebookgo/stackerr/readme.md rename to vendor/github.com/facebookgo/stackerr/readme.md diff --git a/internal/github.com/facebookgo/stackerr/stackerr.go b/vendor/github.com/facebookgo/stackerr/stackerr.go similarity index 98% rename from internal/github.com/facebookgo/stackerr/stackerr.go rename to vendor/github.com/facebookgo/stackerr/stackerr.go index 69559ff..aa4f753 100644 --- a/internal/github.com/facebookgo/stackerr/stackerr.go +++ b/vendor/github.com/facebookgo/stackerr/stackerr.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/daaku/rell/internal/github.com/facebookgo/stack" + "github.com/facebookgo/stack" ) // Error provides the wrapper that adds multiple Stacks to an error. Each Stack diff --git a/internal/github.com/facebookgo/stats/license b/vendor/github.com/facebookgo/stats/license similarity index 100% rename from internal/github.com/facebookgo/stats/license rename to vendor/github.com/facebookgo/stats/license diff --git a/internal/github.com/facebookgo/stats/patents b/vendor/github.com/facebookgo/stats/patents similarity index 100% rename from internal/github.com/facebookgo/stats/patents rename to vendor/github.com/facebookgo/stats/patents diff --git a/internal/github.com/facebookgo/stats/readme.md b/vendor/github.com/facebookgo/stats/readme.md similarity index 100% rename from internal/github.com/facebookgo/stats/readme.md rename to vendor/github.com/facebookgo/stats/readme.md diff --git a/internal/github.com/facebookgo/stats/stats.go b/vendor/github.com/facebookgo/stats/stats.go similarity index 100% rename from internal/github.com/facebookgo/stats/stats.go rename to vendor/github.com/facebookgo/stats/stats.go diff --git a/internal/github.com/facebookgo/subset/license b/vendor/github.com/facebookgo/subset/license similarity index 100% rename from internal/github.com/facebookgo/subset/license rename to vendor/github.com/facebookgo/subset/license diff --git a/internal/github.com/facebookgo/subset/patents b/vendor/github.com/facebookgo/subset/patents similarity index 100% rename from internal/github.com/facebookgo/subset/patents rename to vendor/github.com/facebookgo/subset/patents diff --git a/internal/github.com/facebookgo/subset/readme.md b/vendor/github.com/facebookgo/subset/readme.md similarity index 100% rename from internal/github.com/facebookgo/subset/readme.md rename to vendor/github.com/facebookgo/subset/readme.md diff --git a/internal/github.com/facebookgo/subset/subset.go b/vendor/github.com/facebookgo/subset/subset.go similarity index 100% rename from internal/github.com/facebookgo/subset/subset.go rename to vendor/github.com/facebookgo/subset/subset.go diff --git a/internal/github.com/go-fsnotify/fsnotify/AUTHORS b/vendor/github.com/go-fsnotify/fsnotify/AUTHORS similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/AUTHORS rename to vendor/github.com/go-fsnotify/fsnotify/AUTHORS diff --git a/internal/github.com/go-fsnotify/fsnotify/CHANGELOG.md b/vendor/github.com/go-fsnotify/fsnotify/CHANGELOG.md similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/CHANGELOG.md rename to vendor/github.com/go-fsnotify/fsnotify/CHANGELOG.md diff --git a/internal/github.com/go-fsnotify/fsnotify/CONTRIBUTING.md b/vendor/github.com/go-fsnotify/fsnotify/CONTRIBUTING.md similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/CONTRIBUTING.md rename to vendor/github.com/go-fsnotify/fsnotify/CONTRIBUTING.md diff --git a/internal/github.com/go-fsnotify/fsnotify/LICENSE b/vendor/github.com/go-fsnotify/fsnotify/LICENSE similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/LICENSE rename to vendor/github.com/go-fsnotify/fsnotify/LICENSE diff --git a/internal/github.com/go-fsnotify/fsnotify/NotUsed.xcworkspace b/vendor/github.com/go-fsnotify/fsnotify/NotUsed.xcworkspace similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/NotUsed.xcworkspace rename to vendor/github.com/go-fsnotify/fsnotify/NotUsed.xcworkspace diff --git a/internal/github.com/go-fsnotify/fsnotify/README.md b/vendor/github.com/go-fsnotify/fsnotify/README.md similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/README.md rename to vendor/github.com/go-fsnotify/fsnotify/README.md diff --git a/internal/github.com/go-fsnotify/fsnotify/circle.yml b/vendor/github.com/go-fsnotify/fsnotify/circle.yml similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/circle.yml rename to vendor/github.com/go-fsnotify/fsnotify/circle.yml diff --git a/internal/github.com/go-fsnotify/fsnotify/fsnotify.go b/vendor/github.com/go-fsnotify/fsnotify/fsnotify.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/fsnotify.go rename to vendor/github.com/go-fsnotify/fsnotify/fsnotify.go diff --git a/internal/github.com/go-fsnotify/fsnotify/inotify.go b/vendor/github.com/go-fsnotify/fsnotify/inotify.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/inotify.go rename to vendor/github.com/go-fsnotify/fsnotify/inotify.go diff --git a/internal/github.com/go-fsnotify/fsnotify/inotify_poller.go b/vendor/github.com/go-fsnotify/fsnotify/inotify_poller.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/inotify_poller.go rename to vendor/github.com/go-fsnotify/fsnotify/inotify_poller.go diff --git a/internal/github.com/go-fsnotify/fsnotify/kqueue.go b/vendor/github.com/go-fsnotify/fsnotify/kqueue.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/kqueue.go rename to vendor/github.com/go-fsnotify/fsnotify/kqueue.go diff --git a/internal/github.com/go-fsnotify/fsnotify/open_mode_bsd.go b/vendor/github.com/go-fsnotify/fsnotify/open_mode_bsd.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/open_mode_bsd.go rename to vendor/github.com/go-fsnotify/fsnotify/open_mode_bsd.go diff --git a/internal/github.com/go-fsnotify/fsnotify/open_mode_darwin.go b/vendor/github.com/go-fsnotify/fsnotify/open_mode_darwin.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/open_mode_darwin.go rename to vendor/github.com/go-fsnotify/fsnotify/open_mode_darwin.go diff --git a/internal/github.com/go-fsnotify/fsnotify/windows.go b/vendor/github.com/go-fsnotify/fsnotify/windows.go similarity index 100% rename from internal/github.com/go-fsnotify/fsnotify/windows.go rename to vendor/github.com/go-fsnotify/fsnotify/windows.go diff --git a/internal/github.com/golang/groupcache/lru/lru.go b/vendor/github.com/golang/groupcache/lru/lru.go similarity index 100% rename from internal/github.com/golang/groupcache/lru/lru.go rename to vendor/github.com/golang/groupcache/lru/lru.go diff --git a/internal/github.com/julienschmidt/httprouter/LICENSE b/vendor/github.com/julienschmidt/httprouter/LICENSE similarity index 100% rename from internal/github.com/julienschmidt/httprouter/LICENSE rename to vendor/github.com/julienschmidt/httprouter/LICENSE diff --git a/internal/github.com/julienschmidt/httprouter/README.md b/vendor/github.com/julienschmidt/httprouter/README.md similarity index 100% rename from internal/github.com/julienschmidt/httprouter/README.md rename to vendor/github.com/julienschmidt/httprouter/README.md diff --git a/internal/github.com/julienschmidt/httprouter/path.go b/vendor/github.com/julienschmidt/httprouter/path.go similarity index 100% rename from internal/github.com/julienschmidt/httprouter/path.go rename to vendor/github.com/julienschmidt/httprouter/path.go diff --git a/internal/github.com/julienschmidt/httprouter/router.go b/vendor/github.com/julienschmidt/httprouter/router.go similarity index 100% rename from internal/github.com/julienschmidt/httprouter/router.go rename to vendor/github.com/julienschmidt/httprouter/router.go diff --git a/internal/github.com/julienschmidt/httprouter/tree.go b/vendor/github.com/julienschmidt/httprouter/tree.go similarity index 100% rename from internal/github.com/julienschmidt/httprouter/tree.go rename to vendor/github.com/julienschmidt/httprouter/tree.go diff --git a/internal/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go similarity index 99% rename from internal/golang.org/x/net/context/context.go rename to vendor/golang.org/x/net/context/context.go index b5584af..e7ee376 100644 --- a/internal/golang.org/x/net/context/context.go +++ b/vendor/golang.org/x/net/context/context.go @@ -34,7 +34,7 @@ // // See http://blog.golang.org/context for example code for a server that uses // Contexts. -package context // import "github.com/daaku/rell/internal/golang.org/x/net/context" +package context // import "golang.org/x/net/context" import ( "errors" diff --git a/internal/golang.org/x/net/idna/idna.go b/vendor/golang.org/x/net/idna/idna.go similarity index 95% rename from internal/golang.org/x/net/idna/idna.go rename to vendor/golang.org/x/net/idna/idna.go index 4cb0cc1..3daa897 100644 --- a/internal/golang.org/x/net/idna/idna.go +++ b/vendor/golang.org/x/net/idna/idna.go @@ -5,7 +5,7 @@ // Package idna implements IDNA2008 (Internationalized Domain Names for // Applications), defined in RFC 5890, RFC 5891, RFC 5892, RFC 5893 and // RFC 5894. -package idna // import "github.com/daaku/rell/internal/golang.org/x/net/idna" +package idna // import "golang.org/x/net/idna" import ( "strings" diff --git a/internal/golang.org/x/net/idna/punycode.go b/vendor/golang.org/x/net/idna/punycode.go similarity index 100% rename from internal/golang.org/x/net/idna/punycode.go rename to vendor/golang.org/x/net/idna/punycode.go diff --git a/internal/golang.org/x/net/publicsuffix/gen.go b/vendor/golang.org/x/net/publicsuffix/gen.go similarity index 99% rename from internal/golang.org/x/net/publicsuffix/gen.go rename to vendor/golang.org/x/net/publicsuffix/gen.go index a584a83..09d835b 100644 --- a/internal/golang.org/x/net/publicsuffix/gen.go +++ b/vendor/golang.org/x/net/publicsuffix/gen.go @@ -31,7 +31,7 @@ import ( "sort" "strings" - "github.com/daaku/rell/internal/golang.org/x/net/idna" + "golang.org/x/net/idna" ) const ( diff --git a/internal/golang.org/x/net/publicsuffix/list.go b/vendor/golang.org/x/net/publicsuffix/list.go similarity index 97% rename from internal/golang.org/x/net/publicsuffix/list.go rename to vendor/golang.org/x/net/publicsuffix/list.go index 7b45548..9419ca9 100644 --- a/internal/golang.org/x/net/publicsuffix/list.go +++ b/vendor/golang.org/x/net/publicsuffix/list.go @@ -5,7 +5,7 @@ // Package publicsuffix provides a public suffix list based on data from // http://publicsuffix.org/. A public suffix is one under which Internet users // can directly register names. -package publicsuffix // import "github.com/daaku/rell/internal/golang.org/x/net/publicsuffix" +package publicsuffix // import "golang.org/x/net/publicsuffix" // TODO: specify case sensitivity and leading/trailing dot behavior for // func PublicSuffix and func EffectiveTLDPlusOne. diff --git a/internal/golang.org/x/net/publicsuffix/table.go b/vendor/golang.org/x/net/publicsuffix/table.go similarity index 100% rename from internal/golang.org/x/net/publicsuffix/table.go rename to vendor/golang.org/x/net/publicsuffix/table.go diff --git a/view/error.go b/view/error.go index d646f66..70a04ca 100644 --- a/view/error.go +++ b/view/error.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/daaku/rell/internal/github.com/daaku/go.errcode" - "github.com/daaku/rell/internal/github.com/daaku/go.h" - "github.com/daaku/rell/internal/github.com/daaku/go.static" + "github.com/daaku/go.errcode" + "github.com/daaku/go.h" + "github.com/daaku/go.static" ) type ErrorCode interface // HTTP Coded Error. diff --git a/view/view.go b/view/view.go index efd6a92..72e8d1e 100644 --- a/view/view.go +++ b/view/view.go @@ -3,9 +3,9 @@ package view import ( - "github.com/daaku/rell/internal/github.com/daaku/go.h" - "github.com/daaku/rell/internal/github.com/daaku/go.h.js.ga" - "github.com/daaku/rell/internal/github.com/daaku/go.static" + "github.com/daaku/go.h" + "github.com/daaku/go.h.js.ga" + "github.com/daaku/go.static" ) type PageConfig struct { diff --git a/web/web.go b/web/web.go index c123f80..10ba519 100644 --- a/web/web.go +++ b/web/web.go @@ -10,12 +10,12 @@ import ( "github.com/daaku/rell/adminweb" "github.com/daaku/rell/examples/viewexamples" - "github.com/daaku/rell/internal/github.com/daaku/ctxerr" - "github.com/daaku/rell/internal/github.com/daaku/ctxmux" - "github.com/daaku/rell/internal/github.com/daaku/go.signedrequest/appdata" - "github.com/daaku/rell/internal/github.com/daaku/go.static" - "github.com/daaku/rell/internal/github.com/facebookgo/fbapp" - "github.com/daaku/rell/internal/golang.org/x/net/context" + "github.com/daaku/ctxerr" + "github.com/daaku/ctxmux" + "github.com/daaku/go.signedrequest/appdata" + "github.com/daaku/go.static" + "github.com/facebookgo/fbapp" + "golang.org/x/net/context" "github.com/daaku/rell/oauth" "github.com/daaku/rell/og/viewog" "github.com/daaku/rell/rellenv"