updating the veyron import paths
Change-Id: I5ecfec3cb57cb3825d1b53c0cbb3a672190d0923
diff --git a/services/identity/auditor/file.go b/services/identity/auditor/file.go
index f5639e4..5850370 100644
--- a/services/identity/auditor/file.go
+++ b/services/identity/auditor/file.go
@@ -8,10 +8,10 @@
"sync"
"time"
- "veyron/security/audit"
- "veyron2/security/wire"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
type fileAuditor struct {
diff --git a/services/identity/auditor/file_test.go b/services/identity/auditor/file_test.go
index 3b70537..8a98f86 100644
--- a/services/identity/auditor/file_test.go
+++ b/services/identity/auditor/file_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestFileAuditor(t *testing.T) {
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index fb35bb0..bc7e346 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -7,15 +7,15 @@
"strings"
"time"
- "veyron/services/identity"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/revocation"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vlog"
)
type googleOAuth struct {
diff --git a/services/identity/googleoauth/handler.go b/services/identity/googleoauth/handler.go
index 596f96a..0c878ad 100644
--- a/services/identity/googleoauth/handler.go
+++ b/services/identity/googleoauth/handler.go
@@ -22,11 +22,11 @@
"code.google.com/p/goauth2/oauth"
- "veyron/services/identity/auditor"
- "veyron/services/identity/revocation"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
type HandlerArgs struct {
diff --git a/services/identity/handlers/bless.go b/services/identity/handlers/bless.go
index 10fbd77..70d43b7 100644
--- a/services/identity/handlers/bless.go
+++ b/services/identity/handlers/bless.go
@@ -5,8 +5,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
)
// Bless is an http.HandlerFunc that renders/processes a form that takes as
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/handlers/handlers_test.go
index 4793c73..3f8d6ad 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -10,10 +10,10 @@
"testing"
"time"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestObject(t *testing.T) {
diff --git a/services/identity/handlers/object.go b/services/identity/handlers/object.go
index 32289a7..9fd1aa0 100644
--- a/services/identity/handlers/object.go
+++ b/services/identity/handlers/object.go
@@ -3,7 +3,7 @@
import (
"net/http"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
)
// Object implements an http.Handler that writes out the provided object in the
diff --git a/services/identity/handlers/random.go b/services/identity/handlers/random.go
index ec84788..5a19bfd 100644
--- a/services/identity/handlers/random.go
+++ b/services/identity/handlers/random.go
@@ -6,8 +6,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2"
)
// Random is an http.Handler implementation that mints a new Veyron PrivateID
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index 1733c27..5dd2891 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -21,7 +21,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
type OAuthBlesser interface {
// BlessUsingAuthorizationCode exchanges the provided authorization code
// for an access token and then uses that access token to obtain an
@@ -34,4 +34,4 @@
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing.
BlessUsingAccessToken(token string) (blessing any, err error)
-}
\ No newline at end of file
+}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 0b4694a..93ed657 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -6,12 +6,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -37,7 +37,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
// OAuthBlesser is the interface the client binds and uses.
// OAuthBlesser_ExcludingUniversal is the interface without internal framework-added methods
// to enable embedding without method collisions. Not to be used directly by clients.
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 84b752b..ea61737 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -12,23 +12,23 @@
"strings"
"time"
- "veyron/lib/signals"
- vsecurity "veyron/security"
- "veyron/security/audit"
- "veyron/services/identity/auditor"
- "veyron/services/identity/blesser"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/handlers"
- "veyron/services/identity/revocation"
- services "veyron/services/security"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/lib/signals"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/blesser"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/handlers"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/identity/revocation/bless.go b/services/identity/revocation/bless.go
index d2720e6..57dcb71 100644
--- a/services/identity/revocation/bless.go
+++ b/services/identity/revocation/bless.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- vsecurity "veyron/security"
- "veyron/security/audit"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
// Bless creates a blessing on behalf of the identity server.
diff --git a/services/identity/revocation/bless_test.go b/services/identity/revocation/bless_test.go
index 63dc2bc..6e20ad4 100644
--- a/services/identity/revocation/bless_test.go
+++ b/services/identity/revocation/bless_test.go
@@ -7,11 +7,11 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
type auditor struct {
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index c9cdada..c05bd5e 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -10,10 +10,10 @@
"sync"
"time"
- "veyron/security/caveat"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/caveat"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
diff --git a/services/identity/revocation/revoker_test.go b/services/identity/revocation/revoker_test.go
index 036bd37..6e440e4 100644
--- a/services/identity/revocation/revoker_test.go
+++ b/services/identity/revocation/revoker_test.go
@@ -4,13 +4,13 @@
"os"
"path/filepath"
"testing"
- services "veyron/services/security"
- "veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func revokerSetup(t *testing.T) (dischargerID security.PublicID, dischargerEndpoint string, revoker *RevocationManager, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/identity/util/b64vom.go b/services/identity/util/b64vom.go
index 6ed8b4a..1485cca 100644
--- a/services/identity/util/b64vom.go
+++ b/services/identity/util/b64vom.go
@@ -4,7 +4,7 @@
"bytes"
"encoding/base64"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/vom"
)
// Bas64VomEncode returns the base64 encoding of the serialization of i with
diff --git a/services/identity/util/csrf.go b/services/identity/util/csrf.go
index 516cf84..f71253d 100644
--- a/services/identity/util/csrf.go
+++ b/services/identity/util/csrf.go
@@ -10,7 +10,7 @@
"net/http"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
const cookieLen = 16
diff --git a/services/identity/util/write.go b/services/identity/util/write.go
index 07480d3..0572454 100644
--- a/services/identity/util/write.go
+++ b/services/identity/util/write.go
@@ -4,7 +4,7 @@
"html/template"
"net/http"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// HTTPSend encodes obj using VOM and writes it out to the response in base64
