diff --git a/README.md b/README.md index 2d7948a7..18e91c22 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ gRPC-Go: a Go implementation of gRPC, Google's RPC library To install this package, you need to install Go 1.4 and setup your Go workspace on your computer. The simplest way to install the library is to run: -go get github.com/google/grpc-go +go get github.com/google/grpc-go/rpc diff --git a/call.go b/rpc/call.go similarity index 97% rename from call.go rename to rpc/call.go index f6b2e79b..cf52316b 100644 --- a/call.go +++ b/rpc/call.go @@ -36,9 +36,9 @@ package rpc import ( "io" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/metadata" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/metadata" + "github.com/google/grpc-go/rpc/transport" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/clientconn.go b/rpc/clientconn.go similarity index 98% rename from clientconn.go rename to rpc/clientconn.go index 66d6f264..ff50312d 100644 --- a/clientconn.go +++ b/rpc/clientconn.go @@ -41,8 +41,8 @@ import ( "sync" "time" - "github.com/google/grpc-go/credentials" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/credentials" + "github.com/google/grpc-go/rpc/transport" "golang.org/x/net/context" ) diff --git a/codes/codes.go b/rpc/codes/codes.go similarity index 100% rename from codes/codes.go rename to rpc/codes/codes.go diff --git a/compiler/Makefile b/rpc/compiler/Makefile similarity index 100% rename from compiler/Makefile rename to rpc/compiler/Makefile diff --git a/compiler/gen.sh b/rpc/compiler/gen.sh similarity index 100% rename from compiler/gen.sh rename to rpc/compiler/gen.sh diff --git a/compiler/go_generator.cc b/rpc/compiler/go_generator.cc similarity index 100% rename from compiler/go_generator.cc rename to rpc/compiler/go_generator.cc diff --git a/compiler/go_generator.h b/rpc/compiler/go_generator.h similarity index 100% rename from compiler/go_generator.h rename to rpc/compiler/go_generator.h diff --git a/compiler/go_plugin.cc b/rpc/compiler/go_plugin.cc similarity index 100% rename from compiler/go_plugin.cc rename to rpc/compiler/go_plugin.cc diff --git a/credentials/credentials.go b/rpc/credentials/credentials.go similarity index 100% rename from credentials/credentials.go rename to rpc/credentials/credentials.go diff --git a/interop/client/client.go b/rpc/interop/client/client.go similarity index 98% rename from interop/client/client.go rename to rpc/interop/client/client.go index fa62e07a..2e9c7542 100644 --- a/interop/client/client.go +++ b/rpc/interop/client/client.go @@ -41,9 +41,9 @@ import ( "strconv" "github.com/golang/protobuf/proto" - "github.com/google/grpc-go" - "github.com/google/grpc-go/credentials" - testpb "github.com/google/grpc-go/interop/testdata" + "github.com/google/grpc-go/rpc" + "github.com/google/grpc-go/rpc/credentials" + testpb "github.com/google/grpc-go/rpc/interop/testdata" "golang.org/x/net/context" ) diff --git a/interop/client/testdata/ca.pem b/rpc/interop/client/testdata/ca.pem similarity index 100% rename from interop/client/testdata/ca.pem rename to rpc/interop/client/testdata/ca.pem diff --git a/interop/client/testdata/server1.key b/rpc/interop/client/testdata/server1.key similarity index 100% rename from interop/client/testdata/server1.key rename to rpc/interop/client/testdata/server1.key diff --git a/interop/client/testdata/server1.pem b/rpc/interop/client/testdata/server1.pem similarity index 100% rename from interop/client/testdata/server1.pem rename to rpc/interop/client/testdata/server1.pem diff --git a/interop/server/server.go b/rpc/interop/server/server.go similarity index 97% rename from interop/server/server.go rename to rpc/interop/server/server.go index 89ee3469..22a16f59 100644 --- a/interop/server/server.go +++ b/rpc/interop/server/server.go @@ -42,9 +42,9 @@ import ( "strconv" "time" - "github.com/google/grpc-go/credentials" - testpb "github.com/google/grpc-go/interop/testdata" - "github.com/google/grpc-go" + "github.com/google/grpc-go/rpc/credentials" + testpb "github.com/google/grpc-go/rpc/interop/testdata" + "github.com/google/grpc-go/rpc" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/interop/server/testdata/ca.pem b/rpc/interop/server/testdata/ca.pem similarity index 100% rename from interop/server/testdata/ca.pem rename to rpc/interop/server/testdata/ca.pem diff --git a/interop/server/testdata/server1.key b/rpc/interop/server/testdata/server1.key similarity index 100% rename from interop/server/testdata/server1.key rename to rpc/interop/server/testdata/server1.key diff --git a/interop/server/testdata/server1.pem b/rpc/interop/server/testdata/server1.pem similarity index 100% rename from interop/server/testdata/server1.pem rename to rpc/interop/server/testdata/server1.pem diff --git a/interop/testdata/messages.proto b/rpc/interop/testdata/messages.proto similarity index 100% rename from interop/testdata/messages.proto rename to rpc/interop/testdata/messages.proto diff --git a/interop/testdata/test.proto b/rpc/interop/testdata/test.proto similarity index 100% rename from interop/testdata/test.proto rename to rpc/interop/testdata/test.proto diff --git a/interop/testdata/test_proto.pb.go b/rpc/interop/testdata/test_proto.pb.go similarity index 100% rename from interop/testdata/test_proto.pb.go rename to rpc/interop/testdata/test_proto.pb.go diff --git a/interop/testdata/test_proto_grpc.pb.go b/rpc/interop/testdata/test_proto_grpc.pb.go similarity index 99% rename from interop/testdata/test_proto_grpc.pb.go rename to rpc/interop/testdata/test_proto_grpc.pb.go index b9e1a033..303e1735 100644 --- a/interop/testdata/test_proto_grpc.pb.go +++ b/rpc/interop/testdata/test_proto_grpc.pb.go @@ -35,7 +35,7 @@ package grpc_testing import ( "fmt" - "github.com/google/grpc-go" + "github.com/google/grpc-go/rpc" proto "github.com/golang/protobuf/proto" context "golang.org/x/net/context" "io" diff --git a/metadata/metadata.go b/rpc/metadata/metadata.go similarity index 100% rename from metadata/metadata.go rename to rpc/metadata/metadata.go diff --git a/metadata/metadata_test.go b/rpc/metadata/metadata_test.go similarity index 100% rename from metadata/metadata_test.go rename to rpc/metadata/metadata_test.go diff --git a/rpc_util.go b/rpc/rpc_util.go similarity index 98% rename from rpc_util.go rename to rpc/rpc_util.go index 8bbe0a89..b38ef701 100644 --- a/rpc_util.go +++ b/rpc/rpc_util.go @@ -42,9 +42,9 @@ import ( "os" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/metadata" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/metadata" + "github.com/google/grpc-go/rpc/transport" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/rpc_util_test.go b/rpc/rpc_util_test.go similarity index 98% rename from rpc_util_test.go rename to rpc/rpc_util_test.go index 2bc304d0..4c08c602 100644 --- a/rpc_util_test.go +++ b/rpc/rpc_util_test.go @@ -41,8 +41,8 @@ import ( "testing" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/transport" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/server.go b/rpc/server.go similarity index 98% rename from server.go rename to rpc/server.go index dd0bae79..2dcd4ff3 100644 --- a/server.go +++ b/rpc/server.go @@ -42,10 +42,10 @@ import ( "strings" "sync" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/credentials" - "github.com/google/grpc-go/metadata" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/credentials" + "github.com/google/grpc-go/rpc/metadata" + "github.com/google/grpc-go/rpc/transport" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/stream.go b/rpc/stream.go similarity index 98% rename from stream.go rename to rpc/stream.go index ec63801a..13a96216 100644 --- a/stream.go +++ b/rpc/stream.go @@ -36,9 +36,9 @@ package rpc import ( "io" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/metadata" - "github.com/google/grpc-go/transport" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/metadata" + "github.com/google/grpc-go/rpc/transport" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/test/end2end_test.go b/rpc/test/end2end_test.go similarity index 98% rename from test/end2end_test.go rename to rpc/test/end2end_test.go index ea3c7e53..dc084202 100644 --- a/test/end2end_test.go +++ b/rpc/test/end2end_test.go @@ -46,11 +46,11 @@ import ( "testing" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/credentials" - "github.com/google/grpc-go/metadata" - "github.com/google/grpc-go" - testpb "github.com/google/grpc-go/test/testdata" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/credentials" + "github.com/google/grpc-go/rpc/metadata" + "github.com/google/grpc-go/rpc" + testpb "github.com/google/grpc-go/rpc/test/testdata" "github.com/golang/protobuf/proto" "golang.org/x/net/context" ) diff --git a/test/testdata/ca.pem b/rpc/test/testdata/ca.pem similarity index 100% rename from test/testdata/ca.pem rename to rpc/test/testdata/ca.pem diff --git a/test/testdata/server1.key b/rpc/test/testdata/server1.key similarity index 100% rename from test/testdata/server1.key rename to rpc/test/testdata/server1.key diff --git a/test/testdata/server1.pem b/rpc/test/testdata/server1.pem similarity index 100% rename from test/testdata/server1.pem rename to rpc/test/testdata/server1.pem diff --git a/test/testdata/test.pb.go b/rpc/test/testdata/test.pb.go similarity index 100% rename from test/testdata/test.pb.go rename to rpc/test/testdata/test.pb.go diff --git a/test/testdata/test.proto b/rpc/test/testdata/test.proto similarity index 100% rename from test/testdata/test.proto rename to rpc/test/testdata/test.proto diff --git a/test/testdata/test_grpc.pb.go b/rpc/test/testdata/test_grpc.pb.go similarity index 99% rename from test/testdata/test_grpc.pb.go rename to rpc/test/testdata/test_grpc.pb.go index 960ea866..6dc16a59 100644 --- a/test/testdata/test_grpc.pb.go +++ b/rpc/test/testdata/test_grpc.pb.go @@ -36,7 +36,7 @@ package test import ( "fmt" "io" - "github.com/google/grpc-go" + "github.com/google/grpc-go/rpc" context "golang.org/x/net/context" proto "github.com/golang/protobuf/proto" ) diff --git a/transport/control.go b/rpc/transport/control.go similarity index 100% rename from transport/control.go rename to rpc/transport/control.go diff --git a/transport/http2_client_transport.go b/rpc/transport/http2_client_transport.go similarity index 99% rename from transport/http2_client_transport.go rename to rpc/transport/http2_client_transport.go index 328e77db..af7347b4 100644 --- a/transport/http2_client_transport.go +++ b/rpc/transport/http2_client_transport.go @@ -42,9 +42,9 @@ import ( "sync" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/credentials" - "github.com/google/grpc-go/metadata" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/credentials" + "github.com/google/grpc-go/rpc/metadata" "golang.org/x/net/context" "github.com/bradfitz/http2/hpack" "github.com/bradfitz/http2" diff --git a/transport/http2_server_transport.go b/rpc/transport/http2_server_transport.go similarity index 99% rename from transport/http2_server_transport.go rename to rpc/transport/http2_server_transport.go index e63633e6..d486e0b8 100644 --- a/transport/http2_server_transport.go +++ b/rpc/transport/http2_server_transport.go @@ -43,8 +43,8 @@ import ( "strconv" "sync" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/metadata" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/metadata" "golang.org/x/net/context" "github.com/bradfitz/http2/hpack" "github.com/bradfitz/http2" diff --git a/transport/http_util.go b/rpc/transport/http_util.go similarity index 99% rename from transport/http_util.go rename to rpc/transport/http_util.go index 0c7b0e04..5d1a871a 100644 --- a/transport/http_util.go +++ b/rpc/transport/http_util.go @@ -39,8 +39,8 @@ import ( "strconv" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/metadata" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/metadata" "github.com/bradfitz/http2/hpack" "github.com/bradfitz/http2" ) diff --git a/transport/http_util_test.go b/rpc/transport/http_util_test.go similarity index 100% rename from transport/http_util_test.go rename to rpc/transport/http_util_test.go diff --git a/transport/testdata/ca.pem b/rpc/transport/testdata/ca.pem similarity index 100% rename from transport/testdata/ca.pem rename to rpc/transport/testdata/ca.pem diff --git a/transport/testdata/server1.key b/rpc/transport/testdata/server1.key similarity index 100% rename from transport/testdata/server1.key rename to rpc/transport/testdata/server1.key diff --git a/transport/testdata/server1.pem b/rpc/transport/testdata/server1.pem similarity index 100% rename from transport/testdata/server1.pem rename to rpc/transport/testdata/server1.pem diff --git a/transport/transport.go b/rpc/transport/transport.go similarity index 99% rename from transport/transport.go rename to rpc/transport/transport.go index c9cb5e47..5c3ceee1 100644 --- a/transport/transport.go +++ b/rpc/transport/transport.go @@ -44,9 +44,9 @@ import ( "net" "sync" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/credentials" - "github.com/google/grpc-go/metadata" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/credentials" + "github.com/google/grpc-go/rpc/metadata" "golang.org/x/net/context" ) diff --git a/transport/transport_test.go b/rpc/transport/transport_test.go similarity index 99% rename from transport/transport_test.go rename to rpc/transport/transport_test.go index 2d6638e1..682585c4 100644 --- a/transport/transport_test.go +++ b/rpc/transport/transport_test.go @@ -45,8 +45,8 @@ import ( "testing" "time" - "github.com/google/grpc-go/codes" - "github.com/google/grpc-go/credentials" + "github.com/google/grpc-go/rpc/codes" + "github.com/google/grpc-go/rpc/credentials" "golang.org/x/net/context" )