From 3468fbd4a8da8ddbea94b77042c1cf3a6e6a497d Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Tue, 10 Feb 2015 17:41:09 -0800 Subject: [PATCH] Move storage package under registry package Signed-off-by: Stephen J Day --- registry/handlers/app.go | 4 ++-- registry/handlers/app_test.go | 2 +- registry/handlers/context.go | 2 +- registry/handlers/images.go | 2 +- registry/handlers/layer.go | 2 +- registry/handlers/layerupload.go | 2 +- registry/handlers/tags.go | 2 +- {storage => registry/storage}/blobstore.go | 0 {storage => registry/storage}/cloudfrontlayerhandler.go | 0 {storage => registry/storage}/delegatelayerhandler.go | 0 {storage => registry/storage}/doc.go | 0 {storage => registry/storage}/filereader.go | 0 {storage => registry/storage}/filereader_test.go | 0 {storage => registry/storage}/filewriter.go | 0 {storage => registry/storage}/filewriter_test.go | 0 {storage => registry/storage}/layer.go | 0 {storage => registry/storage}/layer_test.go | 0 {storage => registry/storage}/layerhandler.go | 0 {storage => registry/storage}/layerreader.go | 0 {storage => registry/storage}/layerstore.go | 0 {storage => registry/storage}/layerupload.go | 0 {storage => registry/storage}/manifeststore.go | 0 {storage => registry/storage}/manifeststore_test.go | 0 {storage => registry/storage}/notifications/bridge.go | 2 +- {storage => registry/storage}/notifications/endpoint.go | 0 {storage => registry/storage}/notifications/event.go | 0 {storage => registry/storage}/notifications/event_test.go | 0 {storage => registry/storage}/notifications/http.go | 0 {storage => registry/storage}/notifications/http_test.go | 0 {storage => registry/storage}/notifications/listener.go | 2 +- {storage => registry/storage}/notifications/listener_test.go | 2 +- {storage => registry/storage}/notifications/metrics.go | 0 {storage => registry/storage}/notifications/sinks.go | 0 {storage => registry/storage}/notifications/sinks_test.go | 0 {storage => registry/storage}/paths.go | 0 {storage => registry/storage}/paths_test.go | 0 {storage => registry/storage}/registry.go | 0 {storage => registry/storage}/revisionstore.go | 0 {storage => registry/storage}/services.go | 0 {storage => registry/storage}/tagstore.go | 0 40 files changed, 11 insertions(+), 11 deletions(-) rename {storage => registry/storage}/blobstore.go (100%) rename {storage => registry/storage}/cloudfrontlayerhandler.go (100%) rename {storage => registry/storage}/delegatelayerhandler.go (100%) rename {storage => registry/storage}/doc.go (100%) rename {storage => registry/storage}/filereader.go (100%) rename {storage => registry/storage}/filereader_test.go (100%) rename {storage => registry/storage}/filewriter.go (100%) rename {storage => registry/storage}/filewriter_test.go (100%) rename {storage => registry/storage}/layer.go (100%) rename {storage => registry/storage}/layer_test.go (100%) rename {storage => registry/storage}/layerhandler.go (100%) rename {storage => registry/storage}/layerreader.go (100%) rename {storage => registry/storage}/layerstore.go (100%) rename {storage => registry/storage}/layerupload.go (100%) rename {storage => registry/storage}/manifeststore.go (100%) rename {storage => registry/storage}/manifeststore_test.go (100%) rename {storage => registry/storage}/notifications/bridge.go (98%) rename {storage => registry/storage}/notifications/endpoint.go (100%) rename {storage => registry/storage}/notifications/event.go (100%) rename {storage => registry/storage}/notifications/event_test.go (100%) rename {storage => registry/storage}/notifications/http.go (100%) rename {storage => registry/storage}/notifications/http_test.go (100%) rename {storage => registry/storage}/notifications/listener.go (98%) rename {storage => registry/storage}/notifications/listener_test.go (98%) rename {storage => registry/storage}/notifications/metrics.go (100%) rename {storage => registry/storage}/notifications/sinks.go (100%) rename {storage => registry/storage}/notifications/sinks_test.go (100%) rename {storage => registry/storage}/paths.go (100%) rename {storage => registry/storage}/paths_test.go (100%) rename {storage => registry/storage}/registry.go (100%) rename {storage => registry/storage}/revisionstore.go (100%) rename {storage => registry/storage}/services.go (100%) rename {storage => registry/storage}/tagstore.go (100%) diff --git a/registry/handlers/app.go b/registry/handlers/app.go index 5f433e95d..09c0c621e 100644 --- a/registry/handlers/app.go +++ b/registry/handlers/app.go @@ -11,8 +11,8 @@ import ( "github.com/docker/distribution/registry/auth" "github.com/docker/distribution/configuration" ctxu "github.com/docker/distribution/context" - "github.com/docker/distribution/storage" - "github.com/docker/distribution/storage/notifications" + "github.com/docker/distribution/registry/storage" + "github.com/docker/distribution/registry/storage/notifications" "github.com/docker/distribution/storagedriver" "github.com/docker/distribution/storagedriver/factory" "github.com/gorilla/mux" diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go index 8da285a38..b27c788a0 100644 --- a/registry/handlers/app_test.go +++ b/registry/handlers/app_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/distribution/registry/api/v2" _ "github.com/docker/distribution/registry/auth/silly" "github.com/docker/distribution/configuration" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/docker/distribution/storagedriver/inmemory" "golang.org/x/net/context" ) diff --git a/registry/handlers/context.go b/registry/handlers/context.go index c940d8f4b..a49253eea 100644 --- a/registry/handlers/context.go +++ b/registry/handlers/context.go @@ -7,7 +7,7 @@ import ( "github.com/docker/distribution/registry/api/v2" ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "golang.org/x/net/context" ) diff --git a/registry/handlers/images.go b/registry/handlers/images.go index 9c2dfa437..6a0e9a40a 100644 --- a/registry/handlers/images.go +++ b/registry/handlers/images.go @@ -9,7 +9,7 @@ import ( ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/gorilla/handlers" ) diff --git a/registry/handlers/layer.go b/registry/handlers/layer.go index 73641ddeb..8214fbf0c 100644 --- a/registry/handlers/layer.go +++ b/registry/handlers/layer.go @@ -6,7 +6,7 @@ import ( "github.com/docker/distribution/registry/api/v2" ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/gorilla/handlers" ) diff --git a/registry/handlers/layerupload.go b/registry/handlers/layerupload.go index 190cf86bf..83ef6fb6c 100644 --- a/registry/handlers/layerupload.go +++ b/registry/handlers/layerupload.go @@ -10,7 +10,7 @@ import ( "github.com/docker/distribution/registry/api/v2" ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/gorilla/handlers" ) diff --git a/registry/handlers/tags.go b/registry/handlers/tags.go index 1e8e43d55..0a764693d 100644 --- a/registry/handlers/tags.go +++ b/registry/handlers/tags.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/docker/distribution/registry/api/v2" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/gorilla/handlers" ) diff --git a/storage/blobstore.go b/registry/storage/blobstore.go similarity index 100% rename from storage/blobstore.go rename to registry/storage/blobstore.go diff --git a/storage/cloudfrontlayerhandler.go b/registry/storage/cloudfrontlayerhandler.go similarity index 100% rename from storage/cloudfrontlayerhandler.go rename to registry/storage/cloudfrontlayerhandler.go diff --git a/storage/delegatelayerhandler.go b/registry/storage/delegatelayerhandler.go similarity index 100% rename from storage/delegatelayerhandler.go rename to registry/storage/delegatelayerhandler.go diff --git a/storage/doc.go b/registry/storage/doc.go similarity index 100% rename from storage/doc.go rename to registry/storage/doc.go diff --git a/storage/filereader.go b/registry/storage/filereader.go similarity index 100% rename from storage/filereader.go rename to registry/storage/filereader.go diff --git a/storage/filereader_test.go b/registry/storage/filereader_test.go similarity index 100% rename from storage/filereader_test.go rename to registry/storage/filereader_test.go diff --git a/storage/filewriter.go b/registry/storage/filewriter.go similarity index 100% rename from storage/filewriter.go rename to registry/storage/filewriter.go diff --git a/storage/filewriter_test.go b/registry/storage/filewriter_test.go similarity index 100% rename from storage/filewriter_test.go rename to registry/storage/filewriter_test.go diff --git a/storage/layer.go b/registry/storage/layer.go similarity index 100% rename from storage/layer.go rename to registry/storage/layer.go diff --git a/storage/layer_test.go b/registry/storage/layer_test.go similarity index 100% rename from storage/layer_test.go rename to registry/storage/layer_test.go diff --git a/storage/layerhandler.go b/registry/storage/layerhandler.go similarity index 100% rename from storage/layerhandler.go rename to registry/storage/layerhandler.go diff --git a/storage/layerreader.go b/registry/storage/layerreader.go similarity index 100% rename from storage/layerreader.go rename to registry/storage/layerreader.go diff --git a/storage/layerstore.go b/registry/storage/layerstore.go similarity index 100% rename from storage/layerstore.go rename to registry/storage/layerstore.go diff --git a/storage/layerupload.go b/registry/storage/layerupload.go similarity index 100% rename from storage/layerupload.go rename to registry/storage/layerupload.go diff --git a/storage/manifeststore.go b/registry/storage/manifeststore.go similarity index 100% rename from storage/manifeststore.go rename to registry/storage/manifeststore.go diff --git a/storage/manifeststore_test.go b/registry/storage/manifeststore_test.go similarity index 100% rename from storage/manifeststore_test.go rename to registry/storage/manifeststore_test.go diff --git a/storage/notifications/bridge.go b/registry/storage/notifications/bridge.go similarity index 98% rename from storage/notifications/bridge.go rename to registry/storage/notifications/bridge.go index d6f41ba0c..217ee5bd3 100644 --- a/storage/notifications/bridge.go +++ b/registry/storage/notifications/bridge.go @@ -8,7 +8,7 @@ import ( "code.google.com/p/go-uuid/uuid" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" ) type bridge struct { diff --git a/storage/notifications/endpoint.go b/registry/storage/notifications/endpoint.go similarity index 100% rename from storage/notifications/endpoint.go rename to registry/storage/notifications/endpoint.go diff --git a/storage/notifications/event.go b/registry/storage/notifications/event.go similarity index 100% rename from storage/notifications/event.go rename to registry/storage/notifications/event.go diff --git a/storage/notifications/event_test.go b/registry/storage/notifications/event_test.go similarity index 100% rename from storage/notifications/event_test.go rename to registry/storage/notifications/event_test.go diff --git a/storage/notifications/http.go b/registry/storage/notifications/http.go similarity index 100% rename from storage/notifications/http.go rename to registry/storage/notifications/http.go diff --git a/storage/notifications/http_test.go b/registry/storage/notifications/http_test.go similarity index 100% rename from storage/notifications/http_test.go rename to registry/storage/notifications/http_test.go diff --git a/storage/notifications/listener.go b/registry/storage/notifications/listener.go similarity index 98% rename from storage/notifications/listener.go rename to registry/storage/notifications/listener.go index 2d7bb112b..99a06f021 100644 --- a/storage/notifications/listener.go +++ b/registry/storage/notifications/listener.go @@ -4,7 +4,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" ) // ManifestListener describes a set of methods for listening to events related to manifests. diff --git a/storage/notifications/listener_test.go b/registry/storage/notifications/listener_test.go similarity index 98% rename from storage/notifications/listener_test.go rename to registry/storage/notifications/listener_test.go index 30d3f43f3..b62e7e7e8 100644 --- a/storage/notifications/listener_test.go +++ b/registry/storage/notifications/listener_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - "github.com/docker/distribution/storage" + "github.com/docker/distribution/registry/storage" "github.com/docker/distribution/storagedriver/inmemory" "github.com/docker/distribution/testutil" "github.com/docker/libtrust" diff --git a/storage/notifications/metrics.go b/registry/storage/notifications/metrics.go similarity index 100% rename from storage/notifications/metrics.go rename to registry/storage/notifications/metrics.go diff --git a/storage/notifications/sinks.go b/registry/storage/notifications/sinks.go similarity index 100% rename from storage/notifications/sinks.go rename to registry/storage/notifications/sinks.go diff --git a/storage/notifications/sinks_test.go b/registry/storage/notifications/sinks_test.go similarity index 100% rename from storage/notifications/sinks_test.go rename to registry/storage/notifications/sinks_test.go diff --git a/storage/paths.go b/registry/storage/paths.go similarity index 100% rename from storage/paths.go rename to registry/storage/paths.go diff --git a/storage/paths_test.go b/registry/storage/paths_test.go similarity index 100% rename from storage/paths_test.go rename to registry/storage/paths_test.go diff --git a/storage/registry.go b/registry/storage/registry.go similarity index 100% rename from storage/registry.go rename to registry/storage/registry.go diff --git a/storage/revisionstore.go b/registry/storage/revisionstore.go similarity index 100% rename from storage/revisionstore.go rename to registry/storage/revisionstore.go diff --git a/storage/services.go b/registry/storage/services.go similarity index 100% rename from storage/services.go rename to registry/storage/services.go diff --git a/storage/tagstore.go b/registry/storage/tagstore.go similarity index 100% rename from storage/tagstore.go rename to registry/storage/tagstore.go