From 189262f8a25c9cadb8013277c576f2869ae3cfdb Mon Sep 17 00:00:00 2001 From: fangyincheng <fangyincheng@sina.com> Date: Mon, 6 May 2019 17:21:00 +0800 Subject: [PATCH] Mod:dubbo-go -> go-for-apache-dubbo --- cluster/cluster.go | 2 +- cluster/directory.go | 4 ++-- cluster/directory/base_directory.go | 2 +- cluster/directory/service_array.go | 2 +- cluster/directory/static_directory.go | 2 +- cluster/loadbalance.go | 6 +++--- cluster/loadbalance/random.go | 8 ++++---- cluster/router.go | 4 ++-- cluster/support/base_cluster_invoker.go | 8 ++++---- cluster/support/failover_cluster.go | 6 +++--- cluster/support/failover_cluster_invoker.go | 10 +++++----- cluster/support/mock_cluster.go | 6 +++--- cluster/support/registry_aware_cluster.go | 6 +++--- .../support/registry_aware_cluster_invoker.go | 6 +++--- common/extension/cluster.go | 2 +- common/extension/filter.go | 2 +- common/extension/loadbalance.go | 2 +- common/extension/protocol.go | 2 +- common/extension/registry.go | 4 ++-- common/node.go | 2 +- common/proxy/proxy.go | 6 +++--- common/proxy/proxy_test.go | 4 ++-- config/support/config_loader.go | 2 +- config/support/reference_config.go | 12 ++++++------ config/support/registry_config.go | 4 ++-- config/support/service.go | 2 +- config/support/service_config.go | 8 ++++---- config/url.go | 2 +- examples/dubbo/go-client/app/client.go | 14 +++++++------- examples/dubbo/go-client/app/user.go | 2 +- examples/dubbo/go-server/app/server.go | 16 ++++++++-------- examples/dubbo/go-server/app/user.go | 2 +- examples/jsonrpc/go-client/app/client.go | 14 +++++++------- examples/jsonrpc/go-client/app/user.go | 2 +- examples/jsonrpc/go-server/app/server.go | 14 +++++++------- examples/jsonrpc/go-server/app/user.go | 2 +- filter/filter.go | 2 +- filter/imp/echo_filter.go | 8 ++++---- go.mod | 2 +- protocol/dubbo/client.go | 4 ++-- protocol/dubbo/dubbo_exporter.go | 2 +- protocol/dubbo/dubbo_invoker.go | 8 ++++---- protocol/dubbo/dubbo_protocol.go | 6 +++--- protocol/dubbo/dubbo_protocol_test.go | 4 ++-- protocol/dubbo/listener.go | 6 +++--- protocol/dubbo/readwriter.go | 2 +- protocol/dubbo/server.go | 4 ++-- protocol/invoker.go | 4 ++-- protocol/jsonrpc/http.go | 4 ++-- protocol/jsonrpc/jsonrpc_exporter.go | 2 +- protocol/jsonrpc/jsonrpc_invoker.go | 8 ++++---- protocol/jsonrpc/jsonrpc_protocol.go | 8 ++++---- protocol/jsonrpc/jsonrpc_protocol_test.go | 6 +++--- protocol/jsonrpc/server.go | 6 +++--- protocol/protocol.go | 2 +- protocol/protocolwrapper/mock_protocol_filter.go | 4 ++-- .../protocolwrapper/protocol_filter_wrapper.go | 12 ++++++------ protocol/support/rpcinvocation.go | 6 +++--- registry/directory/directory.go | 14 +++++++------- registry/directory/directory_test.go | 12 ++++++------ registry/event.go | 2 +- registry/factory.go | 2 +- registry/mock_registry.go | 2 +- registry/protocol/protocol.go | 14 +++++++------- registry/registry.go | 4 ++-- registry/zookeeper/consumer.go | 4 ++-- registry/zookeeper/listener.go | 4 ++-- registry/zookeeper/registry.go | 10 +++++----- 68 files changed, 185 insertions(+), 185 deletions(-) diff --git a/cluster/cluster.go b/cluster/cluster.go index bb9f89d0f..c39b8a28b 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -1,6 +1,6 @@ package cluster -import "github.com/dubbo/dubbo-go/protocol" +import "github.com/dubbo/go-for-apache-dubbo/protocol" type Cluster interface { Join(Directory) protocol.Invoker diff --git a/cluster/directory.go b/cluster/directory.go index b3cf9a0b2..9146c593e 100644 --- a/cluster/directory.go +++ b/cluster/directory.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/dubbo/dubbo-go/common" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) // Extension - Directory diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go index e1ea20be0..7b38a63f2 100644 --- a/cluster/directory/base_directory.go +++ b/cluster/directory/base_directory.go @@ -4,7 +4,7 @@ import ( "github.com/tevino/abool" ) import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) type BaseDirectory struct { diff --git a/cluster/directory/service_array.go b/cluster/directory/service_array.go index 7ef5b5645..d7d8821e4 100644 --- a/cluster/directory/service_array.go +++ b/cluster/directory/service_array.go @@ -11,7 +11,7 @@ import ( jerrors "github.com/juju/errors" ) -import "github.com/dubbo/dubbo-go/config" +import "github.com/dubbo/go-for-apache-dubbo/config" ////////////////////////////////////////// // registry array diff --git a/cluster/directory/static_directory.go b/cluster/directory/static_directory.go index e2b73b319..80ff64536 100644 --- a/cluster/directory/static_directory.go +++ b/cluster/directory/static_directory.go @@ -1,7 +1,7 @@ package directory import ( - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type StaticDirectory struct { diff --git a/cluster/loadbalance.go b/cluster/loadbalance.go index 71da42234..18f183e93 100644 --- a/cluster/loadbalance.go +++ b/cluster/loadbalance.go @@ -5,9 +5,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) // Extension - LoadBalance diff --git a/cluster/loadbalance/random.go b/cluster/loadbalance/random.go index 3e296ed1a..6251438f9 100644 --- a/cluster/loadbalance/random.go +++ b/cluster/loadbalance/random.go @@ -5,10 +5,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) const name = "random" diff --git a/cluster/router.go b/cluster/router.go index a8e43bc0a..828af3a18 100644 --- a/cluster/router.go +++ b/cluster/router.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) // Extension - Router diff --git a/cluster/support/base_cluster_invoker.go b/cluster/support/base_cluster_invoker.go index e803ea2d2..1ae288697 100644 --- a/cluster/support/base_cluster_invoker.go +++ b/cluster/support/base_cluster_invoker.go @@ -7,10 +7,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/version" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/version" ) type baseClusterInvoker struct { diff --git a/cluster/support/failover_cluster.go b/cluster/support/failover_cluster.go index de2df5ece..08ffff193 100644 --- a/cluster/support/failover_cluster.go +++ b/cluster/support/failover_cluster.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type FailoverCluster struct { diff --git a/cluster/support/failover_cluster_invoker.go b/cluster/support/failover_cluster_invoker.go index d52648c35..00b14296e 100644 --- a/cluster/support/failover_cluster_invoker.go +++ b/cluster/support/failover_cluster_invoker.go @@ -5,11 +5,11 @@ import ( jerrors "github.com/juju/errors" ) import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/version" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/version" ) type failoverClusterInvoker struct { diff --git a/cluster/support/mock_cluster.go b/cluster/support/mock_cluster.go index 5e4ad2d9f..58d746552 100644 --- a/cluster/support/mock_cluster.go +++ b/cluster/support/mock_cluster.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type MockCluster struct { diff --git a/cluster/support/registry_aware_cluster.go b/cluster/support/registry_aware_cluster.go index 0ee43bf37..1f2e030d5 100644 --- a/cluster/support/registry_aware_cluster.go +++ b/cluster/support/registry_aware_cluster.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type RegistryAwareCluster struct { diff --git a/cluster/support/registry_aware_cluster_invoker.go b/cluster/support/registry_aware_cluster_invoker.go index 4f5aa0523..2ceef25ae 100644 --- a/cluster/support/registry_aware_cluster_invoker.go +++ b/cluster/support/registry_aware_cluster_invoker.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/dubbo/dubbo-go/cluster" - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type registryAwareClusterInvoker struct { diff --git a/common/extension/cluster.go b/common/extension/cluster.go index 6c2fdcebc..1fd76a475 100644 --- a/common/extension/cluster.go +++ b/common/extension/cluster.go @@ -1,7 +1,7 @@ package extension import ( - "github.com/dubbo/dubbo-go/cluster" + "github.com/dubbo/go-for-apache-dubbo/cluster" ) var ( diff --git a/common/extension/filter.go b/common/extension/filter.go index fcab82bd4..e602916ec 100644 --- a/common/extension/filter.go +++ b/common/extension/filter.go @@ -1,7 +1,7 @@ package extension import ( - "github.com/dubbo/dubbo-go/filter" + "github.com/dubbo/go-for-apache-dubbo/filter" ) var ( diff --git a/common/extension/loadbalance.go b/common/extension/loadbalance.go index 78e95625a..ae1998fb3 100644 --- a/common/extension/loadbalance.go +++ b/common/extension/loadbalance.go @@ -1,6 +1,6 @@ package extension -import "github.com/dubbo/dubbo-go/cluster" +import "github.com/dubbo/go-for-apache-dubbo/cluster" var ( loadbalances = make(map[string]func() cluster.LoadBalance) diff --git a/common/extension/protocol.go b/common/extension/protocol.go index 688551b98..2cc14abf8 100644 --- a/common/extension/protocol.go +++ b/common/extension/protocol.go @@ -1,7 +1,7 @@ package extension import ( - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) var ( diff --git a/common/extension/registry.go b/common/extension/registry.go index e38de1a1b..82291c84b 100644 --- a/common/extension/registry.go +++ b/common/extension/registry.go @@ -1,8 +1,8 @@ package extension import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/registry" ) var ( diff --git a/common/node.go b/common/node.go index cc1b82651..4090f8cda 100644 --- a/common/node.go +++ b/common/node.go @@ -1,6 +1,6 @@ package common -import "github.com/dubbo/dubbo-go/config" +import "github.com/dubbo/go-for-apache-dubbo/config" type Node interface { GetUrl() config.URL diff --git a/common/proxy/proxy.go b/common/proxy/proxy.go index 65b0fbf13..6d88c5fc8 100644 --- a/common/proxy/proxy.go +++ b/common/proxy/proxy.go @@ -8,9 +8,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/support" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/support" ) // Proxy struct diff --git a/common/proxy/proxy_test.go b/common/proxy/proxy_test.go index f5653bb1b..10a051652 100644 --- a/common/proxy/proxy_test.go +++ b/common/proxy/proxy_test.go @@ -11,8 +11,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type TestService struct { diff --git a/config/support/config_loader.go b/config/support/config_loader.go index 88f37f55e..2563f9779 100644 --- a/config/support/config_loader.go +++ b/config/support/config_loader.go @@ -17,7 +17,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/constant" ) var ( diff --git a/config/support/reference_config.go b/config/support/reference_config.go index 7e4de409e..7c781223f 100644 --- a/config/support/reference_config.go +++ b/config/support/reference_config.go @@ -8,12 +8,12 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/cluster/directory" - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/common/proxy" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/cluster/directory" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/common/proxy" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type ReferenceConfig struct { diff --git a/config/support/registry_config.go b/config/support/registry_config.go index 7d3ab8817..d77e1a8c3 100644 --- a/config/support/registry_config.go +++ b/config/support/registry_config.go @@ -2,14 +2,14 @@ package support import ( "context" - "github.com/dubbo/dubbo-go/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/constant" "net/url" "strconv" ) import ( log "github.com/AlexStocks/log4go" ) -import "github.com/dubbo/dubbo-go/config" +import "github.com/dubbo/go-for-apache-dubbo/config" type RegistryConfig struct { Id string `required:"true" yaml:"id" json:"id,omitempty"` diff --git a/config/support/service.go b/config/support/service.go index 8dc9eb260..1e4a9d4a1 100644 --- a/config/support/service.go +++ b/config/support/service.go @@ -1,6 +1,6 @@ package support -import "github.com/dubbo/dubbo-go/config" +import "github.com/dubbo/go-for-apache-dubbo/config" var ( conServices = map[string]config.RPCService{} // service name -> service diff --git a/config/support/service_config.go b/config/support/service_config.go index 54a95c32c..b5e9f16c4 100644 --- a/config/support/service_config.go +++ b/config/support/service_config.go @@ -14,10 +14,10 @@ import ( "go.uber.org/atomic" ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type ServiceConfig struct { diff --git a/config/url.go b/config/url.go index aef5b402e..0702caf32 100644 --- a/config/url.go +++ b/config/url.go @@ -3,7 +3,7 @@ package config import ( "context" "fmt" - "github.com/dubbo/dubbo-go/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/constant" "net" "net/url" "strconv" diff --git a/examples/dubbo/go-client/app/client.go b/examples/dubbo/go-client/app/client.go index 1b29bc00d..4ea5f5c38 100644 --- a/examples/dubbo/go-client/app/client.go +++ b/examples/dubbo/go-client/app/client.go @@ -20,16 +20,16 @@ import ( ) import ( - _ "github.com/dubbo/dubbo-go/protocol/dubbo" - _ "github.com/dubbo/dubbo-go/registry/protocol" + _ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo" + _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol" - _ "github.com/dubbo/dubbo-go/filter/imp" + _ "github.com/dubbo/go-for-apache-dubbo/filter/imp" - _ "github.com/dubbo/dubbo-go/cluster/loadbalance" - _ "github.com/dubbo/dubbo-go/cluster/support" - _ "github.com/dubbo/dubbo-go/registry/zookeeper" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/support" + _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" ) var ( diff --git a/examples/dubbo/go-client/app/user.go b/examples/dubbo/go-client/app/user.go index a0f1d0ae8..4b805616b 100644 --- a/examples/dubbo/go-client/app/user.go +++ b/examples/dubbo/go-client/app/user.go @@ -12,7 +12,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" ) type Gender hessian.JavaEnum diff --git a/examples/dubbo/go-server/app/server.go b/examples/dubbo/go-server/app/server.go index 61099fc36..127212480 100644 --- a/examples/dubbo/go-server/app/server.go +++ b/examples/dubbo/go-server/app/server.go @@ -18,17 +18,17 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" - _ "github.com/dubbo/dubbo-go/protocol/dubbo" - _ "github.com/dubbo/dubbo-go/protocol/jsonrpc" - _ "github.com/dubbo/dubbo-go/registry/protocol" + _ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo" + _ "github.com/dubbo/go-for-apache-dubbo/protocol/jsonrpc" + _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol" - _ "github.com/dubbo/dubbo-go/filter/imp" + _ "github.com/dubbo/go-for-apache-dubbo/filter/imp" - _ "github.com/dubbo/dubbo-go/cluster/loadbalance" - _ "github.com/dubbo/dubbo-go/cluster/support" - _ "github.com/dubbo/dubbo-go/registry/zookeeper" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/support" + _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/examples/dubbo/go-server/app/user.go b/examples/dubbo/go-server/app/user.go index e8c7539f6..a6a51bb9b 100644 --- a/examples/dubbo/go-server/app/user.go +++ b/examples/dubbo/go-server/app/user.go @@ -13,7 +13,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" ) type Gender hessian.JavaEnum diff --git a/examples/jsonrpc/go-client/app/client.go b/examples/jsonrpc/go-client/app/client.go index 1e52654df..03d7e4fad 100644 --- a/examples/jsonrpc/go-client/app/client.go +++ b/examples/jsonrpc/go-client/app/client.go @@ -19,16 +19,16 @@ import ( ) import ( - _ "github.com/dubbo/dubbo-go/protocol/jsonrpc" - _ "github.com/dubbo/dubbo-go/registry/protocol" + _ "github.com/dubbo/go-for-apache-dubbo/protocol/jsonrpc" + _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol" - _ "github.com/dubbo/dubbo-go/filter/imp" + _ "github.com/dubbo/go-for-apache-dubbo/filter/imp" - _ "github.com/dubbo/dubbo-go/cluster/loadbalance" - _ "github.com/dubbo/dubbo-go/cluster/support" - _ "github.com/dubbo/dubbo-go/registry/zookeeper" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/support" + _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" ) var ( diff --git a/examples/jsonrpc/go-client/app/user.go b/examples/jsonrpc/go-client/app/user.go index c6dc21344..b5d189adc 100644 --- a/examples/jsonrpc/go-client/app/user.go +++ b/examples/jsonrpc/go-client/app/user.go @@ -10,7 +10,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" ) func init() { diff --git a/examples/jsonrpc/go-server/app/server.go b/examples/jsonrpc/go-server/app/server.go index de0adfa82..8e4ec3bc6 100644 --- a/examples/jsonrpc/go-server/app/server.go +++ b/examples/jsonrpc/go-server/app/server.go @@ -17,16 +17,16 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" - _ "github.com/dubbo/dubbo-go/protocol/jsonrpc" - _ "github.com/dubbo/dubbo-go/registry/protocol" + _ "github.com/dubbo/go-for-apache-dubbo/protocol/jsonrpc" + _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol" - _ "github.com/dubbo/dubbo-go/filter/imp" + _ "github.com/dubbo/go-for-apache-dubbo/filter/imp" - _ "github.com/dubbo/dubbo-go/cluster/loadbalance" - _ "github.com/dubbo/dubbo-go/cluster/support" - _ "github.com/dubbo/dubbo-go/registry/zookeeper" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance" + _ "github.com/dubbo/go-for-apache-dubbo/cluster/support" + _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper" ) var ( diff --git a/examples/jsonrpc/go-server/app/user.go b/examples/jsonrpc/go-server/app/user.go index b619caf00..7ffe4260f 100644 --- a/examples/jsonrpc/go-server/app/user.go +++ b/examples/jsonrpc/go-server/app/user.go @@ -4,7 +4,7 @@ import ( // "encoding/json" "context" "fmt" - "github.com/dubbo/dubbo-go/config/support" + "github.com/dubbo/go-for-apache-dubbo/config/support" "time" ) diff --git a/filter/filter.go b/filter/filter.go index 3647bbc85..6108040bb 100644 --- a/filter/filter.go +++ b/filter/filter.go @@ -1,7 +1,7 @@ package filter import ( - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) // Extension - Filter diff --git a/filter/imp/echo_filter.go b/filter/imp/echo_filter.go index 3ddff24c8..13631f7a2 100644 --- a/filter/imp/echo_filter.go +++ b/filter/imp/echo_filter.go @@ -5,10 +5,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/filter" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/filter" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) const ECHO = "echo" diff --git a/go.mod b/go.mod index b1eed2445..02336cbdc 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/protocol/dubbo/client.go b/protocol/dubbo/client.go index 4ce4b4429..60a1f25e0 100644 --- a/protocol/dubbo/client.go +++ b/protocol/dubbo/client.go @@ -18,8 +18,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" ) var ( diff --git a/protocol/dubbo/dubbo_exporter.go b/protocol/dubbo/dubbo_exporter.go index 111b1782f..9a4ed023f 100644 --- a/protocol/dubbo/dubbo_exporter.go +++ b/protocol/dubbo/dubbo_exporter.go @@ -5,7 +5,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type DubboExporter struct { diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go index 278881820..51b9ab095 100644 --- a/protocol/dubbo/dubbo_invoker.go +++ b/protocol/dubbo/dubbo_invoker.go @@ -11,10 +11,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/support" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/support" ) var Err_No_Reply = errors.New("request need @reply") diff --git a/protocol/dubbo/dubbo_protocol.go b/protocol/dubbo/dubbo_protocol.go index d80df6b2b..3ab1bcd21 100644 --- a/protocol/dubbo/dubbo_protocol.go +++ b/protocol/dubbo/dubbo_protocol.go @@ -5,9 +5,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) const DUBBO = "dubbo" diff --git a/protocol/dubbo/dubbo_protocol_test.go b/protocol/dubbo/dubbo_protocol_test.go index 9a7649ee4..ecd34d360 100644 --- a/protocol/dubbo/dubbo_protocol_test.go +++ b/protocol/dubbo/dubbo_protocol_test.go @@ -10,8 +10,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) func TestDubboProtocol_Export(t *testing.T) { diff --git a/protocol/dubbo/listener.go b/protocol/dubbo/listener.go index b81a5113c..5a78ee180 100644 --- a/protocol/dubbo/listener.go +++ b/protocol/dubbo/listener.go @@ -15,9 +15,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/support" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/support" ) // todo: WritePkg_Timeout will entry *.yml diff --git a/protocol/dubbo/readwriter.go b/protocol/dubbo/readwriter.go index 47d925138..8338043ff 100644 --- a/protocol/dubbo/readwriter.go +++ b/protocol/dubbo/readwriter.go @@ -11,7 +11,7 @@ import ( jerrors "github.com/juju/errors" ) import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) //////////////////////////////////////////// diff --git a/protocol/dubbo/server.go b/protocol/dubbo/server.go index b919cd6db..7f5bd3c82 100644 --- a/protocol/dubbo/server.go +++ b/protocol/dubbo/server.go @@ -2,7 +2,7 @@ package dubbo import ( "fmt" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" "gopkg.in/yaml.v2" "io/ioutil" "net" @@ -16,7 +16,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) var srvConf *ServerConfig diff --git a/protocol/invoker.go b/protocol/invoker.go index c118d27c3..5611bb31f 100644 --- a/protocol/invoker.go +++ b/protocol/invoker.go @@ -5,8 +5,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common" - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/common" + "github.com/dubbo/go-for-apache-dubbo/config" ) // Extension - Invoker diff --git a/protocol/jsonrpc/http.go b/protocol/jsonrpc/http.go index 48392fcc7..7e19e3742 100644 --- a/protocol/jsonrpc/http.go +++ b/protocol/jsonrpc/http.go @@ -20,8 +20,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" ) ////////////////////////////////////////////// diff --git a/protocol/jsonrpc/jsonrpc_exporter.go b/protocol/jsonrpc/jsonrpc_exporter.go index 3c6c16cbb..3401d3fcb 100644 --- a/protocol/jsonrpc/jsonrpc_exporter.go +++ b/protocol/jsonrpc/jsonrpc_exporter.go @@ -5,7 +5,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type JsonrpcExporter struct { diff --git a/protocol/jsonrpc/jsonrpc_invoker.go b/protocol/jsonrpc/jsonrpc_invoker.go index 5aaf955c1..8f2e197b2 100644 --- a/protocol/jsonrpc/jsonrpc_invoker.go +++ b/protocol/jsonrpc/jsonrpc_invoker.go @@ -10,10 +10,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/support" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/support" ) type JsonrpcInvoker struct { diff --git a/protocol/jsonrpc/jsonrpc_protocol.go b/protocol/jsonrpc/jsonrpc_protocol.go index ecebb4014..98276e8c5 100644 --- a/protocol/jsonrpc/jsonrpc_protocol.go +++ b/protocol/jsonrpc/jsonrpc_protocol.go @@ -5,10 +5,10 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/config/support" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/config/support" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) const JSONRPC = "jsonrpc" diff --git a/protocol/jsonrpc/jsonrpc_protocol_test.go b/protocol/jsonrpc/jsonrpc_protocol_test.go index e9a867b94..80fc9219e 100644 --- a/protocol/jsonrpc/jsonrpc_protocol_test.go +++ b/protocol/jsonrpc/jsonrpc_protocol_test.go @@ -11,9 +11,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/config/support" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/config/support" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) func TestJsonrpcProtocol_Export(t *testing.T) { diff --git a/protocol/jsonrpc/server.go b/protocol/jsonrpc/server.go index b5db66aab..78e2944e3 100644 --- a/protocol/jsonrpc/server.go +++ b/protocol/jsonrpc/server.go @@ -21,9 +21,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/support" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/support" ) var ( diff --git a/protocol/protocol.go b/protocol/protocol.go index 82bbedd8d..413b2e61f 100644 --- a/protocol/protocol.go +++ b/protocol/protocol.go @@ -9,7 +9,7 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) // Extension - protocol diff --git a/protocol/protocolwrapper/mock_protocol_filter.go b/protocol/protocolwrapper/mock_protocol_filter.go index 3f9f11401..e2c0326f3 100644 --- a/protocol/protocolwrapper/mock_protocol_filter.go +++ b/protocol/protocolwrapper/mock_protocol_filter.go @@ -1,8 +1,8 @@ package protocolwrapper import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) type mockProtocolFilter struct { diff --git a/protocol/protocolwrapper/protocol_filter_wrapper.go b/protocol/protocolwrapper/protocol_filter_wrapper.go index 25e747d49..8c7545b07 100644 --- a/protocol/protocolwrapper/protocol_filter_wrapper.go +++ b/protocol/protocolwrapper/protocol_filter_wrapper.go @@ -1,16 +1,16 @@ package protocolwrapper import ( - "github.com/dubbo/dubbo-go/filter/imp" "strings" ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/filter" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/filter" + "github.com/dubbo/go-for-apache-dubbo/filter/imp" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) const FILTER = "filter" diff --git a/protocol/support/rpcinvocation.go b/protocol/support/rpcinvocation.go index 9e2017c80..f71e094d9 100644 --- a/protocol/support/rpcinvocation.go +++ b/protocol/support/rpcinvocation.go @@ -5,9 +5,9 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" ) ///////////////////////////// diff --git a/registry/directory/directory.go b/registry/directory/directory.go index a56cfa4cb..0abec4265 100644 --- a/registry/directory/directory.go +++ b/registry/directory/directory.go @@ -11,13 +11,13 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/cluster/directory" - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/protocolwrapper" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/cluster/directory" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper" + "github.com/dubbo/go-for-apache-dubbo/registry" ) const RegistryConnDelay = 3 diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go index 8c4a07d4f..8baf6905a 100644 --- a/registry/directory/directory_test.go +++ b/registry/directory/directory_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" ) import ( - "github.com/dubbo/dubbo-go/cluster/support" - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol/protocolwrapper" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/cluster/support" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper" + "github.com/dubbo/go-for-apache-dubbo/registry" ) func TestSubscribe(t *testing.T) { diff --git a/registry/event.go b/registry/event.go index 47e5e5f2f..976f7f987 100644 --- a/registry/event.go +++ b/registry/event.go @@ -6,7 +6,7 @@ import ( "time" ) import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) func init() { diff --git a/registry/factory.go b/registry/factory.go index c9596fb16..bb20e9dd3 100644 --- a/registry/factory.go +++ b/registry/factory.go @@ -1,6 +1,6 @@ package registry -import "github.com/dubbo/dubbo-go/config" +import "github.com/dubbo/go-for-apache-dubbo/config" type RegistryFactory interface { GetRegistry(url config.URL) Registry diff --git a/registry/mock_registry.go b/registry/mock_registry.go index a7ed81248..cef39f9e2 100644 --- a/registry/mock_registry.go +++ b/registry/mock_registry.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/config" ) type MockRegistry struct { diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go index 93104e443..c982edcb8 100644 --- a/registry/protocol/protocol.go +++ b/registry/protocol/protocol.go @@ -9,13 +9,13 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" - "github.com/dubbo/dubbo-go/protocol/protocolwrapper" - "github.com/dubbo/dubbo-go/registry" - directory2 "github.com/dubbo/dubbo-go/registry/directory" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/protocol" + "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper" + "github.com/dubbo/go-for-apache-dubbo/registry" + directory2 "github.com/dubbo/go-for-apache-dubbo/registry/directory" ) var registryProtocol *RegistryProtocol diff --git a/registry/registry.go b/registry/registry.go index 00e065694..e8711f7fc 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/dubbo/dubbo-go/common" - "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/go-for-apache-dubbo/common" + "github.com/dubbo/go-for-apache-dubbo/config" ) // Extension - Registry diff --git a/registry/zookeeper/consumer.go b/registry/zookeeper/consumer.go index e239074c3..88c2c6cd3 100644 --- a/registry/zookeeper/consumer.go +++ b/registry/zookeeper/consumer.go @@ -5,8 +5,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/registry" ) // name: service@protocol diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 6cb7642d3..54e48b901 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -15,8 +15,8 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/registry" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/registry" ) const ( diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 6bf44c489..9bdfc9612 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -19,11 +19,11 @@ import ( ) import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/registry" - "github.com/dubbo/dubbo-go/version" + "github.com/dubbo/go-for-apache-dubbo/common/constant" + "github.com/dubbo/go-for-apache-dubbo/common/extension" + "github.com/dubbo/go-for-apache-dubbo/config" + "github.com/dubbo/go-for-apache-dubbo/registry" + "github.com/dubbo/go-for-apache-dubbo/version" ) const ( -- GitLab