From d585ec059314e7b3749badf1cac7fdfd202d80e1 Mon Sep 17 00:00:00 2001 From: V2Ray Date: Fri, 30 Oct 2015 22:50:45 +0100 Subject: [PATCH] Move config to app/point --- {config => app/point/config}/config.go | 0 {config => app/point/config}/errors.go | 0 {config => app/point/config}/json/connection.go | 0 {config => app/point/config}/json/json.go | 2 +- {config => app/point/config}/json/json_test.go | 2 +- {config => app/point/config}/json/log.go | 0 app/point/point.go | 2 +- app/router/router.go | 2 +- app/router/wildcard_router/router.go | 2 +- release/server/main.go | 2 +- testing/mocks/config.go | 2 +- 11 files changed, 7 insertions(+), 7 deletions(-) rename {config => app/point/config}/config.go (100%) rename {config => app/point/config}/errors.go (100%) rename {config => app/point/config}/json/connection.go (100%) rename {config => app/point/config}/json/json.go (96%) rename {config => app/point/config}/json/json_test.go (97%) rename {config => app/point/config}/json/log.go (100%) diff --git a/config/config.go b/app/point/config/config.go similarity index 100% rename from config/config.go rename to app/point/config/config.go diff --git a/config/errors.go b/app/point/config/errors.go similarity index 100% rename from config/errors.go rename to app/point/config/errors.go diff --git a/config/json/connection.go b/app/point/config/json/connection.go similarity index 100% rename from config/json/connection.go rename to app/point/config/json/connection.go diff --git a/config/json/json.go b/app/point/config/json/json.go similarity index 96% rename from config/json/json.go rename to app/point/config/json/json.go index 8d7c529d0..579e18423 100644 --- a/config/json/json.go +++ b/app/point/config/json/json.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" + "github.com/v2ray/v2ray-core/app/point/config" "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/config" proxyconfig "github.com/v2ray/v2ray-core/proxy/common/config" ) diff --git a/config/json/json_test.go b/app/point/config/json/json_test.go similarity index 97% rename from config/json/json_test.go rename to app/point/config/json/json_test.go index 5fd5daec0..a3ef827af 100644 --- a/config/json/json_test.go +++ b/app/point/config/json/json_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/v2ray/v2ray-core/config/json" + "github.com/v2ray/v2ray-core/app/point/config/json" _ "github.com/v2ray/v2ray-core/proxy/freedom/config/json" _ "github.com/v2ray/v2ray-core/proxy/socks/config/json" _ "github.com/v2ray/v2ray-core/proxy/vmess/config/json" diff --git a/config/json/log.go b/app/point/config/json/log.go similarity index 100% rename from config/json/log.go rename to app/point/config/json/log.go diff --git a/app/point/point.go b/app/point/point.go index 844f59a3c..5a4cabdd2 100644 --- a/app/point/point.go +++ b/app/point/point.go @@ -1,10 +1,10 @@ package point import ( + "github.com/v2ray/v2ray-core/app/point/config" "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/config" "github.com/v2ray/v2ray-core/proxy/common/connhandler" "github.com/v2ray/v2ray-core/transport/ray" ) diff --git a/app/router/router.go b/app/router/router.go index 556681419..af9c18e2d 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -1,8 +1,8 @@ package router import ( + "github.com/v2ray/v2ray-core/app/point/config" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/config" ) type Router interface { diff --git a/app/router/wildcard_router/router.go b/app/router/wildcard_router/router.go index 72c054472..f265c8ca0 100644 --- a/app/router/wildcard_router/router.go +++ b/app/router/wildcard_router/router.go @@ -1,9 +1,9 @@ package wildcard_router import ( + "github.com/v2ray/v2ray-core/app/point/config" "github.com/v2ray/v2ray-core/app/router" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/config" ) type WildcardRouter struct { diff --git a/release/server/main.go b/release/server/main.go index fb39d8968..a605faad6 100644 --- a/release/server/main.go +++ b/release/server/main.go @@ -8,8 +8,8 @@ import ( "github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core/app/point" + jsonconf "github.com/v2ray/v2ray-core/app/point/config/json" "github.com/v2ray/v2ray-core/common/log" - jsonconf "github.com/v2ray/v2ray-core/config/json" // The following are neccesary as they register handlers in their init functions. _ "github.com/v2ray/v2ray-core/proxy/dokodemo" diff --git a/testing/mocks/config.go b/testing/mocks/config.go index dddcc73b7..1e23fa2f5 100644 --- a/testing/mocks/config.go +++ b/testing/mocks/config.go @@ -1,7 +1,7 @@ package mocks import ( - "github.com/v2ray/v2ray-core/config" + "github.com/v2ray/v2ray-core/app/point/config" ) type ConnectionConfig struct {