From 46b11253600cac78a886056615372318abfb62da Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Fri, 27 Feb 2015 20:24:49 +0100 Subject: [PATCH 1/3] fix typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96f206b0423..3998780a91d 100644 --- a/README.md +++ b/README.md @@ -286,7 +286,7 @@ message, as specified in our interface definition. #### Server implementation -[HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java) +[HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java) shows the other main feature required to provide a gRPC service; making the service implementation available from the network. @@ -324,7 +324,7 @@ how all this works in a bit more detail in our language-specific documentation. Client-side gRPC is pretty simple. In this step, we'll use the generated code to write a simple client that can access the `Greeter` server we created in the [previous section](#server). You can see the complete client code in -[HelloWorldClient.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldClient.java). +[HelloWorldClient.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java). Again, we're not going to go into much detail about how to implement a client; we'll leave that for the tutorial. From 0118cf0e65ef30de9a302a73e3c9a0c7000141a6 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 6 Mar 2015 22:42:02 +0100 Subject: [PATCH 2/3] Allow to specify environment variables for search paths. --- cpp/helloworld/Makefile | 6 +++--- cpp/route_guide/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/helloworld/Makefile b/cpp/helloworld/Makefile index 83f2ad49044..5a7c34faff3 100644 --- a/cpp/helloworld/Makefile +++ b/cpp/helloworld/Makefile @@ -30,9 +30,9 @@ # CXX = g++ -CPPFLAGS = -I/usr/local/include -pthread -CXXFLAGS = -std=c++11 -LDFLAGS = -L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl +CPPFLAGS += -I/usr/local/include -pthread +CXXFLAGS += -std=c++11 +LDFLAGS += -L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl PROTOC = protoc GRPC_CPP_PLUGIN = grpc_cpp_plugin GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)` diff --git a/cpp/route_guide/Makefile b/cpp/route_guide/Makefile index 131956296cb..ea02944deef 100644 --- a/cpp/route_guide/Makefile +++ b/cpp/route_guide/Makefile @@ -30,9 +30,9 @@ # CXX = g++ -CPPFLAGS = -I/usr/local/include -pthread -CXXFLAGS = -std=c++11 -LDFLAGS = -L/usr/local/lib -lgpr -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl +CPPFLAGS += -I/usr/local/include -pthread +CXXFLAGS += -std=c++11 +LDFLAGS += -L/usr/local/lib -lgpr -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl PROTOC = protoc GRPC_CPP_PLUGIN = grpc_cpp_plugin GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)` From 3cc9bc8760736368cd8c19ea58a93e2db000d446 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 10 Mar 2015 00:24:24 +0100 Subject: [PATCH 3/3] Fixed some links that were missing the package --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3998780a91d..633e8149acb 100644 --- a/README.md +++ b/README.md @@ -249,15 +249,15 @@ tutorial for your chosen language: check if there's one available yet in the rel Our server application has two classes: - a main server class that hosts the service implementation and allows access over the -network: [HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java). +network: [HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java). -- a simple service implementation class [GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java#L51). +- a simple service implementation class [GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java#L51). #### Service implementation -[GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java#L51) +[GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java#L51) actually implements our GreetingService's required behaviour. As you can see, the class `GreeterImpl` implements the interface