Reorganization of VANADIUM_ROOT relative paths.
diff --git a/services/GO.PACKAGE b/services/GO.PACKAGE
index 6679f33..bf4f724 100644
--- a/services/GO.PACKAGE
+++ b/services/GO.PACKAGE
@@ -1,11 +1,11 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/veyron/veyron/services/..."},
- {"allow": "v.io/veyron/veyron/lib/...", "comment":"temporarily allowing dependency from lib"},
- {"allow": "v.io/veyron/veyron/profiles/...", "comment":"temporarily allowing dependency from profiles"},
- {"allow": "v.io/veyron/veyron/tools/...", "comment":"temporarily allowing dependency from veyron/tools"},
- {"allow": "v.io/veyron/veyron/runtimes/google/...", "comment":"temporarily allowing dependency from veyron/runtimes/google"},
+ {"allow": "v.io/core/veyron/services/..."},
+ {"allow": "v.io/core/veyron/lib/...", "comment":"temporarily allowing dependency from lib"},
+ {"allow": "v.io/core/veyron/profiles/...", "comment":"temporarily allowing dependency from profiles"},
+ {"allow": "v.io/core/veyron/tools/...", "comment":"temporarily allowing dependency from veyron/tools"},
+ {"allow": "v.io/core/veyron/runtimes/google/...", "comment":"temporarily allowing dependency from veyron/runtimes/google"},
{"allow": "v.io/jni/veyron/runtimes/google/...", "comment":"temporarily allowing dependency from veyron/runtimes/google"},
{"deny": "..."}
]
diff --git a/services/config/lib/config.go b/services/config/lib/config.go
index 74df900..366f5ff 100644
--- a/services/config/lib/config.go
+++ b/services/config/lib/config.go
@@ -17,8 +17,8 @@
"strings"
"sync"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
"github.com/presotto/go-mdns-sd"
"github.com/presotto/go-mdns-sd/go_dns"
@@ -42,7 +42,7 @@
gen int // incremented every config change
}
-const pkgPath = "v.io/veyron/veyron/services/config/lib"
+const pkgPath = "v.io/core/veyron/services/config/lib"
// Errors
var (
diff --git a/services/identity/auditor/blessing_auditor.go b/services/identity/auditor/blessing_auditor.go
index ced6b1b..144cf1b 100644
--- a/services/identity/auditor/blessing_auditor.go
+++ b/services/identity/auditor/blessing_auditor.go
@@ -7,10 +7,10 @@
"strings"
"time"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/security/audit"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vom"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/security/audit"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vom"
)
// BlessingLogReader provides the Read method to read audit logs.
diff --git a/services/identity/auditor/blessing_auditor_test.go b/services/identity/auditor/blessing_auditor_test.go
index 197b745..c592699 100644
--- a/services/identity/auditor/blessing_auditor_test.go
+++ b/services/identity/auditor/blessing_auditor_test.go
@@ -5,9 +5,9 @@
"testing"
"time"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/security/audit"
- "v.io/veyron/veyron2/security"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/security/audit"
+ "v.io/core/veyron2/security"
)
func TestBlessingAuditor(t *testing.T) {
diff --git a/services/identity/auditor/mock_auditor.go b/services/identity/auditor/mock_auditor.go
index dbd924a..7a4b598 100644
--- a/services/identity/auditor/mock_auditor.go
+++ b/services/identity/auditor/mock_auditor.go
@@ -2,7 +2,7 @@
import (
"reflect"
- "v.io/veyron/veyron/security/audit"
+ "v.io/core/veyron/security/audit"
)
func NewMockBlessingAuditor() (audit.Auditor, BlessingLogReader) {
diff --git a/services/identity/auditor/sql_database.go b/services/identity/auditor/sql_database.go
index 8fa3d20..ac7eadd 100644
--- a/services/identity/auditor/sql_database.go
+++ b/services/identity/auditor/sql_database.go
@@ -5,7 +5,7 @@
"fmt"
"time"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
type database interface {
diff --git a/services/identity/blesser/macaroon.go b/services/identity/blesser/macaroon.go
index da04798..2ae48fb 100644
--- a/services/identity/blesser/macaroon.go
+++ b/services/identity/blesser/macaroon.go
@@ -5,12 +5,12 @@
"fmt"
"time"
- "v.io/veyron/veyron/services/identity"
- "v.io/veyron/veyron/services/identity/util"
+ "v.io/core/veyron/services/identity"
+ "v.io/core/veyron/services/identity/util"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vom"
)
type macaroonBlesser struct {
diff --git a/services/identity/blesser/macaroon_test.go b/services/identity/blesser/macaroon_test.go
index 4e25335..b555a47 100644
--- a/services/identity/blesser/macaroon_test.go
+++ b/services/identity/blesser/macaroon_test.go
@@ -7,12 +7,12 @@
"testing"
"time"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/services/identity/util"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/services/identity/util"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vom"
)
func TestMacaroonBlesser(t *testing.T) {
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index da0a347..0fa09ae 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -6,12 +6,12 @@
"net/http"
"time"
- "v.io/veyron/veyron/services/identity"
- "v.io/veyron/veyron/services/identity/revocation"
+ "v.io/core/veyron/services/identity"
+ "v.io/core/veyron/services/identity/revocation"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
)
type googleOAuth struct {
diff --git a/services/identity/caveats/caveat_factory.go b/services/identity/caveats/caveat_factory.go
index 383eaa1..79f1c4d 100644
--- a/services/identity/caveats/caveat_factory.go
+++ b/services/identity/caveats/caveat_factory.go
@@ -4,9 +4,9 @@
"fmt"
"time"
- "v.io/veyron/veyron/services/identity/revocation"
+ "v.io/core/veyron/services/identity/revocation"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
)
type CaveatFactory interface {
diff --git a/services/identity/handlers/blessing_root.go b/services/identity/handlers/blessing_root.go
index bfa39b3..1a01d6b 100644
--- a/services/identity/handlers/blessing_root.go
+++ b/services/identity/handlers/blessing_root.go
@@ -6,8 +6,8 @@
"fmt"
"net/http"
- "v.io/veyron/veyron/services/identity/util"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron/services/identity/util"
+ "v.io/core/veyron2/security"
)
// BlessingRoot is an http.Handler implementation that renders the server's
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/handlers/handlers_test.go
index e2e382d..2fac754 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -9,9 +9,9 @@
"sort"
"testing"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
)
func TestBlessingRoot(t *testing.T) {
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index c2f598f..5c7d16b 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -1,7 +1,7 @@
// Package identity defines services for identity providers in the veyron ecosystem.
package identity
-import "v.io/veyron/veyron2/security"
+import "v.io/core/veyron2/security"
// OAuthBlesser exchanges OAuth access tokens for
// an email address from an OAuth-based identity provider and uses the email
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 13b2b57..4aa4423 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -5,14 +5,14 @@
package identity
import (
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
// The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -170,7 +170,7 @@
// descOAuthBlesser hides the desc to keep godoc clean.
var descOAuthBlesser = __ipc.InterfaceDesc{
Name: "OAuthBlesser",
- PkgPath: "v.io/veyron/veyron/services/identity",
+ PkgPath: "v.io/core/veyron/services/identity",
Doc: "// OAuthBlesser exchanges OAuth access tokens for\n// an email address from an OAuth-based identity provider and uses the email\n// address obtained to bless the client.\n//\n// OAuth is described in RFC 6749 (http://tools.ietf.org/html/rfc6749),\n// though the Google implementation also has informative documentation at\n// https://developers.google.com/accounts/docs/OAuth2\n//\n// WARNING: There is no binding between the channel over which the access token\n// was obtained (typically https) and the channel used to make the RPC (a\n// veyron virtual circuit).\n// Thus, if Mallory possesses the access token associated with Alice's account,\n// she may be able to obtain a blessing with Alice's name on it.",
Methods: []__ipc.MethodDesc{
{
@@ -207,15 +207,15 @@
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x42, Name: "ValidatorVOM"},
},
- "v.io/veyron/veyron2/security.Caveat", []string(nil)},
- __wiretype.SliceType{Elem: 0x43, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/security.Hash", Tags: []string(nil)}, __wiretype.StructType{
+ "v.io/core/veyron2/security.Caveat", []string(nil)},
+ __wiretype.SliceType{Elem: 0x43, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/security.Hash", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x42, Name: "Purpose"},
__wiretype.FieldType{Type: 0x45, Name: "Hash"},
__wiretype.FieldType{Type: 0x42, Name: "R"},
__wiretype.FieldType{Type: 0x42, Name: "S"},
},
- "v.io/veyron/veyron2/security.Signature", []string(nil)},
+ "v.io/core/veyron2/security.Signature", []string(nil)},
__wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x3, Name: "Extension"},
@@ -223,12 +223,12 @@
__wiretype.FieldType{Type: 0x44, Name: "Caveats"},
__wiretype.FieldType{Type: 0x46, Name: "Signature"},
},
- "v.io/veyron/veyron2/security.Certificate", []string(nil)},
+ "v.io/core/veyron2/security.Certificate", []string(nil)},
__wiretype.SliceType{Elem: 0x47, Name: "", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x48, Name: "", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x49, Name: "CertificateChains"},
},
- "v.io/veyron/veyron2/security.WireBlessings", []string(nil)},
+ "v.io/core/veyron2/security.WireBlessings", []string(nil)},
__wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
@@ -360,7 +360,7 @@
// descMacaroonBlesser hides the desc to keep godoc clean.
var descMacaroonBlesser = __ipc.InterfaceDesc{
Name: "MacaroonBlesser",
- PkgPath: "v.io/veyron/veyron/services/identity",
+ PkgPath: "v.io/core/veyron/services/identity",
Doc: "// MacaroonBlesser returns a blessing given the provided macaroon string.",
Methods: []__ipc.MethodDesc{
{
@@ -395,15 +395,15 @@
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x42, Name: "ValidatorVOM"},
},
- "v.io/veyron/veyron2/security.Caveat", []string(nil)},
- __wiretype.SliceType{Elem: 0x43, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/security.Hash", Tags: []string(nil)}, __wiretype.StructType{
+ "v.io/core/veyron2/security.Caveat", []string(nil)},
+ __wiretype.SliceType{Elem: 0x43, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/security.Hash", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x42, Name: "Purpose"},
__wiretype.FieldType{Type: 0x45, Name: "Hash"},
__wiretype.FieldType{Type: 0x42, Name: "R"},
__wiretype.FieldType{Type: 0x42, Name: "S"},
},
- "v.io/veyron/veyron2/security.Signature", []string(nil)},
+ "v.io/core/veyron2/security.Signature", []string(nil)},
__wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x3, Name: "Extension"},
@@ -411,12 +411,12 @@
__wiretype.FieldType{Type: 0x44, Name: "Caveats"},
__wiretype.FieldType{Type: 0x46, Name: "Signature"},
},
- "v.io/veyron/veyron2/security.Certificate", []string(nil)},
+ "v.io/core/veyron2/security.Certificate", []string(nil)},
__wiretype.SliceType{Elem: 0x47, Name: "", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x48, Name: "", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x49, Name: "CertificateChains"},
},
- "v.io/veyron/veyron2/security.WireBlessings", []string(nil)},
+ "v.io/core/veyron2/security.WireBlessings", []string(nil)},
__wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 71ac99a..0ed4b50 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -12,14 +12,14 @@
_ "github.com/go-sql-driver/mysql"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/services/identity/auditor"
- "v.io/veyron/veyron/services/identity/blesser"
- "v.io/veyron/veyron/services/identity/caveats"
- "v.io/veyron/veyron/services/identity/oauth"
- "v.io/veyron/veyron/services/identity/revocation"
- "v.io/veyron/veyron/services/identity/server"
+ "v.io/core/veyron/services/identity/auditor"
+ "v.io/core/veyron/services/identity/blesser"
+ "v.io/core/veyron/services/identity/caveats"
+ "v.io/core/veyron/services/identity/oauth"
+ "v.io/core/veyron/services/identity/revocation"
+ "v.io/core/veyron/services/identity/server"
)
var (
diff --git a/services/identity/identityd_test/main.go b/services/identity/identityd_test/main.go
index 4f52538..81f7dc4 100644
--- a/services/identity/identityd_test/main.go
+++ b/services/identity/identityd_test/main.go
@@ -7,12 +7,12 @@
"os"
"time"
- "v.io/veyron/veyron/services/identity/auditor"
- "v.io/veyron/veyron/services/identity/blesser"
- "v.io/veyron/veyron/services/identity/caveats"
- "v.io/veyron/veyron/services/identity/oauth"
- "v.io/veyron/veyron/services/identity/revocation"
- "v.io/veyron/veyron/services/identity/server"
+ "v.io/core/veyron/services/identity/auditor"
+ "v.io/core/veyron/services/identity/blesser"
+ "v.io/core/veyron/services/identity/caveats"
+ "v.io/core/veyron/services/identity/oauth"
+ "v.io/core/veyron/services/identity/revocation"
+ "v.io/core/veyron/services/identity/server"
)
var (
diff --git a/services/identity/oauth/handler.go b/services/identity/oauth/handler.go
index 81ba4cf..cd4ba93 100644
--- a/services/identity/oauth/handler.go
+++ b/services/identity/oauth/handler.go
@@ -31,15 +31,15 @@
"strings"
"time"
- "v.io/veyron/veyron/services/identity/auditor"
- "v.io/veyron/veyron/services/identity/blesser"
- "v.io/veyron/veyron/services/identity/caveats"
- "v.io/veyron/veyron/services/identity/revocation"
- "v.io/veyron/veyron/services/identity/util"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron/services/identity/auditor"
+ "v.io/core/veyron/services/identity/blesser"
+ "v.io/core/veyron/services/identity/caveats"
+ "v.io/core/veyron/services/identity/revocation"
+ "v.io/core/veyron/services/identity/util"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom"
)
const (
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index d999fa0..a68ef2a 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -8,8 +8,8 @@
"sync"
"time"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlutil"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
diff --git a/services/identity/revocation/revocation_test.go b/services/identity/revocation/revocation_test.go
index 6096b09..76ba630 100644
--- a/services/identity/revocation/revocation_test.go
+++ b/services/identity/revocation/revocation_test.go
@@ -4,15 +4,15 @@
"bytes"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vom"
- "v.io/veyron/veyron/profiles"
- services "v.io/veyron/veyron/services/security"
- "v.io/veyron/veyron/services/security/discharger"
+ "v.io/core/veyron/profiles"
+ services "v.io/core/veyron/services/security"
+ "v.io/core/veyron/services/security/discharger"
)
func revokerSetup(t *testing.T, r veyron2.Runtime) (dischargerKey security.PublicKey, dischargerEndpoint string, revoker RevocationManager, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/identity/server/identityd.go b/services/identity/server/identityd.go
index c251b79..49e9bdc 100644
--- a/services/identity/server/identityd.go
+++ b/services/identity/server/identityd.go
@@ -12,27 +12,27 @@
"reflect"
"strings"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/security/audit"
- "v.io/veyron/veyron/services/identity/auditor"
- "v.io/veyron/veyron/services/identity/blesser"
- "v.io/veyron/veyron/services/identity/caveats"
- "v.io/veyron/veyron/services/identity/handlers"
- "v.io/veyron/veyron/services/identity/oauth"
- "v.io/veyron/veyron/services/identity/revocation"
- services "v.io/veyron/veyron/services/security"
- "v.io/veyron/veyron/services/security/discharger"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/security/audit"
+ "v.io/core/veyron/services/identity/auditor"
+ "v.io/core/veyron/services/identity/blesser"
+ "v.io/core/veyron/services/identity/caveats"
+ "v.io/core/veyron/services/identity/handlers"
+ "v.io/core/veyron/services/identity/oauth"
+ "v.io/core/veyron/services/identity/revocation"
+ services "v.io/core/veyron/services/security"
+ "v.io/core/veyron/services/security/discharger"
- "v.io/veyron/veyron/profiles/static"
+ "v.io/core/veyron/profiles/static"
)
var (
diff --git a/services/identity/test.sh b/services/identity/test.sh
index 63a8032..6774ddc 100755
--- a/services/identity/test.sh
+++ b/services/identity/test.sh
@@ -7,8 +7,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- IDENTITYD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/identity/identityd_test')"
- PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/principal')"
+ IDENTITYD_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/identity/identityd_test')"
+ PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
}
# These certificatese were created with "generate_cert.go --host=localhost --duration=87600h --ecdsa-curve=P256"
diff --git a/services/identity/util/csrf.go b/services/identity/util/csrf.go
index da94908..f4049ba 100644
--- a/services/identity/util/csrf.go
+++ b/services/identity/util/csrf.go
@@ -10,8 +10,8 @@
"net/http"
"time"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom"
)
const (
diff --git a/services/identity/util/write.go b/services/identity/util/write.go
index 6e74b72..8d7544c 100644
--- a/services/identity/util/write.go
+++ b/services/identity/util/write.go
@@ -5,7 +5,7 @@
"html/template"
"net/http"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
// HTTPBadRequest sends an HTTP 400 error on 'w' and renders a pretty page.
diff --git a/services/mgmt/application/applicationd/main.go b/services/mgmt/application/applicationd/main.go
index 381aafb..1a56cdc 100644
--- a/services/mgmt/application/applicationd/main.go
+++ b/services/mgmt/application/applicationd/main.go
@@ -3,14 +3,14 @@
import (
"flag"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/services/mgmt/application/impl"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/services/mgmt/application/impl"
)
var (
diff --git a/services/mgmt/application/applicationd/test.sh b/services/mgmt/application/applicationd/test.sh
index 1410e49..ba29dbd 100755
--- a/services/mgmt/application/applicationd/test.sh
+++ b/services/mgmt/application/applicationd/test.sh
@@ -14,8 +14,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- APPLICATIOND_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/application/applicationd')"
- APPLICATION_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/application')"
+ APPLICATIOND_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/application/applicationd')"
+ APPLICATION_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/application')"
}
main() {
diff --git a/services/mgmt/application/applicationd/testdata/integration_test.go b/services/mgmt/application/applicationd/testdata/integration_test.go
index 899a9ae..104bd8b 100644
--- a/services/mgmt/application/applicationd/testdata/integration_test.go
+++ b/services/mgmt/application/applicationd/testdata/integration_test.go
@@ -9,16 +9,16 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil/integration"
- "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil/integration"
+ "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron2/naming"
)
var binPkgs = []string{
- "v.io/veyron/veyron/services/mgmt/application/applicationd",
- "v.io/veyron/veyron/tools/application",
+ "v.io/core/veyron/services/mgmt/application/applicationd",
+ "v.io/core/veyron/tools/application",
}
func helper(t *testing.T, expectError bool, binDir, credentials, mt, cmd string, args ...string) string {
diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index 18bb29b..eaaf8d2 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -3,11 +3,11 @@
import (
"path/filepath"
- "v.io/veyron/veyron/services/mgmt/repository"
+ "v.io/core/veyron/services/mgmt/repository"
- "v.io/veyron/veyron/services/mgmt/lib/fs"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron/services/mgmt/lib/fs"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
)
// dispatcher holds the state of the application repository dispatcher.
diff --git a/services/mgmt/application/impl/impl_test.go b/services/mgmt/application/impl/impl_test.go
index 1a059bb..90f2c32 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -6,15 +6,15 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/verror2"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/repository"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/repository"
)
// TestInterface tests that the implementation correctly implements
diff --git a/services/mgmt/application/impl/service.go b/services/mgmt/application/impl/service.go
index 580856c..816a505 100644
--- a/services/mgmt/application/impl/service.go
+++ b/services/mgmt/application/impl/service.go
@@ -3,12 +3,12 @@
import (
"strings"
- "v.io/veyron/veyron/services/mgmt/lib/fs"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/services/mgmt/lib/fs"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
// appRepoService implements the Application repository interface.
@@ -24,7 +24,7 @@
suffix string
}
-const pkgPath = "v.io/veyron/veyron/services/mgmt/application/impl/"
+const pkgPath = "v.io/core/veyron/services/mgmt/application/impl/"
var (
errInvalidSuffix = verror2.Register(pkgPath+".invalidSuffix", verror2.NoRetry, "")
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index 017183c..74ff1dc 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -6,15 +6,15 @@
"net/http"
"os"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/netstate"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/services/mgmt/binary/impl"
+ "v.io/core/veyron/lib/netstate"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/services/mgmt/binary/impl"
)
const defaultDepth = 3
diff --git a/services/mgmt/binary/binaryd/test.sh b/services/mgmt/binary/binaryd/test.sh
index 959da54..cb447e4 100755
--- a/services/mgmt/binary/binaryd/test.sh
+++ b/services/mgmt/binary/binaryd/test.sh
@@ -14,8 +14,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- BINARYD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/binary/binaryd')"
- BINARY_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/binary')"
+ BINARYD_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/binary/binaryd')"
+ BINARY_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/binary')"
}
main() {
diff --git a/services/mgmt/binary/binaryd/testdata/integration_test.go b/services/mgmt/binary/binaryd/testdata/integration_test.go
index 3ddd960..a70b1b0 100644
--- a/services/mgmt/binary/binaryd/testdata/integration_test.go
+++ b/services/mgmt/binary/binaryd/testdata/integration_test.go
@@ -10,12 +10,12 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/lib/testutil/integration"
- "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil/integration"
+ "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron2/naming"
)
func init() {
@@ -23,8 +23,8 @@
}
var binPkgs = []string{
- "v.io/veyron/veyron/services/mgmt/binary/binaryd",
- "v.io/veyron/veyron/tools/binary",
+ "v.io/core/veyron/services/mgmt/binary/binaryd",
+ "v.io/core/veyron/tools/binary",
}
func checkFileType(t *testing.T, file, typeString string) {
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index b3d8d26..2105776 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -1,9 +1,9 @@
package impl
import (
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/repository"
)
const (
diff --git a/services/mgmt/binary/impl/fs_utils.go b/services/mgmt/binary/impl/fs_utils.go
index f28848b..1147d21 100644
--- a/services/mgmt/binary/impl/fs_utils.go
+++ b/services/mgmt/binary/impl/fs_utils.go
@@ -8,8 +8,8 @@
"strconv"
"strings"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/http.go b/services/mgmt/binary/impl/http.go
index 3fd59b9..23363c1 100644
--- a/services/mgmt/binary/impl/http.go
+++ b/services/mgmt/binary/impl/http.go
@@ -6,10 +6,10 @@
"path/filepath"
"strings"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/services/mgmt/binary/impl/multipart"
+ "v.io/core/veyron/services/mgmt/binary/impl/multipart"
)
// NewHTTPRoot returns an implementation of http.FileSystem that can be used
diff --git a/services/mgmt/binary/impl/http_test.go b/services/mgmt/binary/impl/http_test.go
index 5743aac..b9973b1 100644
--- a/services/mgmt/binary/impl/http_test.go
+++ b/services/mgmt/binary/impl/http_test.go
@@ -8,9 +8,9 @@
"net/http"
"testing"
- "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
// TestHTTP checks that HTTP download works.
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 8e0cf86..8b4c1bb 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -13,15 +13,15 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/repository"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/repository"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
const (
diff --git a/services/mgmt/binary/impl/multipart/multipart_test.go b/services/mgmt/binary/impl/multipart/multipart_test.go
index e6669d4..304d74c 100644
--- a/services/mgmt/binary/impl/multipart/multipart_test.go
+++ b/services/mgmt/binary/impl/multipart/multipart_test.go
@@ -10,7 +10,7 @@
"strings"
"testing"
- "v.io/veyron/veyron/services/mgmt/binary/impl/multipart"
+ "v.io/core/veyron/services/mgmt/binary/impl/multipart"
)
func read(t *testing.T, m http.File, thisMuch int) string {
diff --git a/services/mgmt/binary/impl/service.go b/services/mgmt/binary/impl/service.go
index 0dddcfb..5ec3fc5 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -31,11 +31,11 @@
"strings"
"syscall"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/services/mgmt/binary"
- "v.io/veyron/veyron2/services/mgmt/repository"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/services/mgmt/binary"
+ "v.io/core/veyron2/services/mgmt/repository"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
// binaryService implements the Binary server interface.
@@ -50,7 +50,7 @@
suffix string
}
-const pkgPath = "v.io/veyron/veyron/services/mgmt/binary/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/binary/impl"
var (
errInProgress = verror.Register(pkgPath+".errInProgress", verror.NoRetry, "{1:}{2:} identical upload already in progress{:_}")
diff --git a/services/mgmt/binary/impl/setup.go b/services/mgmt/binary/impl/setup.go
index efe8b65..dbc1b92 100644
--- a/services/mgmt/binary/impl/setup.go
+++ b/services/mgmt/binary/impl/setup.go
@@ -5,7 +5,7 @@
"os"
"path/filepath"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
const defaultRootPrefix = "veyron_binary_repository"
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index 42e7805..09823c4 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -4,14 +4,14 @@
"flag"
"os"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/build"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/build"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/services/mgmt/build/impl"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/services/mgmt/build/impl"
)
var (
diff --git a/services/mgmt/build/buildd/test.sh b/services/mgmt/build/buildd/test.sh
index 7f9246d..171f315 100755
--- a/services/mgmt/build/buildd/test.sh
+++ b/services/mgmt/build/buildd/test.sh
@@ -13,8 +13,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- BUILDD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/build/buildd')"
- BUILD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/build')"
+ BUILDD_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/build/buildd')"
+ BUILD_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/build')"
}
main() {
diff --git a/services/mgmt/build/buildd/testdata/integration_test.go b/services/mgmt/build/buildd/testdata/integration_test.go
index 0e5c200..2cc87c7 100644
--- a/services/mgmt/build/buildd/testdata/integration_test.go
+++ b/services/mgmt/build/buildd/testdata/integration_test.go
@@ -10,15 +10,15 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil/integration"
- "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil/integration"
+ "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles"
)
var binPkgs = []string{
- "v.io/veyron/veyron/services/mgmt/build/buildd",
- "v.io/veyron/veyron/tools/build",
+ "v.io/core/veyron/services/mgmt/build/buildd",
+ "v.io/core/veyron/tools/build",
}
var testProgram = `package main
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index 209a094..f7deaca 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -8,12 +8,12 @@
"strings"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/build"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/build"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
var globalRT veyron2.Runtime
diff --git a/services/mgmt/build/impl/service.go b/services/mgmt/build/impl/service.go
index 16a5853..e5569b4 100644
--- a/services/mgmt/build/impl/service.go
+++ b/services/mgmt/build/impl/service.go
@@ -9,14 +9,14 @@
"path/filepath"
"runtime"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/services/mgmt/binary"
- "v.io/veyron/veyron2/services/mgmt/build"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/services/mgmt/binary"
+ "v.io/core/veyron2/services/mgmt/build"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
-const pkgPath = "v.io/veyron/veyron/services/mgmt/build/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/build/impl"
// Errors
var (
diff --git a/services/mgmt/build/impl/util.go b/services/mgmt/build/impl/util.go
index 254c3a5..d783b3f 100644
--- a/services/mgmt/build/impl/util.go
+++ b/services/mgmt/build/impl/util.go
@@ -3,7 +3,7 @@
import (
"runtime"
- "v.io/veyron/veyron2/services/mgmt/build"
+ "v.io/core/veyron2/services/mgmt/build"
)
func getArch() build.Architecture {
diff --git a/services/mgmt/debug/dispatcher.go b/services/mgmt/debug/dispatcher.go
index f0ef6ed..fd85e5c 100644
--- a/services/mgmt/debug/dispatcher.go
+++ b/services/mgmt/debug/dispatcher.go
@@ -4,14 +4,14 @@
"strings"
"time"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vtrace"
- logreaderimpl "v.io/veyron/veyron/services/mgmt/logreader/impl"
- pprofimpl "v.io/veyron/veyron/services/mgmt/pprof/impl"
- statsimpl "v.io/veyron/veyron/services/mgmt/stats/impl"
- vtraceimpl "v.io/veyron/veyron/services/mgmt/vtrace/impl"
+ logreaderimpl "v.io/core/veyron/services/mgmt/logreader/impl"
+ pprofimpl "v.io/core/veyron/services/mgmt/pprof/impl"
+ statsimpl "v.io/core/veyron/services/mgmt/stats/impl"
+ vtraceimpl "v.io/core/veyron/services/mgmt/vtrace/impl"
)
// dispatcher holds the state of the debug dispatcher.
diff --git a/services/mgmt/debug/dispatcher_test.go b/services/mgmt/debug/dispatcher_test.go
index b13218f..d138978 100644
--- a/services/mgmt/debug/dispatcher_test.go
+++ b/services/mgmt/debug/dispatcher_test.go
@@ -12,20 +12,20 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/logreader"
- "v.io/veyron/veyron2/services/mgmt/stats"
- vtracesvc "v.io/veyron/veyron2/services/mgmt/vtrace"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/logreader"
+ "v.io/core/veyron2/services/mgmt/stats"
+ vtracesvc "v.io/core/veyron2/services/mgmt/vtrace"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vtrace"
- libstats "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ libstats "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
// startDebugServer starts a debug server.
diff --git a/services/mgmt/device/config.vdl.go b/services/mgmt/device/config.vdl.go
index 8dad0cc..2fd44cd 100644
--- a/services/mgmt/device/config.vdl.go
+++ b/services/mgmt/device/config.vdl.go
@@ -5,11 +5,11 @@
import (
// The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -141,7 +141,7 @@
// descConfig hides the desc to keep godoc clean.
var descConfig = __ipc.InterfaceDesc{
Name: "Config",
- PkgPath: "v.io/veyron/veyron/services/mgmt/device",
+ PkgPath: "v.io/core/veyron/services/mgmt/device",
Doc: "// Config is an RPC API to the config service.",
Methods: []__ipc.MethodDesc{
{
diff --git a/services/mgmt/device/config/config.go b/services/mgmt/device/config/config.go
index 4d882a9..dc89d92 100644
--- a/services/mgmt/device/config/config.go
+++ b/services/mgmt/device/config/config.go
@@ -24,8 +24,8 @@
"path/filepath"
"strings"
- "v.io/veyron/veyron/lib/flags/consts"
- "v.io/veyron/veyron2/services/mgmt/application"
+ "v.io/core/veyron/lib/flags/consts"
+ "v.io/core/veyron2/services/mgmt/application"
)
// State specifies how the device manager is configured. This should
diff --git a/services/mgmt/device/config/config_test.go b/services/mgmt/device/config/config_test.go
index 669da6e..498c55d 100644
--- a/services/mgmt/device/config/config_test.go
+++ b/services/mgmt/device/config/config_test.go
@@ -7,9 +7,9 @@
"strings"
"testing"
- "v.io/veyron/veyron/services/mgmt/device/config"
+ "v.io/core/veyron/services/mgmt/device/config"
- "v.io/veyron/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/application"
)
// TestState checks that encoding/decoding State to child/from parent works
diff --git a/services/mgmt/device/deviced/main.go b/services/mgmt/device/deviced/main.go
index d870f8b..5a4e473 100644
--- a/services/mgmt/device/deviced/main.go
+++ b/services/mgmt/device/deviced/main.go
@@ -4,14 +4,14 @@
"flag"
"os"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- "v.io/veyron/veyron/services/mgmt/device/config"
- "v.io/veyron/veyron/services/mgmt/device/impl"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ "v.io/core/veyron/services/mgmt/device/config"
+ "v.io/core/veyron/services/mgmt/device/impl"
)
var (
diff --git a/services/mgmt/device/impl/app_service.go b/services/mgmt/device/impl/app_service.go
index fc5ed4a..bde4143 100644
--- a/services/mgmt/device/impl/app_service.go
+++ b/services/mgmt/device/impl/app_service.go
@@ -126,27 +126,27 @@
"sync"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/appcycle"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/appcycle"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- vexec "v.io/veyron/veyron/lib/exec"
- "v.io/veyron/veyron/lib/flags/consts"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/security/agent"
- "v.io/veyron/veyron/security/agent/keymgr"
- iconfig "v.io/veyron/veyron/services/mgmt/device/config"
- libbinary "v.io/veyron/veyron/services/mgmt/lib/binary"
- libpackages "v.io/veyron/veyron/services/mgmt/lib/packages"
+ vexec "v.io/core/veyron/lib/exec"
+ "v.io/core/veyron/lib/flags/consts"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/security/agent"
+ "v.io/core/veyron/security/agent/keymgr"
+ iconfig "v.io/core/veyron/services/mgmt/device/config"
+ libbinary "v.io/core/veyron/services/mgmt/lib/binary"
+ libpackages "v.io/core/veyron/services/mgmt/lib/packages"
)
// instanceInfo holds state about a running instance.
diff --git a/services/mgmt/device/impl/app_state.go b/services/mgmt/device/impl/app_state.go
index f9ebbd7..7f4a9c1 100644
--- a/services/mgmt/device/impl/app_state.go
+++ b/services/mgmt/device/impl/app_state.go
@@ -6,8 +6,8 @@
"os"
"path/filepath"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
// installationState describes the states that an installation can be in at any
diff --git a/services/mgmt/device/impl/association_instance.go b/services/mgmt/device/impl/association_instance.go
index 74ea6fd..1dd6b06 100644
--- a/services/mgmt/device/impl/association_instance.go
+++ b/services/mgmt/device/impl/association_instance.go
@@ -7,8 +7,8 @@
"io/ioutil"
"path/filepath"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
func saveSystemNameForInstance(dir, systemName string) error {
diff --git a/services/mgmt/device/impl/association_state.go b/services/mgmt/device/impl/association_state.go
index 7febfb4..794b29e 100644
--- a/services/mgmt/device/impl/association_state.go
+++ b/services/mgmt/device/impl/association_state.go
@@ -6,8 +6,8 @@
"path/filepath"
"sync"
- "v.io/veyron/veyron2/services/mgmt/device"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/verror2"
)
// BlessingSystemAssociationStore manages a persisted association between
diff --git a/services/mgmt/device/impl/association_state_test.go b/services/mgmt/device/impl/association_state_test.go
index 853f976..23f6013 100644
--- a/services/mgmt/device/impl/association_state_test.go
+++ b/services/mgmt/device/impl/association_state_test.go
@@ -7,8 +7,8 @@
"path"
"testing"
- "v.io/veyron/veyron/services/mgmt/device/impl"
- "v.io/veyron/veyron2/services/mgmt/device"
+ "v.io/core/veyron/services/mgmt/device/impl"
+ "v.io/core/veyron2/services/mgmt/device"
)
// TestAssociationPersistance verifies correct operation of association
diff --git a/services/mgmt/device/impl/callback.go b/services/mgmt/device/impl/callback.go
index 7a2935d..c1ed6a6 100644
--- a/services/mgmt/device/impl/callback.go
+++ b/services/mgmt/device/impl/callback.go
@@ -1,12 +1,12 @@
package impl
import (
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/exec"
- "v.io/veyron/veyron/services/mgmt/device"
+ "v.io/core/veyron/lib/exec"
+ "v.io/core/veyron/services/mgmt/device"
)
// InvokeCallback provides the parent device manager with the given name (which
diff --git a/services/mgmt/device/impl/config_service.go b/services/mgmt/device/impl/config_service.go
index 9dfff32..5058c64 100644
--- a/services/mgmt/device/impl/config_service.go
+++ b/services/mgmt/device/impl/config_service.go
@@ -10,10 +10,10 @@
"sync"
"time"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
type callbackState struct {
diff --git a/services/mgmt/device/impl/device_installer.go b/services/mgmt/device/impl/device_installer.go
index b8390c7..da79289 100644
--- a/services/mgmt/device/impl/device_installer.go
+++ b/services/mgmt/device/impl/device_installer.go
@@ -7,11 +7,11 @@
"regexp"
"strings"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/vlog"
// For VeyronEnvironment, see TODO.
- "v.io/veyron/veyron/services/mgmt/device/config"
+ "v.io/core/veyron/services/mgmt/device/config"
)
// InstallFrom takes a veyron object name denoting an application service where
diff --git a/services/mgmt/device/impl/device_service.go b/services/mgmt/device/impl/device_service.go
index aef8ee2..c3df592 100644
--- a/services/mgmt/device/impl/device_service.go
+++ b/services/mgmt/device/impl/device_service.go
@@ -38,22 +38,22 @@
"sync"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/mgmt/binary"
- "v.io/veyron/veyron2/services/mgmt/device"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/binary"
+ "v.io/core/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- vexec "v.io/veyron/veyron/lib/exec"
- "v.io/veyron/veyron/lib/netstate"
- "v.io/veyron/veyron/services/mgmt/device/config"
- "v.io/veyron/veyron/services/mgmt/profile"
+ vexec "v.io/core/veyron/lib/exec"
+ "v.io/core/veyron/lib/netstate"
+ "v.io/core/veyron/services/mgmt/device/config"
+ "v.io/core/veyron/services/mgmt/profile"
)
type updatingState struct {
diff --git a/services/mgmt/device/impl/dispatcher.go b/services/mgmt/device/impl/dispatcher.go
index 124728a..de153ed 100644
--- a/services/mgmt/device/impl/dispatcher.go
+++ b/services/mgmt/device/impl/dispatcher.go
@@ -12,23 +12,23 @@
"strings"
"sync"
- "v.io/veyron/veyron/security/agent"
- "v.io/veyron/veyron/security/agent/keymgr"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/security/serialization"
- idevice "v.io/veyron/veyron/services/mgmt/device"
- "v.io/veyron/veyron/services/mgmt/device/config"
- logsimpl "v.io/veyron/veyron/services/mgmt/logreader/impl"
+ "v.io/core/veyron/security/agent"
+ "v.io/core/veyron/security/agent/keymgr"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/security/serialization"
+ idevice "v.io/core/veyron/services/mgmt/device"
+ "v.io/core/veyron/services/mgmt/device/config"
+ logsimpl "v.io/core/veyron/services/mgmt/logreader/impl"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/device"
- "v.io/veyron/veyron2/services/mgmt/pprof"
- "v.io/veyron/veyron2/services/mgmt/stats"
- "v.io/veyron/veyron2/services/security/access"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/services/mgmt/pprof"
+ "v.io/core/veyron2/services/mgmt/stats"
+ "v.io/core/veyron2/services/security/access"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
// internalState wraps state shared between different device manager
@@ -72,7 +72,7 @@
deviceSuffix = "device"
configSuffix = "cfg"
- pkgPath = "v.io/veyron/veyron/services/mgmt/device/impl"
+ pkgPath = "v.io/core/veyron/services/mgmt/device/impl"
)
var (
diff --git a/services/mgmt/device/impl/impl_helper_test.go b/services/mgmt/device/impl/impl_helper_test.go
index c4c9e72..b7d972d 100644
--- a/services/mgmt/device/impl/impl_helper_test.go
+++ b/services/mgmt/device/impl/impl_helper_test.go
@@ -9,7 +9,7 @@
"path"
"testing"
- "v.io/veyron/veyron/services/mgmt/device/impl"
+ "v.io/core/veyron/services/mgmt/device/impl"
)
func TestBaseCleanupDir(t *testing.T) {
diff --git a/services/mgmt/device/impl/impl_test.go b/services/mgmt/device/impl/impl_test.go
index db0c7d2..d81c941 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -27,33 +27,33 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/mgmt/device"
- "v.io/veyron/veyron2/services/mgmt/logreader"
- "v.io/veyron/veyron2/services/mgmt/pprof"
- "v.io/veyron/veyron2/services/mgmt/stats"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/vdl/vdlutil"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/services/mgmt/logreader"
+ "v.io/core/veyron2/services/mgmt/pprof"
+ "v.io/core/veyron2/services/mgmt/stats"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/vdl/vdlutil"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- binaryimpl "v.io/veyron/veyron/services/mgmt/binary/impl"
- "v.io/veyron/veyron/services/mgmt/device/config"
- "v.io/veyron/veyron/services/mgmt/device/impl"
- libbinary "v.io/veyron/veyron/services/mgmt/lib/binary"
- suidhelper "v.io/veyron/veyron/services/mgmt/suidhelper/impl"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ binaryimpl "v.io/core/veyron/services/mgmt/binary/impl"
+ "v.io/core/veyron/services/mgmt/device/config"
+ "v.io/core/veyron/services/mgmt/device/impl"
+ libbinary "v.io/core/veyron/services/mgmt/lib/binary"
+ suidhelper "v.io/core/veyron/services/mgmt/suidhelper/impl"
)
const (
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index e59e126..d9303be 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -8,13 +8,13 @@
"os"
"testing"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/mgmt/binary"
- "v.io/veyron/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/binary"
+ "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
const mockBinaryRepoName = "br"
@@ -86,7 +86,7 @@
// BINARY REPOSITORY INTERFACE IMPLEMENTATION
// TODO(toddw): Move the errors from dispatcher.go into a common location.
-const pkgPath = "v.io/veyron/veyron/services/mgmt/device/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/device/impl"
var ErrOperationFailed = verror2.Register(pkgPath+".OperationFailed", verror2.NoRetry, "")
diff --git a/services/mgmt/device/impl/only_for_test.go b/services/mgmt/device/impl/only_for_test.go
index 0420dfd..62a69cb 100644
--- a/services/mgmt/device/impl/only_for_test.go
+++ b/services/mgmt/device/impl/only_for_test.go
@@ -5,7 +5,7 @@
"os"
"path/filepath"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
// This file contains code in the impl package that we only want built for tests
diff --git a/services/mgmt/device/impl/profile.go b/services/mgmt/device/impl/profile.go
index 56f23f1..275fc3d 100644
--- a/services/mgmt/device/impl/profile.go
+++ b/services/mgmt/device/impl/profile.go
@@ -7,10 +7,10 @@
"runtime"
"strings"
- "v.io/veyron/veyron/services/mgmt/profile"
+ "v.io/core/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/services/mgmt/build"
- "v.io/veyron/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/services/mgmt/build"
+ "v.io/core/veyron2/services/mgmt/device"
)
// computeDeviceProfile generates a description of the runtime
diff --git a/services/mgmt/device/impl/proxy_invoker.go b/services/mgmt/device/impl/proxy_invoker.go
index ddc4452..e08be24 100644
--- a/services/mgmt/device/impl/proxy_invoker.go
+++ b/services/mgmt/device/impl/proxy_invoker.go
@@ -4,11 +4,11 @@
"fmt"
"io"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
)
// proxyInvoker is an ipc.Invoker implementation that proxies all requests
diff --git a/services/mgmt/device/impl/proxy_invoker_test.go b/services/mgmt/device/impl/proxy_invoker_test.go
index 5dee259..5e58f1f 100644
--- a/services/mgmt/device/impl/proxy_invoker_test.go
+++ b/services/mgmt/device/impl/proxy_invoker_test.go
@@ -4,16 +4,16 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/stats"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/stats"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
// TODO(toddw): Add tests of Signature and MethodSignature.
diff --git a/services/mgmt/device/impl/util.go b/services/mgmt/device/impl/util.go
index 972b098..8a83af4 100644
--- a/services/mgmt/device/impl/util.go
+++ b/services/mgmt/device/impl/util.go
@@ -7,13 +7,13 @@
"path/filepath"
"time"
- "v.io/veyron/veyron/services/mgmt/lib/binary"
+ "v.io/core/veyron/services/mgmt/lib/binary"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
// TODO(caprita): Set these timeout in a more principled manner.
diff --git a/services/mgmt/device/impl/util_test.go b/services/mgmt/device/impl/util_test.go
index f01ac7c..21a57b9 100644
--- a/services/mgmt/device/impl/util_test.go
+++ b/services/mgmt/device/impl/util_test.go
@@ -12,23 +12,23 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/device"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/device"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/flags/consts"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/modules/core"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles/static"
- "v.io/veyron/veyron/services/mgmt/device/impl"
- "v.io/veyron/veyron2/services/mgmt/application"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/flags/consts"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/modules/core"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles/static"
+ "v.io/core/veyron/services/mgmt/device/impl"
+ "v.io/core/veyron2/services/mgmt/application"
)
const (
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 9141cbe..6171670 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -14,16 +14,16 @@
"path/filepath"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/services/mgmt/binary"
- "v.io/veyron/veyron2/services/mgmt/repository"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/services/mgmt/binary"
+ "v.io/core/veyron2/services/mgmt/repository"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/services/mgmt/lib/packages"
+ "v.io/core/veyron/services/mgmt/lib/packages"
)
-const pkgPath = "v.io/veyron/veyron/services/mgmt/lib/binary"
+const pkgPath = "v.io/core/veyron/services/mgmt/lib/binary"
var (
errOperationFailed = verror.Register(pkgPath+".errOperationFailed", verror.NoRetry, "{1:}{2:} operation failed{:_}")
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index a348bac..932a40d 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -8,15 +8,15 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/binary/impl"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/binary/impl"
)
const (
diff --git a/services/mgmt/lib/fs/only_for_test.go b/services/mgmt/lib/fs/only_for_test.go
index 5548f72..2e1b214 100644
--- a/services/mgmt/lib/fs/only_for_test.go
+++ b/services/mgmt/lib/fs/only_for_test.go
@@ -1,7 +1,7 @@
package fs
import (
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/naming"
)
// TP is a convenience function. It prepends the transactionNamePrefix
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index b85c940..9f8cd04 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -10,15 +10,15 @@
"strings"
"sync"
- "v.io/veyron/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/services/mgmt/application"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron/services/mgmt/profile"
+ "v.io/core/veyron2/services/mgmt/application"
+ verror "v.io/core/veyron2/verror2"
)
// TODO(rjkroege@google.com) Switch Memstore to the mid-August 2014
// style store API.
-const pkgPath = "v.io/veyron/veyron/services/mgmt/lib/fs"
+const pkgPath = "v.io/core/veyron/services/mgmt/lib/fs"
// Errors
var (
diff --git a/services/mgmt/lib/fs/simplestore_test.go b/services/mgmt/lib/fs/simplestore_test.go
index eb12e36..bd68d21 100644
--- a/services/mgmt/lib/fs/simplestore_test.go
+++ b/services/mgmt/lib/fs/simplestore_test.go
@@ -7,11 +7,11 @@
"reflect"
"testing"
- "v.io/veyron/veyron/services/mgmt/lib/fs"
- _ "v.io/veyron/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/mgmt/application"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron/services/mgmt/lib/fs"
+ _ "v.io/core/veyron/services/mgmt/profile"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/mgmt/application"
+ verror "v.io/core/veyron2/verror2"
)
func tempFile(t *testing.T) string {
diff --git a/services/mgmt/lib/packages/packages.go b/services/mgmt/lib/packages/packages.go
index 6a542fd..330b61d 100644
--- a/services/mgmt/lib/packages/packages.go
+++ b/services/mgmt/lib/packages/packages.go
@@ -14,7 +14,7 @@
"path/filepath"
"strings"
- "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/services/mgmt/repository"
)
const defaultType = "application/octet-stream"
diff --git a/services/mgmt/lib/packages/packages_test.go b/services/mgmt/lib/packages/packages_test.go
index 646ba06..16074ad 100644
--- a/services/mgmt/lib/packages/packages_test.go
+++ b/services/mgmt/lib/packages/packages_test.go
@@ -12,9 +12,9 @@
"sort"
"testing"
- "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron/services/mgmt/lib/packages"
+ "v.io/core/veyron/services/mgmt/lib/packages"
)
func TestInstall(t *testing.T) {
diff --git a/services/mgmt/logreader/impl/logfile.go b/services/mgmt/logreader/impl/logfile.go
index 092995c..432e29f 100644
--- a/services/mgmt/logreader/impl/logfile.go
+++ b/services/mgmt/logreader/impl/logfile.go
@@ -11,14 +11,14 @@
"path/filepath"
"strings"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/services/mgmt/logreader"
- "v.io/veyron/veyron2/services/mgmt/logreader/types"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/services/mgmt/logreader"
+ "v.io/core/veyron2/services/mgmt/logreader/types"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
-const pkgPath = "v.io/veyron/veyron/services/mgmt/logreader/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/logreader/impl"
var (
errEOF = verror.Register(types.EOF, verror.NoRetry, "{1:}{2:} EOF{:_}")
diff --git a/services/mgmt/logreader/impl/logfile_test.go b/services/mgmt/logreader/impl/logfile_test.go
index 2d16389..3b13c19 100644
--- a/services/mgmt/logreader/impl/logfile_test.go
+++ b/services/mgmt/logreader/impl/logfile_test.go
@@ -6,17 +6,17 @@
"path"
"testing"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/logreader/impl"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/logreader/impl"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/logreader"
- "v.io/veyron/veyron2/services/mgmt/logreader/types"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/logreader"
+ "v.io/core/veyron2/services/mgmt/logreader/types"
+ verror "v.io/core/veyron2/verror2"
)
func startServer(t *testing.T, runtime veyron2.Runtime, disp ipc.Dispatcher) (ipc.Server, string, error) {
diff --git a/services/mgmt/logreader/impl/reader.go b/services/mgmt/logreader/impl/reader.go
index 33eb4ae..e2cefb9 100644
--- a/services/mgmt/logreader/impl/reader.go
+++ b/services/mgmt/logreader/impl/reader.go
@@ -6,8 +6,8 @@
"strings"
"time"
- "v.io/veyron/veyron2/ipc"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/ipc"
+ verror "v.io/core/veyron2/verror2"
)
// followReader implements the functionality of io.Reader, plus:
diff --git a/services/mgmt/pprof/client/proxy.go b/services/mgmt/pprof/client/proxy.go
index 6b6e3a0..a185d0c 100644
--- a/services/mgmt/pprof/client/proxy.go
+++ b/services/mgmt/pprof/client/proxy.go
@@ -16,8 +16,8 @@
"strings"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/services/mgmt/pprof"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/services/mgmt/pprof"
)
// StartProxy starts the pprof proxy to a remote pprof object.
diff --git a/services/mgmt/pprof/client/proxy_test.go b/services/mgmt/pprof/client/proxy_test.go
index d43f17e..fc4bc32 100644
--- a/services/mgmt/pprof/client/proxy_test.go
+++ b/services/mgmt/pprof/client/proxy_test.go
@@ -6,13 +6,13 @@
"net/http"
"testing"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/pprof/client"
- "v.io/veyron/veyron/services/mgmt/pprof/impl"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/pprof/client"
+ "v.io/core/veyron/services/mgmt/pprof/impl"
)
type dispatcher struct {
diff --git a/services/mgmt/pprof/impl/server.go b/services/mgmt/pprof/impl/server.go
index ac43779..fd3f57d 100644
--- a/services/mgmt/pprof/impl/server.go
+++ b/services/mgmt/pprof/impl/server.go
@@ -7,12 +7,12 @@
"runtime/pprof"
"time"
- "v.io/veyron/veyron2/ipc"
- spprof "v.io/veyron/veyron2/services/mgmt/pprof"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/ipc"
+ spprof "v.io/core/veyron2/services/mgmt/pprof"
+ verror "v.io/core/veyron2/verror2"
)
-const pkgPath = "v.io/veyron/veyron/services/mgmt/pprof/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/pprof/impl"
// Errors
var (
diff --git a/services/mgmt/profile/impl/dispatcher.go b/services/mgmt/profile/impl/dispatcher.go
index c2d5130..40f04e8 100644
--- a/services/mgmt/profile/impl/dispatcher.go
+++ b/services/mgmt/profile/impl/dispatcher.go
@@ -3,11 +3,11 @@
import (
"path/filepath"
- "v.io/veyron/veyron/services/mgmt/repository"
+ "v.io/core/veyron/services/mgmt/repository"
- "v.io/veyron/veyron/services/mgmt/lib/fs"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron/services/mgmt/lib/fs"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
)
// dispatcher holds the state of the profile repository dispatcher.
diff --git a/services/mgmt/profile/impl/impl_test.go b/services/mgmt/profile/impl/impl_test.go
index 86af3df..db5079c 100644
--- a/services/mgmt/profile/impl/impl_test.go
+++ b/services/mgmt/profile/impl/impl_test.go
@@ -6,14 +6,14 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/services/mgmt/build"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/services/mgmt/build"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/profile"
- "v.io/veyron/veyron/services/mgmt/repository"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/profile"
+ "v.io/core/veyron/services/mgmt/repository"
)
var (
diff --git a/services/mgmt/profile/impl/service.go b/services/mgmt/profile/impl/service.go
index 264cf8d..329672b 100644
--- a/services/mgmt/profile/impl/service.go
+++ b/services/mgmt/profile/impl/service.go
@@ -3,12 +3,12 @@
import (
"errors"
- "v.io/veyron/veyron/services/mgmt/lib/fs"
- "v.io/veyron/veyron/services/mgmt/profile"
+ "v.io/core/veyron/services/mgmt/lib/fs"
+ "v.io/core/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/vlog"
)
// profileService implements the Profile server interface.
diff --git a/services/mgmt/profile/profile.vdl b/services/mgmt/profile/profile.vdl
index fdc7dd1..1e12ec8 100644
--- a/services/mgmt/profile/profile.vdl
+++ b/services/mgmt/profile/profile.vdl
@@ -2,7 +2,7 @@
// types used by the implementation of Veyron profiles.
package profile
-import "v.io/veyron/veyron2/services/mgmt/build"
+import "v.io/core/veyron2/services/mgmt/build"
// Library describes a shared library that applications may use.
type Library struct {
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index fa9dd10..8b50064 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -6,10 +6,10 @@
package profile
import (
- "v.io/veyron/veyron2/services/mgmt/build"
+ "v.io/core/veyron2/services/mgmt/build"
// The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/veyron/veyron2/vdl"
+ __vdl "v.io/core/veyron2/vdl"
)
// Library describes a shared library that applications may use.
@@ -23,7 +23,7 @@
}
func (Library) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/services/mgmt/profile.Library"
+ Name string "v.io/core/veyron/services/mgmt/profile.Library"
}) {
}
@@ -46,7 +46,7 @@
}
func (Specification) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/services/mgmt/profile.Specification"
+ Name string "v.io/core/veyron/services/mgmt/profile.Specification"
}) {
}
diff --git a/services/mgmt/profile/profiled/main.go b/services/mgmt/profile/profiled/main.go
index 02b675f..10f5428 100644
--- a/services/mgmt/profile/profiled/main.go
+++ b/services/mgmt/profile/profiled/main.go
@@ -3,13 +3,13 @@
import (
"flag"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/services/mgmt/profile/impl"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/services/mgmt/profile/impl"
)
var (
diff --git a/services/mgmt/profile/profiled/test.sh b/services/mgmt/profile/profiled/test.sh
index 816a4e3..03070f7 100755
--- a/services/mgmt/profile/profiled/test.sh
+++ b/services/mgmt/profile/profiled/test.sh
@@ -15,8 +15,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- PROFILED_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/profile/profiled')"
- PROFILE_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/profile')"
+ PROFILED_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/profile/profiled')"
+ PROFILE_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/profile')"
}
main() {
diff --git a/services/mgmt/profile/profiled/testdata/integration_test.go b/services/mgmt/profile/profiled/testdata/integration_test.go
index 0446b69..2f9a82f 100644
--- a/services/mgmt/profile/profiled/testdata/integration_test.go
+++ b/services/mgmt/profile/profiled/testdata/integration_test.go
@@ -9,16 +9,16 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil/integration"
- "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil/integration"
+ "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron2/naming"
)
var binPkgs = []string{
- "v.io/veyron/veyron/services/mgmt/profile/profiled",
- "v.io/veyron/veyron/tools/profile",
+ "v.io/core/veyron/services/mgmt/profile/profiled",
+ "v.io/core/veyron/tools/profile",
}
func profileCommandOutput(t *testing.T, expectError bool, command, binDir, credentials, mt, name, suffix string) string {
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index a87187d..54b5a8e 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -3,10 +3,10 @@
package repository
import (
- "v.io/veyron/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/security/access"
- public "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron/services/mgmt/profile"
+ "v.io/core/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/security/access"
+ public "v.io/core/veyron2/services/mgmt/repository"
)
// Application describes an application repository internally. Besides
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index ab076b5..8ded95a 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -6,20 +6,20 @@
package repository
import (
- "v.io/veyron/veyron/services/mgmt/profile"
+ "v.io/core/veyron/services/mgmt/profile"
- "v.io/veyron/veyron2/services/mgmt/application"
+ "v.io/core/veyron2/services/mgmt/application"
- "v.io/veyron/veyron2/services/mgmt/repository"
+ "v.io/core/veyron2/services/mgmt/repository"
- "v.io/veyron/veyron2/services/security/access"
+ "v.io/core/veyron2/services/security/access"
// The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -216,10 +216,10 @@
// descApplication hides the desc to keep godoc clean.
var descApplication = __ipc.InterfaceDesc{
Name: "Application",
- PkgPath: "v.io/veyron/veyron/services/mgmt/repository",
+ PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Application describes an application repository internally. Besides\n// the public Application interface, it allows to add and remove\n// application envelopes.",
Embeds: []__ipc.EmbedDesc{
- {"Application", "v.io/veyron/veyron2/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
+ {"Application", "v.io/core/veyron2/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
},
Methods: []__ipc.MethodDesc{
{
@@ -278,7 +278,7 @@
__wiretype.FieldType{Type: 0x3d, Name: "Env"},
__wiretype.FieldType{Type: 0x41, Name: "Packages"},
},
- "v.io/veyron/veyron2/services/mgmt/application.Envelope", []string(nil)},
+ "v.io/core/veyron2/services/mgmt/application.Envelope", []string(nil)},
__wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss __ipc.ServiceSignature
var firstAdded int
@@ -523,10 +523,10 @@
// descProfile hides the desc to keep godoc clean.
var descProfile = __ipc.InterfaceDesc{
Name: "Profile",
- PkgPath: "v.io/veyron/veyron/services/mgmt/repository",
+ PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Profile describes a profile internally. Besides the public Profile\n// interface, it allows to add and remove profile specifications.",
Embeds: []__ipc.EmbedDesc{
- {"Profile", "v.io/veyron/veyron2/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
+ {"Profile", "v.io/core/veyron2/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
},
Methods: []__ipc.MethodDesc{
{
@@ -586,14 +586,14 @@
}
result.TypeDefs = []__vdlutil.Any{
- __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/services/mgmt/build.Format", Tags: []string(nil)}, __wiretype.StructType{
+ __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/services/mgmt/build.Format", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x3, Name: "Name"},
__wiretype.FieldType{Type: 0x3, Name: "MajorVersion"},
__wiretype.FieldType{Type: 0x3, Name: "MinorVersion"},
},
- "v.io/veyron/veyron/services/mgmt/profile.Library", []string(nil)},
- __wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, __wiretype.StructType{
+ "v.io/core/veyron/services/mgmt/profile.Library", []string(nil)},
+ __wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x41, Name: "Arch"},
__wiretype.FieldType{Type: 0x3, Name: "Description"},
@@ -602,7 +602,7 @@
__wiretype.FieldType{Type: 0x3, Name: "Label"},
__wiretype.FieldType{Type: 0x45, Name: "OS"},
},
- "v.io/veyron/veyron/services/mgmt/profile.Specification", []string(nil)},
+ "v.io/core/veyron/services/mgmt/profile.Specification", []string(nil)},
__wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss __ipc.ServiceSignature
var firstAdded int
diff --git a/services/mgmt/stats/impl/stats.go b/services/mgmt/stats/impl/stats.go
index f56fdd2..ed51f98 100644
--- a/services/mgmt/stats/impl/stats.go
+++ b/services/mgmt/stats/impl/stats.go
@@ -5,17 +5,17 @@
import (
"time"
- libstats "v.io/veyron/veyron/lib/stats"
+ libstats "v.io/core/veyron/lib/stats"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/mgmt/stats"
- "v.io/veyron/veyron2/services/mgmt/stats/types"
- "v.io/veyron/veyron2/services/watch"
- watchtypes "v.io/veyron/veyron2/services/watch/types"
- "v.io/veyron/veyron2/vdl/vdlutil"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/mgmt/stats"
+ "v.io/core/veyron2/services/mgmt/stats/types"
+ "v.io/core/veyron2/services/watch"
+ watchtypes "v.io/core/veyron2/services/watch/types"
+ "v.io/core/veyron2/vdl/vdlutil"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
type statsService struct {
@@ -23,7 +23,7 @@
watchFreq time.Duration
}
-const pkgPath = "v.io/veyron/veyron/services/mgmt/stats/impl"
+const pkgPath = "v.io/core/veyron/services/mgmt/stats/impl"
var (
errNoValue = verror.Register(types.NoValue, verror.NoRetry, "{1:}{2:} object has no value{:_}")
diff --git a/services/mgmt/stats/impl/stats_test.go b/services/mgmt/stats/impl/stats_test.go
index d481249..882cde4 100644
--- a/services/mgmt/stats/impl/stats_test.go
+++ b/services/mgmt/stats/impl/stats_test.go
@@ -6,19 +6,19 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mgmt/stats"
- "v.io/veyron/veyron2/services/watch/types"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mgmt/stats"
+ "v.io/core/veyron2/services/watch/types"
- libstats "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/lib/stats/histogram"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
- istats "v.io/veyron/veyron/services/mgmt/stats"
- "v.io/veyron/veyron/services/mgmt/stats/impl"
+ libstats "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/lib/stats/histogram"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
+ istats "v.io/core/veyron/services/mgmt/stats"
+ "v.io/core/veyron/services/mgmt/stats/impl"
)
type statsDispatcher struct {
diff --git a/services/mgmt/stats/types.vdl.go b/services/mgmt/stats/types.vdl.go
index 4cbe792..84d8bad 100644
--- a/services/mgmt/stats/types.vdl.go
+++ b/services/mgmt/stats/types.vdl.go
@@ -6,7 +6,7 @@
import (
// The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/veyron/veyron2/vdl"
+ __vdl "v.io/core/veyron2/vdl"
)
// HistogramValue is the value of Histogram objects.
@@ -24,7 +24,7 @@
}
func (HistogramValue) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/services/mgmt/stats.HistogramValue"
+ Name string "v.io/core/veyron/services/mgmt/stats.HistogramValue"
}) {
}
@@ -37,7 +37,7 @@
}
func (HistogramBucket) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/services/mgmt/stats.HistogramBucket"
+ Name string "v.io/core/veyron/services/mgmt/stats.HistogramBucket"
}) {
}
diff --git a/services/mgmt/suidhelper/impl/args.go b/services/mgmt/suidhelper/impl/args.go
index fc2bbd9..67003a3 100644
--- a/services/mgmt/suidhelper/impl/args.go
+++ b/services/mgmt/suidhelper/impl/args.go
@@ -9,7 +9,7 @@
"os/user"
"strconv"
- sflag "v.io/veyron/veyron/services/mgmt/suidhelper/impl/flag"
+ sflag "v.io/core/veyron/services/mgmt/suidhelper/impl/flag"
)
type WorkParameters struct {
diff --git a/services/mgmt/suidhelper/impl/flag/flag.go b/services/mgmt/suidhelper/impl/flag/flag.go
index f37497e..f8b53e1 100644
--- a/services/mgmt/suidhelper/impl/flag/flag.go
+++ b/services/mgmt/suidhelper/impl/flag/flag.go
@@ -1,7 +1,7 @@
// Package flag provides flag definitions for the suidhelper package.
//
// It does NOT depend on any packages outside the Go standard library.
-// This allows v.io/veyron/veyron/lib/testutil to depend on this
+// This allows v.io/core/veyron/lib/testutil to depend on this
// package, thereby ensuring that the suidhelper flags are defined
// before the flag.Parse call in testutil.init is made.
//
diff --git a/services/mgmt/suidhelper/main.go b/services/mgmt/suidhelper/main.go
index 5008f2a..a73e4d2 100644
--- a/services/mgmt/suidhelper/main.go
+++ b/services/mgmt/suidhelper/main.go
@@ -10,7 +10,7 @@
"fmt"
"os"
- "v.io/veyron/veyron/services/mgmt/suidhelper/impl"
+ "v.io/core/veyron/services/mgmt/suidhelper/impl"
)
func main() {
diff --git a/services/mgmt/vtrace/impl/vtrace.go b/services/mgmt/vtrace/impl/vtrace.go
index d0bfac6..9c56e7e 100644
--- a/services/mgmt/vtrace/impl/vtrace.go
+++ b/services/mgmt/vtrace/impl/vtrace.go
@@ -1,11 +1,11 @@
package impl
import (
- "v.io/veyron/veyron2/ipc"
- svtrace "v.io/veyron/veyron2/services/mgmt/vtrace"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/ipc"
+ svtrace "v.io/core/veyron2/services/mgmt/vtrace"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vtrace"
)
type vtraceService struct {
diff --git a/services/mgmt/vtrace/impl/vtrace_test.go b/services/mgmt/vtrace/impl/vtrace_test.go
index afd5175..a7e21c8 100644
--- a/services/mgmt/vtrace/impl/vtrace_test.go
+++ b/services/mgmt/vtrace/impl/vtrace_test.go
@@ -4,15 +4,15 @@
"io"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- service "v.io/veyron/veyron2/services/mgmt/vtrace"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ service "v.io/core/veyron2/services/mgmt/vtrace"
+ "v.io/core/veyron2/vtrace"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/services/mgmt/vtrace/impl"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/services/mgmt/vtrace/impl"
)
func setup(t *testing.T) (string, ipc.Server, veyron2.Runtime) {
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/lib/collection_test_interface.vdl.go
index c864a9b..1c9f8d9 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/lib/collection_test_interface.vdl.go
@@ -5,11 +5,11 @@
import (
// The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -164,7 +164,7 @@
// descCollection hides the desc to keep godoc clean.
var descCollection = __ipc.InterfaceDesc{
Name: "Collection",
- PkgPath: "v.io/veyron/veyron/services/mounttable/lib",
+ PkgPath: "v.io/core/veyron/services/mounttable/lib",
Methods: []__ipc.MethodDesc{
{
Name: "Export",
diff --git a/services/mounttable/lib/collectionserver_test.go b/services/mounttable/lib/collectionserver_test.go
index 994e931..8a7890a 100644
--- a/services/mounttable/lib/collectionserver_test.go
+++ b/services/mounttable/lib/collectionserver_test.go
@@ -3,10 +3,10 @@
import (
"sync"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ verror "v.io/core/veyron2/verror2"
)
// collectionServer is a very simple collection server implementation for testing, with sufficient debugging to help
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index 284306f..1eff3b2 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -9,20 +9,20 @@
"sync"
"time"
- "v.io/veyron/veyron/lib/glob"
+ "v.io/core/veyron/lib/glob"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mounttable"
- "v.io/veyron/veyron2/services/security/access"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mounttable"
+ "v.io/core/veyron2/services/security/access"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
var (
- errNamingLoop = verror.Register("v.io/veyron/veyron/services/mountable/lib", verror.NoRetry, "Loop in namespace")
+ errNamingLoop = verror.Register("v.io/core/veyron/services/mountable/lib", verror.NoRetry, "Loop in namespace")
)
// mountTable represents a namespace. One exists per server instance.
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index bf32002..ad6477c 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -10,16 +10,16 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
// Simulate different processes with different runtimes.
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index fef0481..1392b79 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -6,16 +6,16 @@
"strconv"
"strings"
- "v.io/veyron/veyron/lib/glob"
- "v.io/veyron/veyron/lib/netconfig"
+ "v.io/core/veyron/lib/glob"
+ "v.io/core/veyron/lib/netconfig"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/mounttable"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/mounttable"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
mdns "github.com/presotto/go-mdns-sd"
)
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 5a832fa..345f2ec 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -7,12 +7,12 @@
"testing"
"time"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
func init() { testutil.Init() }
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/lib/serverlist.go
index bc27428..02c7308 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/lib/serverlist.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/naming"
)
type serverListClock interface {
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 8743f2d..6af16c2 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -6,14 +6,14 @@
"net"
"os"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- mounttable "v.io/veyron/veyron/services/mounttable/lib"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ mounttable "v.io/core/veyron/services/mounttable/lib"
)
var (
diff --git a/services/mounttable/mounttabled/test.sh b/services/mounttable/mounttabled/test.sh
index 03cc854..a14c2d7 100755
--- a/services/mounttable/mounttabled/test.sh
+++ b/services/mounttable/mounttabled/test.sh
@@ -17,8 +17,8 @@
readonly WORKDIR="${shell_test_WORK_DIR}"
build() {
- MOUNTTABLED_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mounttable/mounttabled')"
- MOUNTTABLE_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/mounttable')"
+ MOUNTTABLED_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mounttable/mounttabled')"
+ MOUNTTABLE_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/mounttable')"
}
main() {
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index 58a1586..bb5f660 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -9,13 +9,13 @@
"strings"
"time"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/veyron/veyron/runtimes/google/lib/publisher"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+ "v.io/core/veyron/runtimes/google/lib/publisher"
)
var (
diff --git a/services/security/discharger.vdl b/services/security/discharger.vdl
index 686bfae..d43ed74 100644
--- a/services/security/discharger.vdl
+++ b/services/security/discharger.vdl
@@ -1,6 +1,6 @@
package security
-import "v.io/veyron/veyron2/security"
+import "v.io/core/veyron2/security"
// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.
type Discharger interface {
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index 1f469ca..8523827 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -4,14 +4,14 @@
package security
import (
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
// The non-user imports are prefixed with "__" to prevent collisions.
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -157,7 +157,7 @@
// descDischarger hides the desc to keep godoc clean.
var descDischarger = __ipc.InterfaceDesc{
Name: "Discharger",
- PkgPath: "v.io/veyron/veyron/services/security",
+ PkgPath: "v.io/core/veyron/services/security",
Doc: "// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.",
Methods: []__ipc.MethodDesc{
{
@@ -190,13 +190,13 @@
}
result.TypeDefs = []__vdlutil.Any{
- __wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/veyron/veyron2/security.BlessingPattern", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, __wiretype.StructType{
+ __wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, __wiretype.NamedPrimitiveType{Type: 0x3, Name: "v.io/core/veyron2/security.BlessingPattern", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, __wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, __wiretype.StructType{
[]__wiretype.FieldType{
__wiretype.FieldType{Type: 0x43, Name: "Server"},
__wiretype.FieldType{Type: 0x3, Name: "Method"},
__wiretype.FieldType{Type: 0x44, Name: "Arguments"},
},
- "v.io/veyron/veyron2/security.DischargeImpetus", []string(nil)},
+ "v.io/core/veyron2/security.DischargeImpetus", []string(nil)},
__wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
diff --git a/services/security/discharger/discharger.go b/services/security/discharger/discharger.go
index 5297e01..35e9422 100644
--- a/services/security/discharger/discharger.go
+++ b/services/security/discharger/discharger.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- services "v.io/veyron/veyron/services/security"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlutil"
+ services "v.io/core/veyron/services/security"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlutil"
)
// dischargerd issues discharges for all caveats present in the current
