diff --git a/README.md b/README.md index 035d0752..747a8a7f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Go Micro -Go Micro is a microservices client/server library utilising HTTP/RPC and protobuf. It is part of the [Micro](https://github.com/asim/micro) toolchain. +Go Micro is a microservices client/server library utilising HTTP/RPC and protobuf. It is part of the [Micro](https://github.com/myodc/micro) toolchain. An example server can be found in go-micro/template. -[![GoDoc](http://img.shields.io/badge/go-documentation-brightgreen.svg?style=flat-square)](https://godoc.org/github.com/asim/go-micro) +[![GoDoc](http://img.shields.io/badge/go-documentation-brightgreen.svg?style=flat-square)](https://godoc.org/github.com/myodc/go-micro) ## Prerequisites @@ -54,7 +54,7 @@ message Response { } ``` -Compile proto `protoc -I$GOPATH/src --go_out=$GOPATH/src $GOPATH/src/github.com/asim/go-micro/template/proto/example/example.proto` +Compile proto `protoc -I$GOPATH/src --go_out=$GOPATH/src $GOPATH/src/github.com/myodc/go-micro/template/proto/example/example.proto` ### Create request handler `go-micro/template/handler/example.go`: @@ -64,10 +64,10 @@ package handler import ( "code.google.com/p/go.net/context" - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/server" - example "github.com/asim/go-micro/template/proto/example" + "github.com/myodc/go-micro/server" + example "github.com/myodc/go-micro/template/proto/example" log "github.com/golang/glog" ) @@ -89,8 +89,8 @@ func (e *Example) Call(ctx context.Context, req *example.Request, rsp *example.R package main import ( - "github.com/asim/go-micro/server" - "github.com/asim/go-micro/template/handler" + "github.com/myodc/go-micro/server" + "github.com/myodc/go-micro/template/handler" log "github.com/golang/glog" ) diff --git a/broker/http_broker.go b/broker/http_broker.go index 65daefcf..ece12d52 100644 --- a/broker/http_broker.go +++ b/broker/http_broker.go @@ -16,9 +16,9 @@ import ( "time" "code.google.com/p/go-uuid/uuid" - "github.com/asim/go-micro/errors" - "github.com/asim/go-micro/registry" log "github.com/golang/glog" + "github.com/myodc/go-micro/errors" + "github.com/myodc/go-micro/registry" ) type HttpBroker struct { diff --git a/client/rpc_client.go b/client/rpc_client.go index 438a6423..89d347a6 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -9,8 +9,8 @@ import ( "net/url" "time" - "github.com/asim/go-micro/errors" - "github.com/asim/go-micro/registry" + "github.com/myodc/go-micro/errors" + "github.com/myodc/go-micro/registry" rpc "github.com/youtube/vitess/go/rpcplus" js "github.com/youtube/vitess/go/rpcplus/jsonrpc" pb "github.com/youtube/vitess/go/rpcplus/pbrpc" diff --git a/cmd/cmd.go b/cmd/cmd.go index 8bcaef11..41928af6 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -5,10 +5,10 @@ import ( "text/tabwriter" "text/template" - "github.com/asim/go-micro/registry" - "github.com/asim/go-micro/server" - "github.com/asim/go-micro/store" "github.com/codegangsta/cli" + "github.com/myodc/go-micro/registry" + "github.com/myodc/go-micro/server" + "github.com/myodc/go-micro/store" ) var ( diff --git a/examples/pub_sub.go b/examples/pub_sub.go index 8cc6a51e..5013679e 100644 --- a/examples/pub_sub.go +++ b/examples/pub_sub.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/asim/go-micro/broker" + "github.com/myodc/go-micro/broker" ) var ( diff --git a/examples/service_client.go b/examples/service_client.go index e0e4d080..967a413f 100644 --- a/examples/service_client.go +++ b/examples/service_client.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "code.google.com/p/goprotobuf/proto" - "github.com/asim/go-micro/client" - example "github.com/asim/go-micro/template/proto/example" + "github.com/golang/protobuf/proto" + "github.com/myodc/go-micro/client" + example "github.com/myodc/go-micro/template/proto/example" ) func main() { diff --git a/server/rpc_server.go b/server/rpc_server.go index 4a72238b..6c37e835 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -10,8 +10,8 @@ import ( "strconv" "sync" - "github.com/asim/go-micro/errors" log "github.com/golang/glog" + "github.com/myodc/go-micro/errors" rpc "github.com/youtube/vitess/go/rpcplus" js "github.com/youtube/vitess/go/rpcplus/jsonrpc" pb "github.com/youtube/vitess/go/rpcplus/pbrpc" diff --git a/server/server.go b/server/server.go index 31a108ba..dc1463f0 100644 --- a/server/server.go +++ b/server/server.go @@ -8,8 +8,8 @@ import ( "syscall" "code.google.com/p/go-uuid/uuid" - "github.com/asim/go-micro/registry" log "github.com/golang/glog" + "github.com/myodc/go-micro/registry" ) type Server interface { diff --git a/server/server_context.go b/server/server_context.go index f986266b..cc2a7a7d 100644 --- a/server/server_context.go +++ b/server/server_context.go @@ -4,8 +4,8 @@ import ( "net/http" "sync" - "github.com/asim/go-micro/client" log "github.com/golang/glog" + "github.com/myodc/go-micro/client" ) var ctxs = struct { diff --git a/template/handler/example.go b/template/handler/example.go index 678e94e9..e1884788 100644 --- a/template/handler/example.go +++ b/template/handler/example.go @@ -2,11 +2,11 @@ package handler import ( "code.google.com/p/go.net/context" - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/server" - example "github.com/asim/go-micro/template/proto/example" log "github.com/golang/glog" + "github.com/myodc/go-micro/server" + example "github.com/myodc/go-micro/template/proto/example" ) type Example struct{} diff --git a/template/main.go b/template/main.go index 15929e82..35238a95 100644 --- a/template/main.go +++ b/template/main.go @@ -1,10 +1,10 @@ package main import ( - "github.com/asim/go-micro/cmd" - "github.com/asim/go-micro/server" - "github.com/asim/go-micro/template/handler" log "github.com/golang/glog" + "github.com/myodc/go-micro/cmd" + "github.com/myodc/go-micro/server" + "github.com/myodc/go-micro/template/handler" ) func main() { diff --git a/template/proto/example/example.pb.go b/template/proto/example/example.pb.go index fc406bdf..7cbe6fd6 100644 --- a/template/proto/example/example.pb.go +++ b/template/proto/example/example.pb.go @@ -1,16 +1,24 @@ // Code generated by protoc-gen-go. -// source: asim/go-micro/template/proto/example/example.proto +// source: myodc/go-micro/template/proto/example/example.proto // DO NOT EDIT! +/* +Package go_micro_service_template_example is a generated protocol buffer package. + +It is generated from these files: + myodc/go-micro/template/proto/example/example.proto + +It has these top-level messages: + Request + Response +*/ package go_micro_service_template_example -import proto "code.google.com/p/goprotobuf/proto" -import json "encoding/json" +import proto "github.com/golang/protobuf/proto" import math "math" -// Reference proto, json, and math imports to suppress error if they are not otherwise used. +// Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = &json.SyntaxError{} var _ = math.Inf type Request struct {