Merge 8a22e33 into 66d18bc

go-chassis · Jan 29, 2018 · 3c13f51 · 3c13f51
2 parents 66d18bc + 8a22e33
commit 3c13f51
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 9 deletions.
diff --git a/chassis.go b/chassis.go
@@ -38,7 +38,7 @@ import (
 	_ "github.com/ServiceComb/go-chassis/server/restful"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
 	// tcp package handles transport related things
-	_ "github.com/ServiceComb/go-chassis/transport/tcp"
+	_ "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 )
 
 var goChassis *chassis

diff --git a/client/highway/highway_test.go b/client/highway/highway_test.go
@@ -17,7 +17,7 @@ import (
 	_ "github.com/ServiceComb/go-chassis/server/highway"
 	clientOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/client"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
-	"github.com/ServiceComb/go-chassis/transport/tcp"
+	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )

diff --git a/client/rest/rest_client_test.go b/client/rest/rest_client_test.go
@@ -17,7 +17,7 @@ import (
 	_ "github.com/ServiceComb/go-chassis/server/restful"
 	microClient "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/client"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
-	"github.com/ServiceComb/go-chassis/transport/tcp"
+	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )

diff --git a/core/client/client_test.go b/core/client/client_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config/model"
 	"github.com/ServiceComb/go-chassis/core/lager"
 	clientOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/client"
-	_ "github.com/ServiceComb/go-chassis/transport/tcp"
+	_ "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/handler/transport_handler_test.go b/core/handler/transport_handler_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ServiceComb/go-chassis/examples/schemas/helloworld"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
 	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport"
-	"github.com/ServiceComb/go-chassis/transport/tcp"
+	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )

diff --git a/core/server/server_test.go b/core/server/server_test.go
@@ -19,7 +19,7 @@ import (
 	_ "github.com/ServiceComb/go-chassis/server/restful"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
 	microTransport "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport"
-	_ "github.com/ServiceComb/go-chassis/transport/tcp"
+	_ "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/transport/transport_manager_test.go b/core/transport/transport_manager_test.go
@@ -18,7 +18,7 @@ import (
 	_ "github.com/ServiceComb/go-chassis/security/plugins/aes"
 	_ "github.com/ServiceComb/go-chassis/security/plugins/plain"
 	microTransport "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport"
-	_ "github.com/ServiceComb/go-chassis/transport/tcp"
+	_ "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/server/highway/highway_server_test.go b/server/highway/highway_server_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/ServiceComb/go-chassis/examples/schemas/helloworld"
 	clientOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/client"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
-	"github.com/ServiceComb/go-chassis/transport/tcp"
+	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )

diff --git a/server/restful/restful_server_test.go b/server/restful/restful_server_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/server"
 	"github.com/ServiceComb/go-chassis/examples/schemas"
 	serverOption "github.com/ServiceComb/go-chassis/third_party/forked/go-micro/server"
-	"github.com/ServiceComb/go-chassis/transport/tcp"
+	"github.com/ServiceComb/go-chassis/third_party/forked/go-micro/transport/tcp"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/transport/tcp/comm.go → ...rty/forked/go-micro/transport/tcp/comm.go b/transport/tcp/comm.go → ...rty/forked/go-micro/transport/tcp/comm.go
diff --git a/transport/tcp/tcp.go → ...arty/forked/go-micro/transport/tcp/tcp.go b/transport/tcp/tcp.go → ...arty/forked/go-micro/transport/tcp/tcp.go
diff --git a/transport/tcp/tcp_client.go → ...rked/go-micro/transport/tcp/tcp_client.go b/transport/tcp/tcp_client.go → ...rked/go-micro/transport/tcp/tcp_client.go
diff --git a/transport/tcp/tcp_socket.go → ...rked/go-micro/transport/tcp/tcp_socket.go b/transport/tcp/tcp_socket.go → ...rked/go-micro/transport/tcp/tcp_socket.go
diff --git a/transport/tcp/tcp_test.go → ...forked/go-micro/transport/tcp/tcp_test.go b/transport/tcp/tcp_test.go → ...forked/go-micro/transport/tcp/tcp_test.go