Change imports so that it uses the right packages.

fische · Feb 18, 2017 · f360448 · f360448
1 parent 7f2e950
commit f360448
Show file tree

Hide file tree

Showing 52 changed files with 99 additions and 100 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 go:
 - 1.7.3
 - tip
-go_import_path: github.com/grpc-ecosystem/grpc-gateway
+go_import_path: github.com/fische/grpc-gateway
 cache:
   directories:
   - $HOME/local
@@ -15,16 +15,16 @@ before_install:
 - go get github.com/golang/lint/golint
 - go get github.com/dghubble/sling
 install:
-- go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-- go get github.com/grpc-ecosystem/grpc-gateway/runtime
-- go get github.com/grpc-ecosystem/grpc-gateway/examples
-- go get github.com/grpc-ecosystem/grpc-gateway/examples/server
+- go get github.com/fische/grpc-gateway/protoc-gen-grpc-gateway
+- go get github.com/fische/grpc-gateway/runtime
+- go get github.com/fische/grpc-gateway/examples
+- go get github.com/fische/grpc-gateway/examples/server
 before_script:
 - sh -c 'cd examples/browser && npm install'
 script:
 - make realclean && make examples SWAGGER_CODEGEN="java -jar $HOME/local/swagger-codegen-cli.jar"
 - if (go version | grep -qv devel) && [ -z "${GATEWAY_PLUGIN_FLAGS}" ]; then test -z "$(git status --porcelain)" || (git status; git diff; exit 1); fi
-- env GLOG_logtostderr=1 go test -race -v github.com/grpc-ecosystem/grpc-gateway/...
+- env GLOG_logtostderr=1 go test -race -v github.com/fische/grpc-gateway/...
 - make lint
 - sh -c 'cd examples/browser && gulp'
 env:

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # You don't have to rebuild these targets by yourself unless you develop
 # grpc-gateway itself.
 
-PKG=github.com/grpc-ecosystem/grpc-gateway
+PKG=github.com/fische/grpc-gateway
 GO_PLUGIN=bin/protoc-gen-go
 GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go
 SWAGGER_PLUGIN=bin/protoc-gen-swagger
@@ -85,7 +85,7 @@ generate: $(OPTIONS_GO) $(RUNTIME_GO)
 
 .SUFFIXES: .go .proto
 
-$(GO_PLUGIN): 
+$(GO_PLUGIN):
 	go get $(GO_PLUGIN_PKG)
 	go build -o $@ $(GO_PLUGIN_PKG)
 

diff --git a/examples/browser/bower.json b/examples/browser/bower.json
@@ -6,7 +6,7 @@
     "Yuki Yugui Sonoda <[email protected]>"
   ],
   "license": "SEE LICENSE IN LICENSE file",
-  "homepage": "https://github.com/grpc-ecosystem/grpc-gateway",
+  "homepage": "https://github.com/fische/grpc-gateway",
   "private": true,
   "dependencies": {
     "swagger-js": "~> 2.1"

diff --git a/examples/browser/gulpfile.js b/examples/browser/gulpfile.js
@@ -16,11 +16,11 @@ gulp.task('bower', function(){
 });
 
 gulp.task('server', shell.task([
-  'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/examples/server/cmd/example-server',
+  'go build -o bin/example-server github.com/fische/grpc-gateway/examples/server/cmd/example-server',
 ]));
 
 gulp.task('gateway', shell.task([
-  'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/examples',
+  'go build -o bin/example-gw github.com/fische/grpc-gateway/examples',
 ]));
 
 gulp.task('serve-server', ['server'], function(){

diff --git a/examples/client_test.go b/examples/client_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/grpc-ecosystem/grpc-gateway/examples/clients/abe"
-	"github.com/grpc-ecosystem/grpc-gateway/examples/clients/echo"
+	"github.com/fische/grpc-gateway/examples/clients/abe"
+	"github.com/fische/grpc-gateway/examples/clients/echo"
 )
 
 func TestClientIntegration(t *testing.T) {

diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go
diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go
diff --git a/examples/examplepb/echo_service.pb.gw.go b/examples/examplepb/echo_service.pb.gw.go
diff --git a/examples/examplepb/flow_combination.pb.go b/examples/examplepb/flow_combination.pb.go
diff --git a/examples/examplepb/flow_combination.pb.gw.go b/examples/examplepb/flow_combination.pb.gw.go
diff --git a/examples/examplepb/stream.pb.go b/examples/examplepb/stream.pb.go
diff --git a/examples/examplepb/stream.pb.gw.go b/examples/examplepb/stream.pb.gw.go
diff --git a/examples/integration_test.go b/examples/integration_test.go
@@ -17,9 +17,9 @@ import (
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/empty"
-	gw "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
-	sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	gw "github.com/fische/grpc-gateway/examples/examplepb"
+	sub "github.com/fische/grpc-gateway/examples/sub"
+	"github.com/fische/grpc-gateway/runtime"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 )

diff --git a/examples/main.go b/examples/main.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
-	"github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/fische/grpc-gateway/examples/examplepb"
+	"github.com/fische/grpc-gateway/runtime"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

diff --git a/examples/main_test.go b/examples/main_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	server "github.com/grpc-ecosystem/grpc-gateway/examples/server"
+	server "github.com/fische/grpc-gateway/examples/server"
 )
 
 func runServers() <-chan error {

diff --git a/examples/server/a_bit_of_everything.go b/examples/server/a_bit_of_everything.go
@@ -5,12 +5,12 @@ import (
 	"io"
 	"sync"
 
+	examples "github.com/fische/grpc-gateway/examples/examplepb"
+	sub "github.com/fische/grpc-gateway/examples/sub"
+	sub2 "github.com/fische/grpc-gateway/examples/sub2"
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/ptypes/duration"
 	"github.com/golang/protobuf/ptypes/empty"
-	examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
-	sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub"
-	sub2 "github.com/grpc-ecosystem/grpc-gateway/examples/sub2"
 	"github.com/rogpeppe/fastuuid"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"

diff --git a/examples/server/cmd/example-server/main.go b/examples/server/cmd/example-server/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 
 	"github.com/golang/glog"
-	"github.com/grpc-ecosystem/grpc-gateway/examples/server"
+	"github.com/fische/grpc-gateway/examples/server"
 )
 
 func main() {

diff --git a/examples/server/echo.go b/examples/server/echo.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"github.com/golang/glog"
-	examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
+	examples "github.com/fische/grpc-gateway/examples/examplepb"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"

diff --git a/examples/server/flow_combination.go b/examples/server/flow_combination.go
@@ -3,7 +3,7 @@ package server
 import (
 	"io"
 
-	examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
+	examples "github.com/fische/grpc-gateway/examples/examplepb"
 	"golang.org/x/net/context"
 )
 

diff --git a/examples/server/main.go b/examples/server/main.go
@@ -3,7 +3,7 @@ package server
 import (
 	"net"
 
-	examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb"
+	examples "github.com/fische/grpc-gateway/examples/examplepb"
 	"google.golang.org/grpc"
 )
 

diff --git a/examples/sub2/message.pb.go b/examples/sub2/message.pb.go
diff --git a/examples/sub2/message.proto b/examples/sub2/message.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "github.com/grpc-ecosystem/grpc-gateway/examples/sub2";
+option go_package = "github.com/fische/grpc-gateway/examples/sub2";
 package sub2;
 
 message IdMessage {

diff --git a/protoc-gen-grpc-gateway/descriptor/services.go b/protoc-gen-grpc-gateway/descriptor/services.go
@@ -7,8 +7,8 @@ import (
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
-	options "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/httprule"
+	options "github.com/fische/grpc-gateway/third_party/googleapis/google/api"
 )
 
 // loadServices registers services and their methods from "targetFile" to "r".

diff --git a/protoc-gen-grpc-gateway/descriptor/services_test.go b/protoc-gen-grpc-gateway/descriptor/services_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 func compilePath(t *testing.T, path string) httprule.Template {

diff --git a/protoc-gen-grpc-gateway/descriptor/types.go b/protoc-gen-grpc-gateway/descriptor/types.go
@@ -6,7 +6,7 @@ import (
 
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	gogen "github.com/golang/protobuf/protoc-gen-go/generator"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 // GoPackage represents a golang package

diff --git a/protoc-gen-grpc-gateway/descriptor/types_test.go b/protoc-gen-grpc-gateway/descriptor/types_test.go
@@ -29,7 +29,7 @@ func TestGoPackageStandard(t *testing.T) {
 			want: false,
 		},
 		{
-			pkg:  GoPackage{Path: "github.com/grpc-ecosystem/grpc-gateway", Name: "main"},
+			pkg:  GoPackage{Path: "github.com/fische/grpc-gateway", Name: "main"},
 			want: false,
 		},
 		{
@@ -65,8 +65,8 @@ func TestGoPackageString(t *testing.T) {
 			want: `"golang.org/x/net/context"`,
 		},
 		{
-			pkg:  GoPackage{Path: "github.com/grpc-ecosystem/grpc-gateway", Name: "main"},
-			want: `"github.com/grpc-ecosystem/grpc-gateway"`,
+			pkg:  GoPackage{Path: "github.com/fische/grpc-gateway", Name: "main"},
+			want: `"github.com/fische/grpc-gateway"`,
 		},
 		{
 			pkg:  GoPackage{Path: "github.com/google/googleapis/google/api/http.pb", Name: "http_pb", Alias: "htpb"},

diff --git a/protoc-gen-grpc-gateway/generator/generator.go b/protoc-gen-grpc-gateway/generator/generator.go
@@ -3,7 +3,7 @@ package generator
 
 import (
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
 )
 
 // Generator is an abstraction of code generators.

diff --git a/protoc-gen-grpc-gateway/gengateway/generator.go b/protoc-gen-grpc-gateway/gengateway/generator.go
@@ -11,9 +11,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
-	gen "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator"
-	options "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	gen "github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/generator"
+	options "github.com/fische/grpc-gateway/third_party/googleapis/google/api"
 )
 
 var (
@@ -32,8 +32,8 @@ func New(reg *descriptor.Registry, useRequestContext bool) gen.Generator {
 	for _, pkgpath := range []string{
 		"io",
 		"net/http",
-		"github.com/grpc-ecosystem/grpc-gateway/runtime",
-		"github.com/grpc-ecosystem/grpc-gateway/utilities",
+		"github.com/fische/grpc-gateway/runtime",
+		"github.com/fische/grpc-gateway/utilities",
 		"github.com/golang/protobuf/proto",
 		"golang.org/x/net/context",
 		"google.golang.org/grpc",

diff --git a/protoc-gen-grpc-gateway/gengateway/template.go b/protoc-gen-grpc-gateway/gengateway/template.go
@@ -7,8 +7,8 @@ import (
 	"text/template"
 
 	"github.com/golang/glog"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/utilities"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	"github.com/fische/grpc-gateway/utilities"
 )
 
 type param struct {

diff --git a/protoc-gen-grpc-gateway/gengateway/template_test.go b/protoc-gen-grpc-gateway/gengateway/template_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	protodescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
-	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
+	"github.com/fische/grpc-gateway/protoc-gen-grpc-gateway/httprule"
 )
 
 func crossLinkFixture(f *descriptor.File) *descriptor.File {