Move registry package into handler package

The goal is to free up the distribution/registry package to include common
registry types. This moves the webapp definitions out of the way to allow for
this change in the future.

Signed-off-by: Stephen J Day <stephen.day@docker.com>

cmd/registry/main.go

@@ -14,12 +14,12 @@ import (
 	_ "github.com/docker/distribution/auth/token"
 	"github.com/docker/distribution/configuration"
 	ctxu "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry"
+	"github.com/docker/distribution/registry/handlers"
 	_ "github.com/docker/distribution/storagedriver/filesystem"
 	_ "github.com/docker/distribution/storagedriver/inmemory"
 	_ "github.com/docker/distribution/storagedriver/s3"
 	"github.com/docker/distribution/version"
-	"github.com/gorilla/handlers"
+	gorhandlers "github.com/gorilla/handlers"
 	"github.com/yvasiyarov/gorelic"
 	"golang.org/x/net/context"
 )
@@ -50,9 +50,9 @@ func main() {
 	ctx = context.WithValue(ctx, "version", version.Version)
 	ctx = ctxu.WithLogger(ctx, ctxu.GetLogger(ctx, "version"))
 
-	app := registry.NewApp(ctx, *config)
+	app := handlers.NewApp(ctx, *config)
 	handler := configureReporting(app)
-	handler = handlers.CombinedLoggingHandler(os.Stdout, handler)
+	handler = gorhandlers.CombinedLoggingHandler(os.Stdout, handler)
 
 	if config.HTTP.Debug.Addr != "" {
 		go debugServer(config.HTTP.Debug.Addr)
@@ -118,7 +118,7 @@ func logLevel(level configuration.Loglevel) log.Level {
 	return l
 }
 
-func configureReporting(app *registry.App) http.Handler {
+func configureReporting(app *handlers.App) http.Handler {
 	var handler http.Handler = app
 
 	if app.Config.Reporting.Bugsnag.APIKey != "" {

registry/doc.go

@@ -0,0 +1,3 @@
+// Package registry is a placeholder package for registry interface
+// destinations and utilities.
+package registry

registry/handlers/api_test.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"bytes"

registry/handlers/app.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"

registry/handlers/app_test.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"

registry/handlers/basicauth.go

@@ -1,6 +1,6 @@
 // +build go1.4
 
-package registry
+package handlers
 
 import (
 	"net/http"

registry/handlers/basicauth_prego14.go

@@ -1,6 +1,6 @@
 // +build !go1.4
 
-package registry
+package handlers
 
 import (
 	"encoding/base64"

registry/handlers/context.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"

registry/handlers/helpers.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"

registry/handlers/hmac.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"crypto/hmac"

registry/handlers/hmac_test.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import "testing"
 

registry/handlers/images.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"

registry/handlers/layer.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"net/http"

registry/handlers/layerupload.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"

registry/handlers/tags.go

@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"