unified import path

zhuomingliang · Aug 20, 2016 · 07a86f5 · 07a86f5
1 parent 6a87843
commit 07a86f5
Show file tree

Hide file tree

Showing 248 changed files with 761 additions and 759 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,14 @@ language: go
 go:
   - 1.7
 
+go_import_path: v2ray.com/core
+
 git:
   depth: 5
 
 script:
-  - go test -tags json github.com/v2ray/v2ray-core/...
-  
+  - go test -tags json v2ray.com/core/...
+
 after_success:
   - ./testing/coverage/coverall
 

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
   "tasks": [
     {
       "taskName": "build",
-      "args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."],
+      "args": ["-tags", "json", "v2ray.com/core/..."],
       "isBuildCommand": true,
       "problemMatcher": {
         "owner": "go",
@@ -21,7 +21,7 @@
     },
     {
       "taskName": "test",
-      "args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."],
+      "args": ["-tags", "json", "v2ray.com/core/..."],
       "isBuildCommand": false
     }
   ]

diff --git a/README.md b/README.md
@@ -5,10 +5,10 @@
 [2]: https://travis-ci.org/v2ray/v2ray-core "Travis-CI Build Status"
 [3]: https://codecov.io/github/v2ray/v2ray-core/coverage.svg?branch=master "Coverage badge"
 [4]: https://codecov.io/github/v2ray/v2ray-core?branch=master "Codecov Status"
-[5]: https://goreportcard.com/badge/github.com/v2ray/v2ray-core "Go Report badge"
-[6]: https://goreportcard.com/report/github.com/v2ray/v2ray-core "Go Report"
-[7]: https://godoc.org/github.com/v2ray/v2ray-core?status.svg "GoDoc badge"
-[8]: https://godoc.org/github.com/v2ray/v2ray-core "GoDoc"
+[5]: https://goreportcard.com/badge/v2ray.com/core "Go Report badge"
+[6]: https://goreportcard.com/report/v2ray.com/core "Go Report"
+[7]: https://godoc.org/v2ray.com/core?status.svg "GoDoc badge"
+[8]: https://godoc.org/v2ray.com/core "GoDoc"
 [9]: https://codebeat.co/badges/f2354ca8-3e24-463d-a2e3-159af73b2477 "Codebeat badge"
 [10]: https://codebeat.co/projects/github-com-v2ray-v2ray-core "Codebeat"
 

diff --git a/app/api/api.go b/app/api/api.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/v2ray/v2ray-core/app"
+	"v2ray.com/core/app"
 )
 
 const (

diff --git a/app/api/config.go b/app/api/config.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 type Config struct {

diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go
@@ -1,9 +1,9 @@
 package dispatcher
 
 import (
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/transport/ray"
+	"v2ray.com/core/app"
+	"v2ray.com/core/proxy"
+	"v2ray.com/core/transport/ray"
 )
 
 const (

diff --git a/app/dispatcher/impl/default.go b/app/dispatcher/impl/default.go
@@ -1,14 +1,14 @@
 package impl
 
 import (
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/app/proxyman"
-	"github.com/v2ray/v2ray-core/app/router"
-	"github.com/v2ray/v2ray-core/common/alloc"
-	"github.com/v2ray/v2ray-core/common/log"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/transport/ray"
+	"v2ray.com/core/app"
+	"v2ray.com/core/app/proxyman"
+	"v2ray.com/core/app/router"
+	"v2ray.com/core/common/alloc"
+	"v2ray.com/core/common/log"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/proxy"
+	"v2ray.com/core/transport/ray"
 )
 
 type DefaultDispatcher struct {

diff --git a/app/dispatcher/testing/dispatcher.go b/app/dispatcher/testing/dispatcher.go
@@ -1,9 +1,9 @@
 package testing
 
 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/transport/ray"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/proxy"
+	"v2ray.com/core/transport/ray"
 )
 
 type TestPacketDispatcher struct {

diff --git a/app/dns/config.go b/app/dns/config.go
@@ -3,7 +3,7 @@ package dns
 import (
 	"net"
 
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 type Config struct {

diff --git a/app/dns/config_json.go b/app/dns/config_json.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"net"
 
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 func (this *Config) UnmarshalJSON(data []byte) error {

diff --git a/app/dns/config_json_test.go b/app/dns/config_json_test.go
@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	. "github.com/v2ray/v2ray-core/app/dns"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
+	. "v2ray.com/core/app/dns"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
 )
 
 func TestConfigParsing(t *testing.T) {

diff --git a/app/dns/dns.go b/app/dns/dns.go
@@ -3,7 +3,7 @@ package dns
 import (
 	"net"
 
-	"github.com/v2ray/v2ray-core/app"
+	"v2ray.com/core/app"
 )
 
 const (

diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go
@@ -5,13 +5,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/v2ray/v2ray-core/app/dispatcher"
-	"github.com/v2ray/v2ray-core/common/alloc"
-	"github.com/v2ray/v2ray-core/common/dice"
-	"github.com/v2ray/v2ray-core/common/log"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/transport/internet/udp"
+	"v2ray.com/core/app/dispatcher"
+	"v2ray.com/core/common/alloc"
+	"v2ray.com/core/common/dice"
+	"v2ray.com/core/common/log"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/proxy"
+	"v2ray.com/core/transport/internet/udp"
 
 	"github.com/miekg/dns"
 )

diff --git a/app/dns/server.go b/app/dns/server.go
@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/app/dispatcher"
-	"github.com/v2ray/v2ray-core/common/log"
+	"v2ray.com/core/app"
+	"v2ray.com/core/app/dispatcher"
+	"v2ray.com/core/common/log"
 
 	"github.com/miekg/dns"
 )

diff --git a/app/dns/server_test.go b/app/dns/server_test.go
@@ -4,16 +4,16 @@ import (
 	"net"
 	"testing"
 
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/app/dispatcher"
-	dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl"
-	. "github.com/v2ray/v2ray-core/app/dns"
-	"github.com/v2ray/v2ray-core/app/proxyman"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/proxy/freedom"
-	"github.com/v2ray/v2ray-core/testing/assert"
-	"github.com/v2ray/v2ray-core/transport/internet"
+	"v2ray.com/core/app"
+	"v2ray.com/core/app/dispatcher"
+	dispatchers "v2ray.com/core/app/dispatcher/impl"
+	. "v2ray.com/core/app/dns"
+	"v2ray.com/core/app/proxyman"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/proxy"
+	"v2ray.com/core/proxy/freedom"
+	"v2ray.com/core/testing/assert"
+	"v2ray.com/core/transport/internet"
 )
 
 func TestDnsAdd(t *testing.T) {

diff --git a/app/proxyman/proxyman.go b/app/proxyman/proxyman.go
@@ -3,8 +3,8 @@ package proxyman
 import (
 	"sync"
 
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/proxy"
+	"v2ray.com/core/app"
+	"v2ray.com/core/proxy"
 )
 
 const (

diff --git a/app/router/config_cache.go b/app/router/config_cache.go
@@ -1,7 +1,7 @@
 package router
 
 import (
-	"github.com/v2ray/v2ray-core/common"
+	"v2ray.com/core/common"
 )
 
 type ConfigObjectCreator func([]byte) (interface{}, error)

diff --git a/app/router/config_json.go b/app/router/config_json.go
@@ -5,7 +5,7 @@ package router
 import (
 	"encoding/json"
 
-	"github.com/v2ray/v2ray-core/common/log"
+	"v2ray.com/core/common/log"
 )
 
 func (this *Config) UnmarshalJSON(data []byte) error {

diff --git a/app/router/router.go b/app/router/router.go
@@ -1,10 +1,10 @@
 package router
 
 import (
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/common"
-	"github.com/v2ray/v2ray-core/common/log"
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	"v2ray.com/core/app"
+	"v2ray.com/core/common"
+	"v2ray.com/core/common/log"
+	v2net "v2ray.com/core/common/net"
 )
 
 const (

diff --git a/app/router/rules/chinaip_gen.go b/app/router/rules/chinaip_gen.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 const (
@@ -65,7 +65,7 @@ func main() {
 
 	fmt.Fprintln(file, "package rules")
 	fmt.Fprintln(file, "import (")
-	fmt.Fprintln(file, "v2net \"github.com/v2ray/v2ray-core/common/net\"")
+	fmt.Fprintln(file, "v2net \"v2ray.com/core/common/net\"")
 	fmt.Fprintln(file, ")")
 
 	fmt.Fprintln(file, "var (")

diff --git a/app/router/rules/chinaip_init.go b/app/router/rules/chinaip_init.go
@@ -1,7 +1,7 @@
 package rules
 
 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 var (

diff --git a/app/router/rules/chinaip_json.go b/app/router/rules/chinaip_json.go
@@ -5,7 +5,7 @@ package rules
 import (
 	"encoding/json"
 
-	"github.com/v2ray/v2ray-core/common/log"
+	"v2ray.com/core/common/log"
 )
 
 func parseChinaIPRule(data []byte) (*Rule, error) {

diff --git a/app/router/rules/chinaip_json_test.go b/app/router/rules/chinaip_json_test.go
@@ -5,8 +5,8 @@ package rules_test
 import (
 	"testing"
 
-	. "github.com/v2ray/v2ray-core/app/router/rules"
-	"github.com/v2ray/v2ray-core/testing/assert"
+	. "v2ray.com/core/app/router/rules"
+	"v2ray.com/core/testing/assert"
 )
 
 func TestChinaIPJson(t *testing.T) {

diff --git a/app/router/rules/chinaip_test.go b/app/router/rules/chinaip_test.go
@@ -4,9 +4,9 @@ import (
 	"net"
 	"testing"
 
-	. "github.com/v2ray/v2ray-core/app/router/rules"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
+	. "v2ray.com/core/app/router/rules"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
 )
 
 func makeDestination(ip string) v2net.Destination {

diff --git a/app/router/rules/chinasites_json.go b/app/router/rules/chinasites_json.go
@@ -4,7 +4,7 @@ package rules
 
 import (
 	"encoding/json"
-	"github.com/v2ray/v2ray-core/common/log"
+	"v2ray.com/core/common/log"
 )
 
 func parseChinaSitesRule(data []byte) (*Rule, error) {

diff --git a/app/router/rules/chinasites_json_test.go b/app/router/rules/chinasites_json_test.go
@@ -5,8 +5,8 @@ package rules_test
 import (
 	"testing"
 
-	. "github.com/v2ray/v2ray-core/app/router/rules"
-	"github.com/v2ray/v2ray-core/testing/assert"
+	. "v2ray.com/core/app/router/rules"
+	"v2ray.com/core/testing/assert"
 )
 
 func TestChinaSitesJson(t *testing.T) {

diff --git a/app/router/rules/chinasites_test.go b/app/router/rules/chinasites_test.go
@@ -3,9 +3,9 @@ package rules_test
 import (
 	"testing"
 
-	. "github.com/v2ray/v2ray-core/app/router/rules"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/testing/assert"
+	. "v2ray.com/core/app/router/rules"
+	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/testing/assert"
 )
 
 func makeDomainDestination(domain string) v2net.Destination {

diff --git a/app/router/rules/condition.go b/app/router/rules/condition.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 type Condition interface {

diff --git a/app/router/rules/config.go b/app/router/rules/config.go
@@ -1,7 +1,7 @@
 package rules
 
 import (
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	v2net "v2ray.com/core/common/net"
 )
 
 type Rule struct {

diff --git a/app/router/rules/config_json.go b/app/router/rules/config_json.go
@@ -7,10 +7,10 @@ import (
 	"errors"
 	"strings"
 
-	router "github.com/v2ray/v2ray-core/app/router"
-	"github.com/v2ray/v2ray-core/common/collect"
-	"github.com/v2ray/v2ray-core/common/log"
-	v2net "github.com/v2ray/v2ray-core/common/net"
+	router "v2ray.com/core/app/router"
+	"v2ray.com/core/common/collect"
+	"v2ray.com/core/common/log"
+	v2net "v2ray.com/core/common/net"
 )
 
 type JsonRule struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ package dns @@
     import (
     	"net"
-    	"github.com/v2ray/v2ray-core/app"
+    	"v2ray.com/core/app"
     )
     const (
@@ Expand Down @@