diff --git a/client/client_transport.go b/client/client_transport.go index a60faab284aca03e486d1a3b934baaa9e4a8f1e5..25dd6506abc8bf3155d9d12a3809cc8a55a0563b 100644 --- a/client/client_transport.go +++ b/client/client_transport.go @@ -5,7 +5,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/registry" ) type Transport interface { diff --git a/client/invoker/invoker.go b/client/invoker/invoker.go index 1cc205d218fd69c13f8e91f3266a6e68bb6df114..075be029b171ddebfdd37faff767b1dd746753fd 100644 --- a/client/invoker/invoker.go +++ b/client/invoker/invoker.go @@ -12,11 +12,11 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/client/selector" - "github.com/dubbo/dubbo-go/dubbo" - "github.com/dubbo/dubbo-go/jsonrpc" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/client/selector" + "github.com/dubbo/go-for-apache-dubbo/dubbo" + "github.com/dubbo/go-for-apache-dubbo/jsonrpc" + "github.com/dubbo/go-for-apache-dubbo/registry" ) const RegistryConnDelay = 3 diff --git a/client/invoker/service_array.go b/client/invoker/service_array.go index 1f78d722ab0e4d948095857f7cb33736f8d956d4..3ffb9615f026ede443046c69e08de7c5074018c6 100644 --- a/client/invoker/service_array.go +++ b/client/invoker/service_array.go @@ -11,7 +11,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/registry" ) ////////////////////////////////////////// diff --git a/client/selector/random.go b/client/selector/random.go index 02f27bafdc55d48d6f63cee26e745b8759e98589..170ef5b489d59e5d7abfe76034ab97d9aad6fc9f 100644 --- a/client/selector/random.go +++ b/client/selector/random.go @@ -6,8 +6,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/registry" ) type RandomSelector struct{} diff --git a/client/selector/round_robin.go b/client/selector/round_robin.go index 3a429c63ce9e36d3487f8e388382b269ba1cb83a..cc6a5d078e62d09998da1a291d6751e91b566ccf 100644 --- a/client/selector/round_robin.go +++ b/client/selector/round_robin.go @@ -5,8 +5,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/registry" ) type RoundRobinSelector struct{} diff --git a/client/selector/selector.go b/client/selector/selector.go index 7f077c48b143b05ec71b66ae12a7f2cc1d24e6d0..a1d58dd85ef05f0c5752724dbe396dfec7360108 100644 --- a/client/selector/selector.go +++ b/client/selector/selector.go @@ -5,8 +5,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/registry" ) var ( diff --git a/client/service_array.go b/client/service_array.go index af1aa9c1474cab3178137611274dabd7d6869626..d16d2d996ea9054f675bd4b037af7088ca615b02 100644 --- a/client/service_array.go +++ b/client/service_array.go @@ -1,6 +1,6 @@ package client -import "github.com/dubbo/dubbo-go/registry" +import "github.com/dubbo/go-for-apache-dubbo/registry" type ServiceArrayIf interface { GetIdx() *int64 diff --git a/dubbo/client.go b/dubbo/client.go index 9ea94e8b393b2133e6f89735efa787dc7de5e983..bfac058316711ca5b8bbf9708104fbb00da2b991 100644 --- a/dubbo/client.go +++ b/dubbo/client.go @@ -15,8 +15,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/public" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/public" + "github.com/dubbo/go-for-apache-dubbo/registry" ) var ( diff --git a/dubbo/config.go b/dubbo/config.go index 8405d0522772dda6be6190810a2b0a31a6c88531..71769541e1d4b2937550d9b93087509b2536c516 100644 --- a/dubbo/config.go +++ b/dubbo/config.go @@ -5,7 +5,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/server" + "github.com/dubbo/go-for-apache-dubbo/server" jerrors "github.com/juju/errors" ) diff --git a/dubbo/server.go b/dubbo/server.go index 4766dbe2f61fe20343aa6b9175f719f8afd39c30..5e2ba20f05347f83c51fa541312c870df02e262f 100644 --- a/dubbo/server.go +++ b/dubbo/server.go @@ -2,7 +2,6 @@ package dubbo import ( "fmt" - "github.com/dubbo/dubbo-go/plugins" "net" "reflect" "strconv" @@ -16,7 +15,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/plugins" ) type Option func(*Options) diff --git a/examples/client_config.go b/examples/client_config.go index bf871ee7fbc7fb1ace9905d20950fe57ff098a5d..dfec7cb99285477eea6ce8cb4922658cd979fb45 100644 --- a/examples/client_config.go +++ b/examples/client_config.go @@ -16,9 +16,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) const ( diff --git a/examples/dubbo/go-client/app/client.go b/examples/dubbo/go-client/app/client.go index 0cd19e411706d4810b4cc3e31a1f8d5d530a7118..b143e9a724ccd1d07dc61a6dff8d5b870c7f3f32 100644 --- a/examples/dubbo/go-client/app/client.go +++ b/examples/dubbo/go-client/app/client.go @@ -2,9 +2,6 @@ package main import ( "fmt" - "github.com/dubbo/dubbo-go/dubbo" - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry/zookeeper" "net/http" _ "net/http/pprof" "os" @@ -22,10 +19,13 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client/invoker" - "github.com/dubbo/dubbo-go/examples" - "github.com/dubbo/dubbo-go/public" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client/invoker" + "github.com/dubbo/go-for-apache-dubbo/examples" + "github.com/dubbo/go-for-apache-dubbo/public" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/dubbo" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/examples/dubbo/go-client/app/test.go b/examples/dubbo/go-client/app/test.go index bea2d95d9af2a46d5e60a2ec540b685e1cc2289d..507f3e592bb4c7288cc31dbb9589979541ede91a 100644 --- a/examples/dubbo/go-client/app/test.go +++ b/examples/dubbo/go-client/app/test.go @@ -13,9 +13,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/dubbo" - "github.com/dubbo/dubbo-go/examples" - "github.com/dubbo/dubbo-go/public" + "github.com/dubbo/go-for-apache-dubbo/dubbo" + "github.com/dubbo/go-for-apache-dubbo/examples" + "github.com/dubbo/go-for-apache-dubbo/public" ) func testDubborpc(clientConfig *examples.ClientConfig, userKey string) { diff --git a/examples/dubbo/go-server/app/config.go b/examples/dubbo/go-server/app/config.go index 71d4aa5467402c6c0f8b78489b2c911334c0fa75..4fb460816fafa61e986f80d787c28279938193a3 100644 --- a/examples/dubbo/go-server/app/config.go +++ b/examples/dubbo/go-server/app/config.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/dubbo/dubbo-go/plugins" "io/ioutil" "os" "path" @@ -17,9 +16,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" - "github.com/dubbo/dubbo-go/server" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/server" + "github.com/dubbo/go-for-apache-dubbo/plugins" ) const ( diff --git a/examples/dubbo/go-server/app/server.go b/examples/dubbo/go-server/app/server.go index bfc039bf407fba0ab33c3c0f490fa903e01229ee..1affcd50116845212210a4376866532a5d9b8b12 100644 --- a/examples/dubbo/go-server/app/server.go +++ b/examples/dubbo/go-server/app/server.go @@ -19,10 +19,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/dubbo" - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/dubbo" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/examples/jsonrpc/go-client/app/client.go b/examples/jsonrpc/go-client/app/client.go index acbe035a8e6fe95c4c22f09f224138854f4e2169..26f39a21700ea811b4bac367f7ea8f03086a6ed7 100644 --- a/examples/jsonrpc/go-client/app/client.go +++ b/examples/jsonrpc/go-client/app/client.go @@ -19,13 +19,13 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client/invoker" - "github.com/dubbo/dubbo-go/examples" - "github.com/dubbo/dubbo-go/jsonrpc" - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/public" - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/client/invoker" + "github.com/dubbo/go-for-apache-dubbo/examples" + "github.com/dubbo/go-for-apache-dubbo/jsonrpc" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/public" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/examples/jsonrpc/go-client/app/test.go b/examples/jsonrpc/go-client/app/test.go index 967d69696bd953bdc442520fe1efcb2d10827c9f..a0128c010dc980d05094dac342e03cb4e193568f 100644 --- a/examples/jsonrpc/go-client/app/test.go +++ b/examples/jsonrpc/go-client/app/test.go @@ -11,9 +11,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/examples" - "github.com/dubbo/dubbo-go/public" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/examples" + "github.com/dubbo/go-for-apache-dubbo/public" ) func testJsonrpc(clientConfig *examples.ClientConfig, userKey string, method string) { diff --git a/examples/jsonrpc/go-server/app/config.go b/examples/jsonrpc/go-server/app/config.go index 16064fca39871f8acd47061fe64124854d22dadf..3a4ef05428117a762f5dd54c214cdbe70c1d692a 100644 --- a/examples/jsonrpc/go-server/app/config.go +++ b/examples/jsonrpc/go-server/app/config.go @@ -16,10 +16,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" - "github.com/dubbo/dubbo-go/server" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/server" ) const ( diff --git a/examples/jsonrpc/go-server/app/server.go b/examples/jsonrpc/go-server/app/server.go index e355e268927051a4e7a0d786194ed5ded5267797..2969feb173d8afb3b45117fb3b376dad363cd7c1 100644 --- a/examples/jsonrpc/go-server/app/server.go +++ b/examples/jsonrpc/go-server/app/server.go @@ -18,10 +18,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/jsonrpc" - "github.com/dubbo/dubbo-go/plugins" - registry2 "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/registry/zookeeper" + "github.com/dubbo/go-for-apache-dubbo/jsonrpc" + "github.com/dubbo/go-for-apache-dubbo/plugins" + registry2 "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/go.mod b/go.mod index 8abc40265af71ddb6db8a122d6346edfc3f4f417..44d857f66138ba855dccd7ed1ae553409de560a4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dubbo/dubbo-go +module github.com/dubbo/go-for-apache-dubbo require ( github.com/AlexStocks/getty v0.0.0-20190331201845-1ca64ac5a589 diff --git a/jsonrpc/http.go b/jsonrpc/http.go index 55fee69d3d3bd8a0d2360fae40f9c561d8e6997f..919527b71fefb8b7e12a8d3b00eb00ece4a3aeee 100644 --- a/jsonrpc/http.go +++ b/jsonrpc/http.go @@ -20,9 +20,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/client" - "github.com/dubbo/dubbo-go/public" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client" + "github.com/dubbo/go-for-apache-dubbo/public" + "github.com/dubbo/go-for-apache-dubbo/registry" ) ////////////////////////////////////////////// diff --git a/jsonrpc/server.go b/jsonrpc/server.go index d8604d4b17895b25da3383e0deea86c1fa692430..b85fd12a972b852a64c005b4f8fe8b85dd773abc 100644 --- a/jsonrpc/server.go +++ b/jsonrpc/server.go @@ -4,7 +4,6 @@ import ( "bufio" "bytes" "context" - "github.com/dubbo/dubbo-go/plugins" "io/ioutil" "net" "net/http" @@ -17,12 +16,13 @@ import ( import ( "github.com/AlexStocks/goext/net" log "github.com/AlexStocks/log4go" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/registry" jerrors "github.com/juju/errors" ) import ( - "github.com/dubbo/dubbo-go/server" + "github.com/dubbo/go-for-apache-dubbo/server" + "github.com/dubbo/go-for-apache-dubbo/plugins" ) const ( diff --git a/plugins/plugins.go b/plugins/plugins.go index 9648420d74d931ac51afe636f40eb6caf497b0cc..1584996e0bc9a74c7c3f17fbf720c303a24c1eb7 100644 --- a/plugins/plugins.go +++ b/plugins/plugins.go @@ -1,8 +1,8 @@ package plugins import ( - "github.com/dubbo/dubbo-go/client/selector" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/client/selector" + "github.com/dubbo/go-for-apache-dubbo/registry" ) var PluggableRegistries = map[string]func(...registry.RegistryOption) (registry.Registry, error){} diff --git a/registry/zookeeper/consumer.go b/registry/zookeeper/consumer.go index c1bf9ff32c2244912fc813049ca160ebe83deca0..5905fb8d1fbdedfe9f04cf331582bda0c16ffefc 100644 --- a/registry/zookeeper/consumer.go +++ b/registry/zookeeper/consumer.go @@ -10,8 +10,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry" ) // name: service@protocol diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 1c182cae2b1295c98d6d0c1583a0dbdfba1c50d3..697038608b342343c9bbe12167acf82af3e8d645 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -14,8 +14,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/plugins" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/plugins" + "github.com/dubbo/go-for-apache-dubbo/registry" ) const ( diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index fa01b045792934e1fd9f8ead1f66be81312edbb4..f6b867c116346bbf94f7b6add941d24b5b3076e0 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -2,7 +2,6 @@ package zookeeper import ( "fmt" - "github.com/dubbo/dubbo-go/plugins" "net/url" "os" "strconv" @@ -18,8 +17,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/version" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/version" + "github.com/dubbo/go-for-apache-dubbo/plugins" ) const (