From 8740786e5b967202f1d8d09ebc83f3c83353e212 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 27 Aug 2015 15:55:36 -0700 Subject: [PATCH] change all references of grpc-common to examples --- README.md | 2 +- examples/README.md | 6 +++--- examples/gotutorial.md | 6 +++--- examples/greeter_client/main.go | 2 +- examples/greeter_server/main.go | 2 +- examples/route_guide/README.md | 2 +- grpc-auth-support.md | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index caa40261f..9f4c34006 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ $ go get google.golang.org/grpc Documentation ------------- -You can find more detailed documentation and examples in the [grpc-common repository](http://github.com/grpc/grpc-common). +You can find more detailed documentation and examples in the [examples directory](examples/). Status ------ diff --git a/examples/README.md b/examples/README.md index 79db479ec..8e01bdfff 100644 --- a/examples/README.md +++ b/examples/README.md @@ -3,7 +3,7 @@ gRPC in 3 minutes (Go) BACKGROUND ------------- -For this sample, we've already generated the server and client stubs from [helloworld.proto](https://github.com/grpc/grpc-common/blob/master/protos/helloworld.proto). +For this sample, we've already generated the server and client stubs from [helloworld.proto](https://github.com/grpc/grpc/blob/master/protos/helloworld.proto). PREREQUISITES ------------- @@ -20,8 +20,8 @@ INSTALL ------- ```sh -$ go get -u github.com/grpc/grpc-common/go/greeter_client -$ go get -u github.com/grpc/grpc-common/go/greeter_server +$ go get -u github.com/grpc/grpc-go/examples/greeter_client +$ go get -u github.com/grpc/grpc-go/examples/greeter_server ``` TRY IT! diff --git a/examples/gotutorial.md b/examples/gotutorial.md index 63f0ad905..df1717253 100644 --- a/examples/gotutorial.md +++ b/examples/gotutorial.md @@ -6,7 +6,7 @@ This tutorial provides a basic Go programmer's introduction to working with gRPC - Generate server and client code using the protocol buffer compiler. - Use the Go gRPC API to write a simple client and server for your service. -It assumes that you have read the [Getting started](https://github.com/grpc/grpc-common) guide and are familiar with [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). Note that the example in this tutorial uses the proto3 version of the protocol buffers language, which is currently in alpha release:you can find out more in the [proto3 language guide](https://developers.google.com/protocol-buffers/docs/proto3) and see the [release notes](https://github.com/google/protobuf/releases) for the new version in the protocol buffers Github repository. +It assumes that you have read the [Getting started](https://github.com/grpc/grpc/tree/master/examples) guide and are familiar with [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). Note that the example in this tutorial uses the proto3 version of the protocol buffers language, which is currently in alpha release:you can find out more in the [proto3 language guide](https://developers.google.com/protocol-buffers/docs/proto3) and see the [release notes](https://github.com/google/protobuf/releases) for the new version in the protocol buffers Github repository. This isn't a comprehensive guide to using gRPC in Go: more reference documentation is coming soon. @@ -28,12 +28,12 @@ Then change your current directory to `grpc-go/examples/route_guide`: $ cd $GOPATH/src/google.golang.org/grpc/examples/route_guide ``` -You also should have the relevant tools installed to generate the server and client interface code - if you don't already, follow the setup instructions in [the Go quick start guide](https://github.com/grpc/grpc-common/tree/master/go). +You also should have the relevant tools installed to generate the server and client interface code - if you don't already, follow the setup instructions in [the Go quick start guide](examples/). ## Defining the service -Our first step (as you'll know from [Getting started](https://github.com/grpc/grpc-common)) is to define the gRPC *service* and the method *request* and *response* types using [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). You can see the complete .proto file in [`grpc-common/protos/route_guide.proto`](https://github.com/grpc/grpc-common/blob/master/protos/route_guide.proto). +Our first step (as you'll know from [Getting started](https://github.com/grpc/grpc/tree/master/examples)) is to define the gRPC *service* and the method *request* and *response* types using [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). You can see the complete .proto file in [`examples/protos/route_guide.proto`](https://github.com/grpc/grpc/blob/master/protos/route_guide.proto). To define a service, you specify a named `service` in your .proto file: diff --git a/examples/greeter_client/main.go b/examples/greeter_client/main.go index 065ae852b..fe882ae6d 100644 --- a/examples/greeter_client/main.go +++ b/examples/greeter_client/main.go @@ -37,7 +37,7 @@ import ( "log" "os" - pb "github.com/grpc/grpc-common/go/helloworld" + pb "github.com/grpc/grpc-go/examples/helloworld" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/examples/greeter_server/main.go b/examples/greeter_server/main.go index c7fa06ad1..793860e58 100644 --- a/examples/greeter_server/main.go +++ b/examples/greeter_server/main.go @@ -37,7 +37,7 @@ import ( "log" "net" - pb "github.com/grpc/grpc-common/go/helloworld" + pb "github.com/grpc/grpc-go/examples/helloworld" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/examples/route_guide/README.md b/examples/route_guide/README.md index 02a43f197..7571621da 100644 --- a/examples/route_guide/README.md +++ b/examples/route_guide/README.md @@ -2,7 +2,7 @@ The route guide server and client demonstrate how to use grpc go libraries to perform unary, client streaming, server streaming and full duplex RPCs. -Please refer to [Getting Started Guide for Go] (https://github.com/grpc/grpc-common/blob/master/go/gotutorial.md) for more information. +Please refer to [Getting Started Guide for Go] (examples/gotutorial.md) for more information. See the definition of the route guide service in proto/route_guide.proto. diff --git a/grpc-auth-support.md b/grpc-auth-support.md index d9fb34fc8..f80cbbdb2 100644 --- a/grpc-auth-support.md +++ b/grpc-auth-support.md @@ -1,6 +1,6 @@ # Authentication -As outlined here gRPC supports a number of different mechanisms for asserting identity between an client and server. We'll present some code-samples here demonstrating how to provide TLS support encryption and identity assertions as well as passing OAuth2 tokens to services that support it. +As outlined here gRPC supports a number of different mechanisms for asserting identity between an client and server. We'll present some code-samples here demonstrating how to provide TLS support encryption and identity assertions as well as passing OAuth2 tokens to services that support it. # Enabling TLS on a gRPC client