Merge pull request #9 from iamqizhao/master

directory reconstruction

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

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"
 )

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"
 )
 

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"
 )
 

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"
 )

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"

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"

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"

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"
 )

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"
 )
 

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"
 )