From 9e30599f1fc029395aa0046c5d1ea0f3d1e8e784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Aug 2014 20:45:41 +0200 Subject: [PATCH] rename backend to pkg --- grafana | 2 +- grafana.go | 2 +- {backend => pkg}/api/api.go | 4 ++-- {backend => pkg}/api/api_dashboard.go | 2 +- {backend => pkg}/api/api_login.go | 0 {backend => pkg}/api/api_models.go | 0 {backend => pkg}/api/api_render.go | 0 {backend => pkg}/api/api_test.go | 0 {backend => pkg}/components/phantom_renderer.go | 0 {backend => pkg}/components/phantom_renderer_test.go | 0 {backend => pkg}/configuration/configuration.go | 0 {backend => pkg}/models/dashboards.go | 0 {backend => pkg}/server/server.go | 4 ++-- {backend => pkg}/stores/file_store.go | 2 +- {backend => pkg}/stores/file_store_test.go | 2 +- {backend => pkg}/stores/store.go | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename {backend => pkg}/api/api.go (95%) rename {backend => pkg}/api/api_dashboard.go (95%) rename {backend => pkg}/api/api_login.go (100%) rename {backend => pkg}/api/api_models.go (100%) rename {backend => pkg}/api/api_render.go (100%) rename {backend => pkg}/api/api_test.go (100%) rename {backend => pkg}/components/phantom_renderer.go (100%) rename {backend => pkg}/components/phantom_renderer_test.go (100%) rename {backend => pkg}/configuration/configuration.go (100%) rename {backend => pkg}/models/dashboards.go (100%) rename {backend => pkg}/server/server.go (80%) rename {backend => pkg}/stores/file_store.go (98%) rename {backend => pkg}/stores/file_store_test.go (98%) rename {backend => pkg}/stores/store.go (83%) diff --git a/grafana b/grafana index bfe1ef07330..472e1c6d8e4 160000 --- a/grafana +++ b/grafana @@ -1 +1 @@ -Subproject commit bfe1ef07330fcfcdbc3aa9ddd4eef827ee48f316 +Subproject commit 472e1c6d8e4f6b1ea094d6e017e1a98803e48989 diff --git a/grafana.go b/grafana.go index fb28ee81010..704d2b0d1dd 100644 --- a/grafana.go +++ b/grafana.go @@ -5,7 +5,7 @@ import ( "time" log "github.com/alecthomas/log4go" - "github.com/torkelo/grafana-pro/backend/server" + "github.com/torkelo/grafana-pro/pkg/server" ) func main() { diff --git a/backend/api/api.go b/pkg/api/api.go similarity index 95% rename from backend/api/api.go rename to pkg/api/api.go index ee2f1133f54..2be4eb74cf5 100644 --- a/backend/api/api.go +++ b/pkg/api/api.go @@ -6,8 +6,8 @@ import ( log "github.com/alecthomas/log4go" "github.com/gin-gonic/gin" "github.com/gorilla/sessions" - "github.com/torkelo/grafana-pro/backend/components" - "github.com/torkelo/grafana-pro/backend/stores" + "github.com/torkelo/grafana-pro/pkg/components" + "github.com/torkelo/grafana-pro/pkg/stores" ) type HttpServer struct { diff --git a/backend/api/api_dashboard.go b/pkg/api/api_dashboard.go similarity index 95% rename from backend/api/api_dashboard.go rename to pkg/api/api_dashboard.go index 08fb5c9f63e..60ecdc8189e 100644 --- a/backend/api/api_dashboard.go +++ b/pkg/api/api_dashboard.go @@ -2,7 +2,7 @@ package api import ( "github.com/gin-gonic/gin" - "github.com/torkelo/grafana-pro/backend/models" + "github.com/torkelo/grafana-pro/pkg/models" ) func init() { diff --git a/backend/api/api_login.go b/pkg/api/api_login.go similarity index 100% rename from backend/api/api_login.go rename to pkg/api/api_login.go diff --git a/backend/api/api_models.go b/pkg/api/api_models.go similarity index 100% rename from backend/api/api_models.go rename to pkg/api/api_models.go diff --git a/backend/api/api_render.go b/pkg/api/api_render.go similarity index 100% rename from backend/api/api_render.go rename to pkg/api/api_render.go diff --git a/backend/api/api_test.go b/pkg/api/api_test.go similarity index 100% rename from backend/api/api_test.go rename to pkg/api/api_test.go diff --git a/backend/components/phantom_renderer.go b/pkg/components/phantom_renderer.go similarity index 100% rename from backend/components/phantom_renderer.go rename to pkg/components/phantom_renderer.go diff --git a/backend/components/phantom_renderer_test.go b/pkg/components/phantom_renderer_test.go similarity index 100% rename from backend/components/phantom_renderer_test.go rename to pkg/components/phantom_renderer_test.go diff --git a/backend/configuration/configuration.go b/pkg/configuration/configuration.go similarity index 100% rename from backend/configuration/configuration.go rename to pkg/configuration/configuration.go diff --git a/backend/models/dashboards.go b/pkg/models/dashboards.go similarity index 100% rename from backend/models/dashboards.go rename to pkg/models/dashboards.go diff --git a/backend/server/server.go b/pkg/server/server.go similarity index 80% rename from backend/server/server.go rename to pkg/server/server.go index 089ccc9ed4f..ea8c5c425f4 100644 --- a/backend/server/server.go +++ b/pkg/server/server.go @@ -1,8 +1,8 @@ package server import ( - "github.com/torkelo/grafana-pro/backend/api" - "github.com/torkelo/grafana-pro/backend/stores" + "github.com/torkelo/grafana-pro/pkg/api" + "github.com/torkelo/grafana-pro/pkg/stores" ) type Server struct { diff --git a/backend/stores/file_store.go b/pkg/stores/file_store.go similarity index 98% rename from backend/stores/file_store.go rename to pkg/stores/file_store.go index 7ecba7d1c81..6b9765e6473 100644 --- a/backend/stores/file_store.go +++ b/pkg/stores/file_store.go @@ -8,7 +8,7 @@ import ( "strings" log "github.com/alecthomas/log4go" - "github.com/torkelo/grafana-pro/backend/models" + "github.com/torkelo/grafana-pro/pkg/models" ) type fileStore struct { diff --git a/backend/stores/file_store_test.go b/pkg/stores/file_store_test.go similarity index 98% rename from backend/stores/file_store_test.go rename to pkg/stores/file_store_test.go index f896e20e687..77c0224c53e 100644 --- a/backend/stores/file_store_test.go +++ b/pkg/stores/file_store_test.go @@ -9,7 +9,7 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "github.com/torkelo/grafana-pro/backend/models" + "github.com/torkelo/grafana-pro/pkg/models" ) func TestFileStore(t *testing.T) { diff --git a/backend/stores/store.go b/pkg/stores/store.go similarity index 83% rename from backend/stores/store.go rename to pkg/stores/store.go index e071d1e7a66..8ce505c420e 100644 --- a/backend/stores/store.go +++ b/pkg/stores/store.go @@ -1,7 +1,7 @@ package stores import ( - "github.com/torkelo/grafana-pro/backend/models" + "github.com/torkelo/grafana-pro/pkg/models" ) type Store interface {