Move config to app/point

config/json/json.go → 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"
 )
 

config/json/json_test.go → 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"

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"
 )

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 {

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 {

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"

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 {