Update code and regenerate .pb.go files for new location of goprotobuf.

Change-Id: I1d64ba6bf13fd7fc2fa9c4c7addc7163ef8a26ee
golang · Nov 25, 2014 · c98f627 · c98f627
1 parent 7e1f430
commit c98f627
Show file tree

Hide file tree

Showing 48 changed files with 63 additions and 57 deletions.
diff --git a/appengine.go b/appengine.go
@@ -11,7 +11,7 @@ package appengine // import "google.golang.org/appengine"
 import (
 	"net/http"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )

diff --git a/datastore/datastore.go b/datastore/datastore.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/datastore/key.go b/datastore/key.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/datastore/key_test.go b/datastore/key_test.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/datastore/query.go b/datastore/query.go
@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"strings"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/datastore/query_test.go b/datastore/query_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal/aetesting"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/datastore/save.go b/datastore/save.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/datastore/transaction.go b/datastore/transaction.go
@@ -7,7 +7,7 @@ package datastore
 import (
 	"errors"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/internal/aetesting/fake.go b/internal/aetesting/fake.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/internal/api.go b/internal/api.go
@@ -20,7 +20,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	logpb "google.golang.org/appengine/internal/log"

diff --git a/internal/api_test.go b/internal/api_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	remotepb "google.golang.org/appengine/internal/remote_api"

diff --git a/internal/app_identity/app_identity_service.pb.go b/internal/app_identity/app_identity_service.pb.go
diff --git a/internal/base/api_base.pb.go b/internal/base/api_base.pb.go
diff --git a/internal/channel/channel_service.pb.go b/internal/channel/channel_service.pb.go
diff --git a/internal/datastore/datastore_v3.pb.go b/internal/datastore/datastore_v3.pb.go
diff --git a/internal/image/images_service.pb.go b/internal/image/images_service.pb.go
diff --git a/internal/internal.go b/internal/internal.go
@@ -16,7 +16,7 @@ import (
 	"net/url"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	remotepb "google.golang.org/appengine/internal/remote_api"
 )

diff --git a/internal/log/log_service.pb.go b/internal/log/log_service.pb.go
diff --git a/internal/mail/mail_service.pb.go b/internal/mail/mail_service.pb.go
diff --git a/internal/memcache/memcache_service.pb.go b/internal/memcache/memcache_service.pb.go
diff --git a/internal/modules/modules_service.pb.go b/internal/modules/modules_service.pb.go
diff --git a/internal/regen.sh b/internal/regen.sh
@@ -2,7 +2,7 @@
 #
 # This script rebuilds the generated code for the protocol buffers.
 # To run this you will need protoc and goprotobuf installed;
-# see https://code.google.com/p/goprotobuf/ for instructions.
+# see https://github.com/golang/protobuf for instructions.
 
 PKG=google.golang.org/appengine
 

diff --git a/internal/remote_api/remote_api.pb.go b/internal/remote_api/remote_api.pb.go
diff --git a/internal/search/search.pb.go b/internal/search/search.pb.go
diff --git a/internal/taskqueue/taskqueue_service.pb.go b/internal/taskqueue/taskqueue_service.pb.go
diff --git a/internal/transaction.go b/internal/transaction.go
@@ -5,7 +5,7 @@ package internal
 import (
 	"reflect"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	pb "google.golang.org/appengine/internal/datastore"
 )

diff --git a/internal/urlfetch/urlfetch_service.pb.go b/internal/urlfetch/urlfetch_service.pb.go
diff --git a/internal/user/user_service.pb.go b/internal/user/user_service.pb.go
diff --git a/internal/xmpp/xmpp_service.pb.go b/internal/xmpp/xmpp_service.pb.go
diff --git a/log/log.go b/log/log.go
@@ -34,7 +34,7 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/log/log_test.go b/log/log_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	pb "google.golang.org/appengine/internal/log"
 )

diff --git a/mail/mail.go b/mail/mail.go
@@ -22,7 +22,7 @@ package mail // import "google.golang.org/appengine/mail"
 import (
 	"net/mail"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/mail/mail_test.go b/mail/mail_test.go
@@ -7,7 +7,7 @@ package mail
 import (
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal/aetesting"
 	basepb "google.golang.org/appengine/internal/base"

diff --git a/memcache/memcache.go b/memcache/memcache.go
@@ -35,7 +35,7 @@ import (
 	"errors"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"