oauth2: add vanity URL import comments, use the vanity URL on builds

Change-Id: Ia20e40d98aa709e3d598388e0a15501584152ab5

.travis.yml

@@ -1,8 +1,10 @@
 language: go
-go: 1.3
+go:
+  - 1.3
+  - tip
 
 install:
-  - go get -v -tags='appengine appenginevm' ./...
+  - go get -v -tags='appengine appenginevm' golang.org/x/oauth2/...
 
 script:
-  - go test -v -tags='appengine appenginevm' ./...
+  - go test -v -tags='appengine appenginevm' golang.org/x/oauth2/...

README.md

@@ -7,13 +7,13 @@ oauth2 package contains a client implementation for OAuth 2.0 spec.
 ## Installation
 
 ~~~~
-go get github.com/golang/oauth2
+go get golang.org/x/oauth2
 ~~~~
 
 See godoc for further documentation and examples.
 
-* [godoc.org/github.com/golang/oauth2](http://godoc.org/github.com/golang/oauth2)
+* [godoc.org/golang.org/x/oauth2](http://godoc.org/golang.org/x/oauth2)
-* [godoc.org/github.com/golang/oauth2/google](http://godoc.org/github.com/golang/oauth2/google)
+* [godoc.org/golang.org/x/oauth2/google](http://godoc.org/golang.org/x/oauth2/google)
 
 ## Contributing
 

example_test.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 )
 
 // TODO(jbd): Remove after Go 1.4.

google/appengine.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 
 	"appengine"
 	"appengine/memcache"

google/appengine_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 
 	"appengine"
 	"appengine/memcache"

google/appenginevm.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/memcache"
 )

google/appenginevm_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/memcache"
 )

google/example_test.go

@@ -12,8 +12,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
-	"github.com/golang/oauth2/google"
+	"golang.org/x/oauth2/google"
 	"google.golang.org/appengine"
 )
 

google/google.go

@@ -11,7 +11,7 @@
 //
 // For more information, please read
 // https://developers.google.com/accounts/docs/OAuth2.
-package google
+package google // import "golang.org/x/oauth2/google"
 
 import (
 	"encoding/json"
@@ -22,8 +22,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/golang/oauth2"
+	"golang.org/x/oauth2"
-	"github.com/golang/oauth2/internal"
+	"golang.org/x/oauth2/internal"
 )
 
 var (

jws/jws.go

@@ -4,7 +4,7 @@
 
 // Package jws provides encoding and decoding utilities for
 // signed JWS messages.
-package jws
+package jws // import "golang.org/x/oauth2/jws"
 
 import (
 	"bytes"

jwt.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/oauth2/internal"
+	"golang.org/x/oauth2/internal"
-	"github.com/golang/oauth2/jws"
+	"golang.org/x/oauth2/jws"
 )
 
 var (

oauth2.go

@@ -5,7 +5,7 @@
 // Package oauth2 provides support for making
 // OAuth2 authorized and authenticated HTTP requests.
 // It can additionally grant authorization with Bearer JWT.
-package oauth2
+package oauth2 // import "golang.org/x/oauth2"
 
 import (
 	"crypto/rsa"