TBR renaming v.io/core/veyron to v.io/x/ref
(and getting rid of unused shell scripts)
MultiPart: 5/13
Change-Id: I09d9df0f4dc7df3d5ca5588513be27b08fe1fd4a
diff --git a/examples/rps/rpsbot/impl_test.go b/examples/rps/rpsbot/impl_test.go
index 9eeb483..3384148 100644
--- a/examples/rps/rpsbot/impl_test.go
+++ b/examples/rps/rpsbot/impl_test.go
@@ -14,8 +14,8 @@
"v.io/x/ref/examples/rps"
- "v.io/core/veyron/lib/testutil"
- mtlib "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/testutil"
+ mtlib "v.io/x/ref/services/mounttable/lib"
"v.io/v23"
"v.io/v23/context"
diff --git a/examples/rps/rpsbot/judge.go b/examples/rps/rpsbot/judge.go
index df29fb7..d430507 100644
--- a/examples/rps/rpsbot/judge.go
+++ b/examples/rps/rpsbot/judge.go
@@ -7,12 +7,12 @@
"sync"
"time"
- "v.io/x/ref/examples/rps"
- "v.io/x/ref/examples/rps/common"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
"v.io/v23/context"
"v.io/x/lib/vlog"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
)
var (
diff --git a/examples/rps/rpsbot/main.go b/examples/rps/rpsbot/main.go
index 439a170..5183dcb 100644
--- a/examples/rps/rpsbot/main.go
+++ b/examples/rps/rpsbot/main.go
@@ -16,9 +16,9 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- sflag "v.io/core/veyron/security/flag"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ sflag "v.io/x/ref/security/flag"
"v.io/x/ref/examples/rps"
"v.io/x/ref/examples/rps/common"
diff --git a/examples/rps/rpsbot/player.go b/examples/rps/rpsbot/player.go
index 74ad8a4..4a02071 100644
--- a/examples/rps/rpsbot/player.go
+++ b/examples/rps/rpsbot/player.go
@@ -4,12 +4,12 @@
"math/rand"
"time"
- "v.io/x/ref/examples/rps"
- "v.io/x/ref/examples/rps/common"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
"v.io/v23/context"
"v.io/x/lib/vlog"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
)
type Player struct {
diff --git a/examples/rps/rpsbot/scorekeeper.go b/examples/rps/rpsbot/scorekeeper.go
index e201a84..3883aa4 100644
--- a/examples/rps/rpsbot/scorekeeper.go
+++ b/examples/rps/rpsbot/scorekeeper.go
@@ -1,12 +1,12 @@
package main
import (
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
"v.io/x/ref/examples/rps"
"v.io/x/ref/examples/rps/common"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
)
type ScoreKeeper struct {
diff --git a/examples/rps/rpsplayer/main.go b/examples/rps/rpsplayer/main.go
index 960ce5e..f7d69a3 100644
--- a/examples/rps/rpsplayer/main.go
+++ b/examples/rps/rpsplayer/main.go
@@ -18,8 +18,8 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/roaming"
- sflag "v.io/core/veyron/security/flag"
+ _ "v.io/x/ref/profiles/roaming"
+ sflag "v.io/x/ref/security/flag"
"v.io/x/ref/examples/rps"
"v.io/x/ref/examples/rps/common"
diff --git a/examples/rps/rpsscorekeeper/main.go b/examples/rps/rpsscorekeeper/main.go
index 433499c..04c216f 100644
--- a/examples/rps/rpsscorekeeper/main.go
+++ b/examples/rps/rpsscorekeeper/main.go
@@ -12,8 +12,8 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/roaming"
- sflag "v.io/core/veyron/security/flag"
+ _ "v.io/x/ref/profiles/roaming"
+ sflag "v.io/x/ref/security/flag"
"v.io/x/ref/examples/rps"
"v.io/x/ref/examples/rps/common"
diff --git a/examples/tunnel/tunneld/iomanager.go b/examples/tunnel/tunneld/iomanager.go
index 3133dc5..47dc5b6 100644
--- a/examples/tunnel/tunneld/iomanager.go
+++ b/examples/tunnel/tunneld/iomanager.go
@@ -5,8 +5,8 @@
"io"
"sync"
- "v.io/x/ref/examples/tunnel"
"v.io/x/lib/vlog"
+ "v.io/x/ref/examples/tunnel"
)
func runIOManager(stdin io.WriteCloser, stdout, stderr io.Reader, ptyFd uintptr, stream tunnel.TunnelShellServerStream) <-chan error {
diff --git a/examples/tunnel/tunneld/main.go b/examples/tunnel/tunneld/main.go
index bbf00a9..e5cc85e 100644
--- a/examples/tunnel/tunneld/main.go
+++ b/examples/tunnel/tunneld/main.go
@@ -11,9 +11,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- sflag "v.io/core/veyron/security/flag"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ sflag "v.io/x/ref/security/flag"
"v.io/x/ref/examples/tunnel"
)
diff --git a/examples/tunnel/tunneld/tunneld_v23_test.go b/examples/tunnel/tunneld/tunneld_v23_test.go
index b5a9dd0..8851005 100644
--- a/examples/tunnel/tunneld/tunneld_v23_test.go
+++ b/examples/tunnel/tunneld/tunneld_v23_test.go
@@ -11,8 +11,8 @@
"regexp"
"strings"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
)
func V23TestTunneld(t *v23tests.T) {
@@ -20,7 +20,7 @@
tunneldBin := t.BuildGoPkg("v.io/x/ref/examples/tunnel/tunneld")
vsh := t.BuildGoPkg("v.io/x/ref/examples/tunnel/vsh")
- mounttableBin := t.BuildGoPkg("v.io/core/veyron/tools/mounttable")
+ mounttableBin := t.BuildGoPkg("v.io/x/ref/tools/mounttable")
port, err := testutil.FindUnusedPort()
if err != nil {
diff --git a/examples/tunnel/tunneld/v23_test.go b/examples/tunnel/tunneld/v23_test.go
index d45c99d..3b31d68 100644
--- a/examples/tunnel/tunneld/v23_test.go
+++ b/examples/tunnel/tunneld/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/examples/tunnel/vsh/main.go b/examples/tunnel/vsh/main.go
index 8207851..e37f0df 100644
--- a/examples/tunnel/vsh/main.go
+++ b/examples/tunnel/vsh/main.go
@@ -15,11 +15,11 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
"v.io/x/ref/examples/tunnel"
"v.io/x/ref/examples/tunnel/tunnelutil"
- "v.io/core/veyron/lib/signals"
+ "v.io/x/ref/lib/signals"
)
var (
diff --git a/lib/GO.PACKAGE b/lib/GO.PACKAGE
index 5071fbd..8252cab 100644
--- a/lib/GO.PACKAGE
+++ b/lib/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/lib/..."},
+ {"allow": "v.io/x/ref/lib/..."},
{"allow": "...", "comment": "dependencies on veyron/lib are temporarily allowed"}
]
}
diff --git a/lib/exec/child.go b/lib/exec/child.go
index bec0100..ea02bf8 100644
--- a/lib/exec/child.go
+++ b/lib/exec/child.go
@@ -9,7 +9,7 @@
"sync"
"unicode/utf8"
- "v.io/core/veyron/lib/exec/consts"
+ "v.io/x/ref/lib/exec/consts"
)
var (
diff --git a/lib/exec/exec_test.go b/lib/exec/exec_test.go
index e8de2cd..4fbdd48 100644
--- a/lib/exec/exec_test.go
+++ b/lib/exec/exec_test.go
@@ -13,10 +13,10 @@
"time"
"unicode/utf8"
- vexec "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/exec/consts"
+ vexec "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/exec/consts"
// Use mock timekeeper to avoid actually sleeping during the test.
- "v.io/core/veyron/lib/testutil/timekeeper"
+ "v.io/x/ref/lib/testutil/timekeeper"
)
// We always expect there to be exactly three open file descriptors
diff --git a/lib/exec/parent.go b/lib/exec/parent.go
index 463223b..0c31dcf 100644
--- a/lib/exec/parent.go
+++ b/lib/exec/parent.go
@@ -16,8 +16,8 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/exec/consts"
- "v.io/core/veyron/lib/timekeeper"
+ "v.io/x/ref/lib/exec/consts"
+ "v.io/x/ref/lib/timekeeper"
)
var (
diff --git a/lib/expect/expect_test.go b/lib/expect/expect_test.go
index fb6f579..9dfcf03 100644
--- a/lib/expect/expect_test.go
+++ b/lib/expect/expect_test.go
@@ -9,7 +9,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
+ "v.io/x/ref/lib/expect"
)
func TestSimple(t *testing.T) {
diff --git a/lib/filelocker/locker_test.go b/lib/filelocker/locker_test.go
index 46f7bb6..ca4763e 100644
--- a/lib/filelocker/locker_test.go
+++ b/lib/filelocker/locker_test.go
@@ -10,8 +10,8 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
)
//go:generate v23 test generate
diff --git a/lib/filelocker/v23_internal_test.go b/lib/filelocker/v23_internal_test.go
index 680f581..65ed9a5 100644
--- a/lib/filelocker/v23_internal_test.go
+++ b/lib/filelocker/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("testLockChild", ``, testLockChild)
diff --git a/lib/flags/buildinfo/buildinfo.go b/lib/flags/buildinfo/buildinfo.go
index f7574cb..7835af3 100644
--- a/lib/flags/buildinfo/buildinfo.go
+++ b/lib/flags/buildinfo/buildinfo.go
@@ -6,7 +6,7 @@
)
// These variables are filled in at link time, using:
-// -ldflags "-X v.io/core/veyron/lib/flags/buildinfo.<varname> <value>"
+// -ldflags "-X v.io/x/ref/lib/flags/buildinfo.<varname> <value>"
var timestamp, username, platform string
// T describes binary metadata.
diff --git a/lib/flags/flags.go b/lib/flags/flags.go
index ce1ff24..9db7e9a 100644
--- a/lib/flags/flags.go
+++ b/lib/flags/flags.go
@@ -7,8 +7,8 @@
"strings"
"sync"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/flags/consts"
)
// FlagGroup is the type for identifying groups of related flags.
diff --git a/lib/flags/flags_test.go b/lib/flags/flags_test.go
index 6ec6e37..ed85864 100644
--- a/lib/flags/flags_test.go
+++ b/lib/flags/flags_test.go
@@ -7,8 +7,8 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/flags/consts"
)
func TestFlags(t *testing.T) {
diff --git a/lib/flags/listen_test.go b/lib/flags/listen_test.go
index d9c9f55..8c047df 100644
--- a/lib/flags/listen_test.go
+++ b/lib/flags/listen_test.go
@@ -6,7 +6,7 @@
"strings"
"testing"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
func TestIPFlag(t *testing.T) {
diff --git a/lib/flags/main.go b/lib/flags/main.go
index dd6e009..9995db0 100644
--- a/lib/flags/main.go
+++ b/lib/flags/main.go
@@ -7,7 +7,7 @@
"fmt"
"os"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
func main() {
diff --git a/lib/modules/core/core_test.go b/lib/modules/core/core_test.go
index 6ea1d49..3f521cc 100644
--- a/lib/modules/core/core_test.go
+++ b/lib/modules/core/core_test.go
@@ -12,12 +12,12 @@
"v.io/x/lib/vlog"
- "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"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
// We create our own TestMain here because v23 test generate currently does not
diff --git a/lib/modules/core/echo.go b/lib/modules/core/echo.go
index 6da6936..e8a3809 100644
--- a/lib/modules/core/echo.go
+++ b/lib/modules/core/echo.go
@@ -10,7 +10,7 @@
"v.io/v23/ipc"
"v.io/v23/security"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func init() {
diff --git a/lib/modules/core/misc.go b/lib/modules/core/misc.go
index d6b9c7c..580b39b 100644
--- a/lib/modules/core/misc.go
+++ b/lib/modules/core/misc.go
@@ -5,7 +5,7 @@
"io"
"time"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func init() {
diff --git a/lib/modules/core/mounttable.go b/lib/modules/core/mounttable.go
index 1e95b34..9752635 100644
--- a/lib/modules/core/mounttable.go
+++ b/lib/modules/core/mounttable.go
@@ -11,8 +11,8 @@
"v.io/v23/naming"
"v.io/v23/options"
- "v.io/core/veyron/lib/modules"
- mounttable "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/modules"
+ mounttable "v.io/x/ref/services/mounttable/lib"
)
var details *bool
diff --git a/lib/modules/core/proxy.go b/lib/modules/core/proxy.go
index 2cfbd04..af2c411 100644
--- a/lib/modules/core/proxy.go
+++ b/lib/modules/core/proxy.go
@@ -9,9 +9,9 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/lib/publisher"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/lib/publisher"
)
func init() {
diff --git a/lib/modules/core/test_identityd.go b/lib/modules/core/test_identityd.go
index 080fe6d..7ef34de 100644
--- a/lib/modules/core/test_identityd.go
+++ b/lib/modules/core/test_identityd.go
@@ -10,15 +10,15 @@
"v.io/v23"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
- "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"
- "v.io/core/veyron/services/identity/util"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/blesser"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/server"
+ "v.io/x/ref/services/identity/util"
)
var (
diff --git a/lib/modules/core/wspr.go b/lib/modules/core/wspr.go
index 9027d2a..29ef5e8 100644
--- a/lib/modules/core/wspr.go
+++ b/lib/modules/core/wspr.go
@@ -5,8 +5,8 @@
"fmt"
"io"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/services/wsprd/wspr"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/services/wsprd/wspr"
"v.io/v23"
)
diff --git a/lib/modules/examples_test.go b/lib/modules/examples_test.go
index e4ab42a..5b18040 100644
--- a/lib/modules/examples_test.go
+++ b/lib/modules/examples_test.go
@@ -5,8 +5,8 @@
"io"
"os"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
)
func init() {
diff --git a/lib/modules/exec.go b/lib/modules/exec.go
index c179d45..08b14b5 100644
--- a/lib/modules/exec.go
+++ b/lib/modules/exec.go
@@ -10,9 +10,9 @@
"sync"
"time"
- vexec "v.io/core/veyron/lib/exec"
"v.io/v23/mgmt"
"v.io/x/lib/vlog"
+ vexec "v.io/x/ref/lib/exec"
)
// execHandle implements both the command and Handle interfaces.
diff --git a/lib/modules/modules_internal_test.go b/lib/modules/modules_internal_test.go
index 393991b..678608a 100644
--- a/lib/modules/modules_internal_test.go
+++ b/lib/modules/modules_internal_test.go
@@ -7,8 +7,8 @@
"runtime"
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func Echo(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go
index b647654..092765d 100644
--- a/lib/modules/modules_test.go
+++ b/lib/modules/modules_test.go
@@ -13,14 +13,14 @@
"testing"
"time"
- "v.io/core/veyron/lib/exec"
- execconsts "v.io/core/veyron/lib/exec/consts"
+ "v.io/x/ref/lib/exec"
+ execconsts "v.io/x/ref/lib/exec/consts"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
"v.io/v23"
)
diff --git a/lib/modules/queue_rw.go b/lib/modules/queue_rw.go
index 6d1d317..f092408 100644
--- a/lib/modules/queue_rw.go
+++ b/lib/modules/queue_rw.go
@@ -5,7 +5,7 @@
"sync"
// TODO(caprita): Move upcqueue into veyron/lib.
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
// queueRW implements a ReadWriteCloser backed by an unbounded in-memory
diff --git a/lib/modules/queue_rw_test.go b/lib/modules/queue_rw_test.go
index e6bc984..26f6f19 100644
--- a/lib/modules/queue_rw_test.go
+++ b/lib/modules/queue_rw_test.go
@@ -5,8 +5,8 @@
"io"
"testing"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
)
func TestQueueRW(t *testing.T) {
diff --git a/lib/modules/registry.go b/lib/modules/registry.go
index a3e9e16..110c145 100644
--- a/lib/modules/registry.go
+++ b/lib/modules/registry.go
@@ -11,7 +11,7 @@
"v.io/x/lib/vlog"
- vexec "v.io/core/veyron/lib/exec"
+ vexec "v.io/x/ref/lib/exec"
)
type commandDesc struct {
diff --git a/lib/modules/shell.go b/lib/modules/shell.go
index 0152bd9..55be3b3 100644
--- a/lib/modules/shell.go
+++ b/lib/modules/shell.go
@@ -48,12 +48,12 @@
"v.io/v23/security"
- "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/keymgr"
"v.io/v23"
"v.io/v23/context"
+ "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/keymgr"
)
const (
diff --git a/lib/modules/util.go b/lib/modules/util.go
index 529ac4b..3f1731c 100644
--- a/lib/modules/util.go
+++ b/lib/modules/util.go
@@ -8,7 +8,7 @@
"os"
"strings"
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/security"
"v.io/x/lib/vlog"
diff --git a/lib/netconfig/example_test.go b/lib/netconfig/example_test.go
index a6fcfa0..33ab162 100644
--- a/lib/netconfig/example_test.go
+++ b/lib/netconfig/example_test.go
@@ -4,7 +4,7 @@
"fmt"
"log"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
func ExampleNetConfigWatcher() {
diff --git a/lib/netstate/netstate.go b/lib/netstate/netstate.go
index 673168c..623e7b2 100644
--- a/lib/netstate/netstate.go
+++ b/lib/netstate/netstate.go
@@ -54,7 +54,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
// AddrIfc represents a network address and the network interface that
diff --git a/lib/netstate/netstate_test.go b/lib/netstate/netstate_test.go
index a774ec9..954b9d4 100644
--- a/lib/netstate/netstate_test.go
+++ b/lib/netstate/netstate_test.go
@@ -7,8 +7,8 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
- "v.io/core/veyron/lib/netstate"
+ "v.io/x/ref/lib/netconfig"
+ "v.io/x/ref/lib/netstate"
)
func TestGet(t *testing.T) {
diff --git a/lib/netstate/route.go b/lib/netstate/route.go
index 58515b9..906dc9e 100644
--- a/lib/netstate/route.go
+++ b/lib/netstate/route.go
@@ -7,7 +7,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
// Interface represents a network interface.
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index 3117cf7..9e99bf8 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -19,12 +19,12 @@
"v.io/v23/services/mgmt/appcycle"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- vflag "v.io/core/veyron/security/flag"
- "v.io/core/veyron/services/mgmt/device"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/device"
)
//go:generate v23 test generate
diff --git a/lib/signals/v23_internal_test.go b/lib/signals/v23_internal_test.go
index 1c70736..51d914f 100644
--- a/lib/signals/v23_internal_test.go
+++ b/lib/signals/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("handleDefaults", ``, handleDefaults)
diff --git a/lib/stats/counter.go b/lib/stats/counter.go
index 3a1945b..3f2beff 100644
--- a/lib/stats/counter.go
+++ b/lib/stats/counter.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
// NewCounter creates a new Counter StatsObject with the given name and
diff --git a/lib/stats/counter/counter_test.go b/lib/stats/counter/counter_test.go
index 2c87bcb..dba6c39 100644
--- a/lib/stats/counter/counter_test.go
+++ b/lib/stats/counter/counter_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
func TestCounter(t *testing.T) {
diff --git a/lib/stats/counter/tracker_test.go b/lib/stats/counter/tracker_test.go
index 6793e01..b8b5235 100644
--- a/lib/stats/counter/tracker_test.go
+++ b/lib/stats/counter/tracker_test.go
@@ -8,7 +8,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
var trackerTests = []struct {
diff --git a/lib/stats/glob.go b/lib/stats/glob.go
index eff004b..25884d1 100644
--- a/lib/stats/glob.go
+++ b/lib/stats/glob.go
@@ -5,7 +5,7 @@
"sort"
"time"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
)
// Glob returns the name and (optionally) the value of all the objects that
diff --git a/lib/stats/histogram.go b/lib/stats/histogram.go
index 9baa8a8..280b5ba 100644
--- a/lib/stats/histogram.go
+++ b/lib/stats/histogram.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
// NewHistogram creates a new Histogram StatsObject with the given name and
diff --git a/lib/stats/histogram/histogram.go b/lib/stats/histogram/histogram.go
index e668a9a..dd6aaa9 100644
--- a/lib/stats/histogram/histogram.go
+++ b/lib/stats/histogram/histogram.go
@@ -6,8 +6,8 @@
"fmt"
"time"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/services/mgmt/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/services/mgmt/stats"
)
// A Histogram accumulates values in the form of a histogram. The type of the
diff --git a/lib/stats/histogram/histogram_test.go b/lib/stats/histogram/histogram_test.go
index f788e9f..f213809 100644
--- a/lib/stats/histogram/histogram_test.go
+++ b/lib/stats/histogram/histogram_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
func TestHistogram(t *testing.T) {
diff --git a/lib/stats/stats_test.go b/lib/stats/stats_test.go
index ae68648..5c5a596 100644
--- a/lib/stats/stats_test.go
+++ b/lib/stats/stats_test.go
@@ -5,10 +5,10 @@
"testing"
"time"
- libstats "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/lib/stats/histogram"
- istats "v.io/core/veyron/services/mgmt/stats"
+ libstats "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/lib/stats/histogram"
+ istats "v.io/x/ref/services/mgmt/stats"
)
func doGlob(root, pattern string, since time.Time, includeValues bool) ([]libstats.KeyValue, error) {
diff --git a/lib/stats/sysstats/sysstats.go b/lib/stats/sysstats/sysstats.go
index 1db188b..76eafac 100644
--- a/lib/stats/sysstats/sysstats.go
+++ b/lib/stats/sysstats/sysstats.go
@@ -10,8 +10,8 @@
"strings"
"time"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/stats"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/stats"
)
func init() {
diff --git a/lib/stats/sysstats/sysstats_test.go b/lib/stats/sysstats/sysstats_test.go
index d157b5e..e86557f 100644
--- a/lib/stats/sysstats/sysstats_test.go
+++ b/lib/stats/sysstats/sysstats_test.go
@@ -4,8 +4,8 @@
"os"
"testing"
- "v.io/core/veyron/lib/stats"
- _ "v.io/core/veyron/lib/stats/sysstats"
+ "v.io/x/ref/lib/stats"
+ _ "v.io/x/ref/lib/stats/sysstats"
)
func TestHostname(t *testing.T) {
diff --git a/lib/testutil/benchmark/stats.go b/lib/testutil/benchmark/stats.go
index 62790a6..ce9e169 100644
--- a/lib/testutil/benchmark/stats.go
+++ b/lib/testutil/benchmark/stats.go
@@ -7,7 +7,7 @@
"math"
"time"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
// Stats is a simple helper for gathering additional statistics like histogram
diff --git a/lib/testutil/benchmark/stats_test.go b/lib/testutil/benchmark/stats_test.go
index 7072963..d315f67 100644
--- a/lib/testutil/benchmark/stats_test.go
+++ b/lib/testutil/benchmark/stats_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
+ "v.io/x/ref/lib/testutil/benchmark"
)
func TestStatsBasic(t *testing.T) {
diff --git a/lib/testutil/init.go b/lib/testutil/init.go
index fa1f8b1..ab09904 100644
--- a/lib/testutil/init.go
+++ b/lib/testutil/init.go
@@ -2,7 +2,7 @@
//
// Configures logging, random number generators and other global state.
// Typical usage in _test.go files:
-// import "v.io/core/veyron/lib/testutil"
+// import "v.io/x/ref/lib/testutil"
// func TestMain(m *testing.M) {
// testutil.Init()
// os.Exit(m.Run())
@@ -18,7 +18,7 @@
"sync"
"time"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
"v.io/v23"
"v.io/v23/context"
diff --git a/lib/testutil/security/util.go b/lib/testutil/security/util.go
index 3901177..a9eb884 100644
--- a/lib/testutil/security/util.go
+++ b/lib/testutil/security/util.go
@@ -26,7 +26,7 @@
"io/ioutil"
"os"
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/security"
"v.io/v23/services/security/access"
diff --git a/lib/testutil/security/util_test.go b/lib/testutil/security/util_test.go
index ea7b51a..b080e6f 100644
--- a/lib/testutil/security/util_test.go
+++ b/lib/testutil/security/util_test.go
@@ -10,8 +10,8 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- _ "v.io/core/veyron/profiles"
- vsecurity "v.io/core/veyron/security"
+ _ "v.io/x/ref/profiles"
+ vsecurity "v.io/x/ref/security"
)
func unsortedEquals(a, b []string) bool {
diff --git a/lib/testutil/timekeeper/manual_time.go b/lib/testutil/timekeeper/manual_time.go
index d247a4c..4d36539 100644
--- a/lib/testutil/timekeeper/manual_time.go
+++ b/lib/testutil/timekeeper/manual_time.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "v.io/core/veyron/lib/timekeeper"
+ "v.io/x/ref/lib/timekeeper"
)
// ManualTime is a time keeper that allows control over the advancement of time.
diff --git a/lib/testutil/v23tests/internal/cached_test.go b/lib/testutil/v23tests/internal/cached_test.go
index 688ba64..651e7f6 100644
--- a/lib/testutil/v23tests/internal/cached_test.go
+++ b/lib/testutil/v23tests/internal/cached_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
@@ -31,7 +31,7 @@
// build build's a binary and appends it's modtime to the
// global slice modTimes
func build(i *v23tests.T) {
- nsBin := i.BuildGoPkg("v.io/core/veyron/tools/namespace")
+ nsBin := i.BuildGoPkg("v.io/x/ref/tools/namespace")
fi, err := os.Stat(nsBin.Path())
if err != nil {
i.Fatal()
diff --git a/lib/testutil/v23tests/internal/v23_test.go b/lib/testutil/v23tests/internal/v23_test.go
index f1d42e7..fdcea7a 100644
--- a/lib/testutil/v23tests/internal/v23_test.go
+++ b/lib/testutil/v23tests/internal/v23_test.go
@@ -8,7 +8,7 @@
import "testing"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestV23One(t *testing.T) {
v23tests.RunTest(t, V23TestOne)
diff --git a/lib/testutil/v23tests/v23tests.go b/lib/testutil/v23tests/v23tests.go
index fda96b9..e9c0682 100644
--- a/lib/testutil/v23tests/v23tests.go
+++ b/lib/testutil/v23tests/v23tests.go
@@ -91,11 +91,11 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/security/agent"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/security/agent"
)
// TB is an exact mirror of testing.TB. It is provided to allow for testing
@@ -833,7 +833,7 @@
// the NAMESPACE_ROOT variable in the test environment so that all subsequent
// invocations will access this root mount table.
func RunRootMT(i *T, args ...string) (*Binary, *Invocation) {
- b := i.BuildGoPkg("v.io/core/veyron/services/mounttable/mounttabled")
+ b := i.BuildGoPkg("v.io/x/ref/services/mounttable/mounttabled")
inv := b.start(1, args...)
name := inv.ExpectVar("NAME")
inv.Environment().SetVar("NAMESPACE_ROOT", name)
diff --git a/lib/testutil/v23tests/v23tests_test.go b/lib/testutil/v23tests/v23tests_test.go
index 9ab4eab..480ad07 100644
--- a/lib/testutil/v23tests/v23tests_test.go
+++ b/lib/testutil/v23tests/v23tests_test.go
@@ -15,11 +15,11 @@
"v.io/v23/naming"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
// TODO(sjr): add more unit tests, especially for errors cases.
@@ -47,8 +47,8 @@
defer env.Cleanup()
v23tests.RunRootMT(env, "--veyron.tcp.address=127.0.0.1:0")
- proxyBin := env.BuildGoPkg("v.io/core/veyron/services/proxy/proxyd")
- nsBin := env.BuildGoPkg("v.io/core/veyron/tools/namespace")
+ proxyBin := env.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
+ nsBin := env.BuildGoPkg("v.io/x/ref/tools/namespace")
mt, ok := env.GetVar("NAMESPACE_ROOT")
if !ok || len(mt) == 0 {
@@ -384,7 +384,7 @@
func builder(t *testing.T) (string, string) {
env := v23tests.New(t)
defer env.Cleanup()
- bin := env.BuildGoPkg("v.io/core/veyron/lib/testutil/v23tests")
+ bin := env.BuildGoPkg("v.io/x/ref/lib/testutil/v23tests")
return env.BinDir(), bin.Path()
}
diff --git a/lib/vdl/build/build.go b/lib/vdl/build/build.go
index 43147a1..bf3327d 100644
--- a/lib/vdl/build/build.go
+++ b/lib/vdl/build/build.go
@@ -48,12 +48,12 @@
"sort"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const vdlrootImportPrefix = "v.io/v23/vdlroot"
diff --git a/lib/vdl/build/build_test.go b/lib/vdl/build/build_test.go
index de76ed4..e583a50 100644
--- a/lib/vdl/build/build_test.go
+++ b/lib/vdl/build/build_test.go
@@ -9,13 +9,13 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/testdata/base"
- "v.io/core/veyron/lib/vdl/vdltest"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func init() {
@@ -25,7 +25,7 @@
// The cwd is set to the directory containing this file. Currently we have the
// following directory structure:
-// .../release/go/src/v.io/core/veyron/lib/vdl/build/build_test.go
+// .../release/go/src/v.io/x/ref/lib/vdl/build/build_test.go
// We want to end up with the following:
// VDLROOT = .../release/go/src/v.io/v23/vdlroot
// VDLPATH = .../release/go
@@ -226,101 +226,101 @@
{[]string{}, nil, nil},
// Single-package, both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
// Single-package with wildcard, both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base/..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base/..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base/..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
// Redundant specification as both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base", "../testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base", "../testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/arith", "../testdata/arith"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith", "../testdata/arith"},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
},
nil,
},
// Wildcards as both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata..."},
+ []string{"v.io/x/ref/lib/vdl/testdata..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../testdata..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
@@ -328,38 +328,38 @@
{
[]string{"v...vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../../...vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
// Multi-Wildcards as both import and dir path.
{
[]string{"v...vdl/testdata/...exp"},
- []string{"v.io/core/veyron/lib/vdl/testdata/arith/exp"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith/exp"},
nil,
},
{
[]string{"../../...vdl/testdata/...exp"},
- []string{"v.io/core/veyron/lib/vdl/testdata/arith/exp"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith/exp"},
nil,
},
// Standard vdl package, as both import and dir path.
@@ -492,9 +492,9 @@
Path string
Config vdltool.Config
}{
- {"v.io/core/veyron/lib/vdl/testdata/base", vdltool.Config{}},
+ {"v.io/x/ref/lib/vdl/testdata/base", vdltool.Config{}},
{
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
vdltool.Config{
GenLanguages: map[vdltool.GenLanguage]struct{}{vdltool.GenLanguageGo: struct{}{}},
},
@@ -530,15 +530,15 @@
Value interface{}
}{
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.NamedBool(true)`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.NamedBool(true)`,
base.NamedBool(true),
},
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.NamedString("abc")`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.NamedString("abc")`,
base.NamedString("abc"),
},
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.Args{1, 2}`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.Args{1, 2}`,
base.Args{1, 2},
},
}
diff --git a/lib/vdl/codegen/golang/const.go b/lib/vdl/codegen/golang/const.go
index 6dd1214..84cf374 100644
--- a/lib/vdl/codegen/golang/const.go
+++ b/lib/vdl/codegen/golang/const.go
@@ -4,9 +4,9 @@
"fmt"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
)
func constDefGo(data goData, def *compile.ConstDef) string {
diff --git a/lib/vdl/codegen/golang/const_test.go b/lib/vdl/codegen/golang/const_test.go
index dc760fe..eb37459 100644
--- a/lib/vdl/codegen/golang/const_test.go
+++ b/lib/vdl/codegen/golang/const_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestConst(t *testing.T) {
diff --git a/lib/vdl/codegen/golang/gen.go b/lib/vdl/codegen/golang/gen.go
index 3bd149e..2a65794 100644
--- a/lib/vdl/codegen/golang/gen.go
+++ b/lib/vdl/codegen/golang/gen.go
@@ -9,11 +9,11 @@
"strings"
"text/template"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
type goData struct {
@@ -96,8 +96,8 @@
// Restrict the feature to these whitelisted VDL packages for now.
var nativeTypePackageWhitelist = map[string]bool{
"time": true,
- "v.io/core/veyron/lib/vdl/testdata/nativetest": true,
- "v.io/v23/security": true,
+ "v.io/x/ref/lib/vdl/testdata/nativetest": true,
+ "v.io/v23/security": true,
}
func validateGoConfig(file *compile.File, env *compile.Env) {
diff --git a/lib/vdl/codegen/golang/import.go b/lib/vdl/codegen/golang/import.go
index 7d19f42..558c071 100644
--- a/lib/vdl/codegen/golang/import.go
+++ b/lib/vdl/codegen/golang/import.go
@@ -6,21 +6,21 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// goImport represents a single import in the generated Go file.
-// Example A: import "v.io/core/abc"
-// Example B: import foo "v.io/core/abc"
+// Example A: import "v.io/v23/abc"
+// Example B: import foo "v.io/v23/abc"
type goImport struct {
// Name of the import.
// Example A: ""
// Example B: "foo"
Name string
// Path of the import.
- // Example A: "v.io/core/abc"
- // Example B: "v.io/core/abc"
+ // Example A: "v.io/v23/abc"
+ // Example B: "v.io/v23/abc"
Path string
// Local identifier within the generated go file to reference the imported
// package.
diff --git a/lib/vdl/codegen/golang/type.go b/lib/vdl/codegen/golang/type.go
index d9f3e6a..7d2ae59 100644
--- a/lib/vdl/codegen/golang/type.go
+++ b/lib/vdl/codegen/golang/type.go
@@ -5,9 +5,9 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/compile"
)
func localIdent(data goData, file *compile.File, ident string) string {
diff --git a/lib/vdl/codegen/golang/type_test.go b/lib/vdl/codegen/golang/type_test.go
index 9504c2c..b253617 100644
--- a/lib/vdl/codegen/golang/type_test.go
+++ b/lib/vdl/codegen/golang/type_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestType(t *testing.T) {
diff --git a/lib/vdl/codegen/import.go b/lib/vdl/codegen/import.go
index 82c63ff..1397d42 100644
--- a/lib/vdl/codegen/import.go
+++ b/lib/vdl/codegen/import.go
@@ -5,8 +5,8 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// TODO(toddw): Remove this file, after all code generators have been updated to
diff --git a/lib/vdl/codegen/java/file_array.go b/lib/vdl/codegen/java/file_array.go
index 7803721..919208c 100644
--- a/lib/vdl/codegen/java/file_array.go
+++ b/lib/vdl/codegen/java/file_array.go
@@ -6,7 +6,7 @@
"log"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const arrayTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_factory.go b/lib/vdl/codegen/java/file_client_factory.go
index df62723..d7e90db 100644
--- a/lib/vdl/codegen/java/file_client_factory.go
+++ b/lib/vdl/codegen/java/file_client_factory.go
@@ -5,7 +5,7 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const clientFactoryTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_interface.go b/lib/vdl/codegen/java/file_client_interface.go
index 879d472..0ea8327 100644
--- a/lib/vdl/codegen/java/file_client_interface.go
+++ b/lib/vdl/codegen/java/file_client_interface.go
@@ -6,8 +6,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const clientInterfaceTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_stub.go b/lib/vdl/codegen/java/file_client_stub.go
index 31ebcab..0b9a82a 100644
--- a/lib/vdl/codegen/java/file_client_stub.go
+++ b/lib/vdl/codegen/java/file_client_stub.go
@@ -5,8 +5,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const clientStubTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_complex.go b/lib/vdl/codegen/java/file_complex.go
index e2f457e..f415419 100644
--- a/lib/vdl/codegen/java/file_complex.go
+++ b/lib/vdl/codegen/java/file_complex.go
@@ -5,8 +5,8 @@
"fmt"
"log"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const complexTmpl = `
diff --git a/lib/vdl/codegen/java/file_constants.go b/lib/vdl/codegen/java/file_constants.go
index 28b525f..7a2934e 100644
--- a/lib/vdl/codegen/java/file_constants.go
+++ b/lib/vdl/codegen/java/file_constants.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const constTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_enum.go b/lib/vdl/codegen/java/file_enum.go
index 6da2c16..166650c 100644
--- a/lib/vdl/codegen/java/file_enum.go
+++ b/lib/vdl/codegen/java/file_enum.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const enumTmpl = `
diff --git a/lib/vdl/codegen/java/file_errors.go b/lib/vdl/codegen/java/file_errors.go
index 4aa8306..0dee049 100644
--- a/lib/vdl/codegen/java/file_errors.go
+++ b/lib/vdl/codegen/java/file_errors.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const errorTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_list.go b/lib/vdl/codegen/java/file_list.go
index 4fba2c8..1a392e3 100644
--- a/lib/vdl/codegen/java/file_list.go
+++ b/lib/vdl/codegen/java/file_list.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const listTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_map.go b/lib/vdl/codegen/java/file_map.go
index e618743..078878a 100644
--- a/lib/vdl/codegen/java/file_map.go
+++ b/lib/vdl/codegen/java/file_map.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const mapTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_package_info.go b/lib/vdl/codegen/java/file_package_info.go
index 9d30e24..aebcbe1 100644
--- a/lib/vdl/codegen/java/file_package_info.go
+++ b/lib/vdl/codegen/java/file_package_info.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const packageTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_primitive.go b/lib/vdl/codegen/java/file_primitive.go
index 2543296..e392a77 100644
--- a/lib/vdl/codegen/java/file_primitive.go
+++ b/lib/vdl/codegen/java/file_primitive.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const primitiveTmpl = `
diff --git a/lib/vdl/codegen/java/file_server_interface.go b/lib/vdl/codegen/java/file_server_interface.go
index c85e92f..8b5bb74 100644
--- a/lib/vdl/codegen/java/file_server_interface.go
+++ b/lib/vdl/codegen/java/file_server_interface.go
@@ -6,8 +6,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const serverInterfaceTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_server_wrapper.go b/lib/vdl/codegen/java/file_server_wrapper.go
index f25a775..8b84587 100644
--- a/lib/vdl/codegen/java/file_server_wrapper.go
+++ b/lib/vdl/codegen/java/file_server_wrapper.go
@@ -5,8 +5,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const serverWrapperTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_set.go b/lib/vdl/codegen/java/file_set.go
index 7c7817d..433afb6 100644
--- a/lib/vdl/codegen/java/file_set.go
+++ b/lib/vdl/codegen/java/file_set.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const setTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_struct.go b/lib/vdl/codegen/java/file_struct.go
index 7066dc5..50c2ccd 100644
--- a/lib/vdl/codegen/java/file_struct.go
+++ b/lib/vdl/codegen/java/file_struct.go
@@ -4,9 +4,9 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const structTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_union.go b/lib/vdl/codegen/java/file_union.go
index 9b53103..a5cc3f3 100644
--- a/lib/vdl/codegen/java/file_union.go
+++ b/lib/vdl/codegen/java/file_union.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const unionTmpl = `
diff --git a/lib/vdl/codegen/java/generate.go b/lib/vdl/codegen/java/generate.go
index 11c137e..781b4cc 100644
--- a/lib/vdl/codegen/java/generate.go
+++ b/lib/vdl/codegen/java/generate.go
@@ -4,8 +4,8 @@
import (
"path"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// pkgPathXlator is the function used to translate a VDL package path
@@ -102,7 +102,7 @@
// Restrict the feature to these whitelisted VDL packages for now.
var nativeTypePackageWhitelist = map[string]bool{
"time": true,
- "v.io/core/veyron/lib/vdl/testdata/nativetest": true,
+ "v.io/x/ref/lib/vdl/testdata/nativetest": true,
}
func validateJavaConfig(pkg *compile.Package, env *compile.Env) {
diff --git a/lib/vdl/codegen/java/util_args.go b/lib/vdl/codegen/java/util_args.go
index c586a34..841acde 100644
--- a/lib/vdl/codegen/java/util_args.go
+++ b/lib/vdl/codegen/java/util_args.go
@@ -4,7 +4,7 @@
"bytes"
"fmt"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaDeclarationArgStr creates a comma separated string of args to be used in a function declaration
diff --git a/lib/vdl/codegen/java/util_file.go b/lib/vdl/codegen/java/util_file.go
index 4f488e2..dd51498 100644
--- a/lib/vdl/codegen/java/util_file.go
+++ b/lib/vdl/codegen/java/util_file.go
@@ -3,7 +3,7 @@
import (
"bytes"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaFileNames constructs a comma separated string with the short (basename) of the input files
diff --git a/lib/vdl/codegen/java/util_interface.go b/lib/vdl/codegen/java/util_interface.go
index 27ae408..9735b4d 100644
--- a/lib/vdl/codegen/java/util_interface.go
+++ b/lib/vdl/codegen/java/util_interface.go
@@ -4,7 +4,7 @@
"bytes"
"path"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// allEmbeddedIfaces returns all unique interfaces in the embed tree
diff --git a/lib/vdl/codegen/java/util_method.go b/lib/vdl/codegen/java/util_method.go
index ed19ddf..c24762a 100644
--- a/lib/vdl/codegen/java/util_method.go
+++ b/lib/vdl/codegen/java/util_method.go
@@ -5,7 +5,7 @@
"fmt"
"sort"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
func isStreamingMethod(method *compile.Method) bool {
diff --git a/lib/vdl/codegen/java/util_type.go b/lib/vdl/codegen/java/util_type.go
index 78e8f26..5fae3f6 100644
--- a/lib/vdl/codegen/java/util_type.go
+++ b/lib/vdl/codegen/java/util_type.go
@@ -6,9 +6,9 @@
"path"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func javaFullyQualifiedNamedType(def *compile.TypeDef, forceClass bool, env *compile.Env) string {
diff --git a/lib/vdl/codegen/java/util_val.go b/lib/vdl/codegen/java/util_val.go
index 6d9f054..f61f6a8 100644
--- a/lib/vdl/codegen/java/util_val.go
+++ b/lib/vdl/codegen/java/util_val.go
@@ -5,8 +5,8 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaConstVal returns the value string for the provided constant value.
diff --git a/lib/vdl/codegen/javascript/error_test.go b/lib/vdl/codegen/javascript/error_test.go
index 763ca93..226dba3 100644
--- a/lib/vdl/codegen/javascript/error_test.go
+++ b/lib/vdl/codegen/javascript/error_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestError(t *testing.T) {
@@ -13,7 +13,7 @@
NamePos: compile.NamePos{
Name: "Test",
},
- ID: "v.io/core/veyron/lib/vdl/codegen/javascript.Test",
+ ID: "v.io/x/ref/lib/vdl/codegen/javascript.Test",
RetryCode: vdl.WireRetryCodeNoRetry,
Params: []*compile.Field{
&compile.Field{
@@ -42,7 +42,7 @@
}
var names typeNames
result := generateErrorConstructor(names, e)
- expected := `module.exports.TestError = makeError('v.io/core/veyron/lib/vdl/codegen/javascript.Test', actions.NO_RETRY, {
+ expected := `module.exports.TestError = makeError('v.io/x/ref/lib/vdl/codegen/javascript.Test', actions.NO_RETRY, {
'en-US': 'english string',
'fr': 'french string',
}, [
diff --git a/lib/vdl/codegen/javascript/errors.go b/lib/vdl/codegen/javascript/errors.go
index 3d25d06..ee9f418 100644
--- a/lib/vdl/codegen/javascript/errors.go
+++ b/lib/vdl/codegen/javascript/errors.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func generateErrorConstructor(names typeNames, e *compile.ErrorDef) string {
diff --git a/lib/vdl/codegen/javascript/gen.go b/lib/vdl/codegen/javascript/gen.go
index 1434291..e60d38b 100644
--- a/lib/vdl/codegen/javascript/gen.go
+++ b/lib/vdl/codegen/javascript/gen.go
@@ -15,9 +15,9 @@
"strings"
"text/template"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
type data struct {
diff --git a/lib/vdl/codegen/javascript/import.go b/lib/vdl/codegen/javascript/import.go
index 3c0e07e..6bdd5a7 100644
--- a/lib/vdl/codegen/javascript/import.go
+++ b/lib/vdl/codegen/javascript/import.go
@@ -4,8 +4,8 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// TODO(bjornick): Merge with pkg_types.go
diff --git a/lib/vdl/codegen/javascript/pkg_types.go b/lib/vdl/codegen/javascript/pkg_types.go
index 5b79d69..c6325c4 100644
--- a/lib/vdl/codegen/javascript/pkg_types.go
+++ b/lib/vdl/codegen/javascript/pkg_types.go
@@ -5,7 +5,7 @@
"sort"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
"v.io/v23/vdl"
)
diff --git a/lib/vdl/codegen/javascript/type_test.go b/lib/vdl/codegen/javascript/type_test.go
index 7231046..bc3df73 100644
--- a/lib/vdl/codegen/javascript/type_test.go
+++ b/lib/vdl/codegen/javascript/type_test.go
@@ -4,8 +4,8 @@
"fmt"
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const unnamedTypeFieldName = "UnnamedTypeField"
diff --git a/lib/vdl/codegen/vdlgen/const.go b/lib/vdl/codegen/vdlgen/const.go
index 18faf86..df1e6da 100644
--- a/lib/vdl/codegen/vdlgen/const.go
+++ b/lib/vdl/codegen/vdlgen/const.go
@@ -6,8 +6,8 @@
"fmt"
"strconv"
- "v.io/core/veyron/lib/vdl/codegen"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/codegen"
)
// TypedConst returns the explicitly-typed vdl const corresponding to v, in the
diff --git a/lib/vdl/codegen/vdlgen/import.go b/lib/vdl/codegen/vdlgen/import.go
index 172aad7..e02b07c 100644
--- a/lib/vdl/codegen/vdlgen/import.go
+++ b/lib/vdl/codegen/vdlgen/import.go
@@ -4,7 +4,7 @@
// TODO(toddw): Add tests
import (
- "v.io/core/veyron/lib/vdl/codegen"
+ "v.io/x/ref/lib/vdl/codegen"
)
// Imports returns the vdl imports clause corresponding to imports; empty if
diff --git a/lib/vdl/codegen/vdlgen/type.go b/lib/vdl/codegen/vdlgen/type.go
index 28d6ae1..33e6169 100644
--- a/lib/vdl/codegen/vdlgen/type.go
+++ b/lib/vdl/codegen/vdlgen/type.go
@@ -6,8 +6,8 @@
"fmt"
"strings"
- "v.io/core/veyron/lib/vdl/codegen"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/codegen"
)
// Type returns t using VDL syntax, returning the qualified name if t is named,
diff --git a/lib/vdl/compile/compile.go b/lib/vdl/compile/compile.go
index 85e82af..fb07047 100644
--- a/lib/vdl/compile/compile.go
+++ b/lib/vdl/compile/compile.go
@@ -21,9 +21,9 @@
"path/filepath"
"sort"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/parse"
)
// CompilePackage compiles a list of parse.Files into a Package. Updates env
diff --git a/lib/vdl/compile/compile_test.go b/lib/vdl/compile/compile_test.go
index 2b90aaa..66e1831 100644
--- a/lib/vdl/compile/compile_test.go
+++ b/lib/vdl/compile/compile_test.go
@@ -6,9 +6,9 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestValidExportedIdent(t *testing.T) {
diff --git a/lib/vdl/compile/const.go b/lib/vdl/compile/const.go
index c749881..1e151ea 100644
--- a/lib/vdl/compile/const.go
+++ b/lib/vdl/compile/const.go
@@ -4,10 +4,10 @@
"fmt"
"math/big"
- "v.io/core/veyron/lib/vdl/opconst"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/opconst"
+ "v.io/x/ref/lib/vdl/parse"
)
// ConstDef represents a user-defined named const definition in the compiled
diff --git a/lib/vdl/compile/const_test.go b/lib/vdl/compile/const_test.go
index 7da4f05..1239cae 100644
--- a/lib/vdl/compile/const_test.go
+++ b/lib/vdl/compile/const_test.go
@@ -5,10 +5,10 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func testConstPackage(t *testing.T, name string, tpkg constPkg, env *compile.Env) *compile.Package {
diff --git a/lib/vdl/compile/error.go b/lib/vdl/compile/error.go
index cbe92b1..cf19df5 100644
--- a/lib/vdl/compile/error.go
+++ b/lib/vdl/compile/error.go
@@ -5,9 +5,9 @@
"regexp"
"strconv"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/parse"
)
// ErrorDef represents a user-defined error definition in the compiled results.
diff --git a/lib/vdl/compile/error_test.go b/lib/vdl/compile/error_test.go
index 28bfc83..ea46a5d 100644
--- a/lib/vdl/compile/error_test.go
+++ b/lib/vdl/compile/error_test.go
@@ -4,12 +4,12 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestError(t *testing.T) {
diff --git a/lib/vdl/compile/ident_test.go b/lib/vdl/compile/ident_test.go
index b2636f3..73bc059 100644
--- a/lib/vdl/compile/ident_test.go
+++ b/lib/vdl/compile/ident_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestIdentConflict(t *testing.T) {
diff --git a/lib/vdl/compile/interface.go b/lib/vdl/compile/interface.go
index 66dd3f6..a1f0962 100644
--- a/lib/vdl/compile/interface.go
+++ b/lib/vdl/compile/interface.go
@@ -1,9 +1,9 @@
package compile
import (
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/parse"
)
// compileInterfaces is the "entry point" to the rest of this file. It takes
diff --git a/lib/vdl/compile/interface_test.go b/lib/vdl/compile/interface_test.go
index c1ec8f9..bde66a9 100644
--- a/lib/vdl/compile/interface_test.go
+++ b/lib/vdl/compile/interface_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestInterface(t *testing.T) {
diff --git a/lib/vdl/compile/reserved_words.go b/lib/vdl/compile/reserved_words.go
index 0ca0f69..e73b9d3 100644
--- a/lib/vdl/compile/reserved_words.go
+++ b/lib/vdl/compile/reserved_words.go
@@ -1,7 +1,7 @@
package compile
import (
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// ReservedMode indicates which mode to perform reserved-word checking:
diff --git a/lib/vdl/compile/result.go b/lib/vdl/compile/result.go
index 6545d45..dc34b7c 100644
--- a/lib/vdl/compile/result.go
+++ b/lib/vdl/compile/result.go
@@ -6,11 +6,11 @@
"regexp"
"strings"
- "v.io/core/veyron/lib/vdl/opconst"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/opconst"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Env is the environment for compilation. It contains all errors that were
diff --git a/lib/vdl/compile/type.go b/lib/vdl/compile/type.go
index 3ab1a3f..46c9f77 100644
--- a/lib/vdl/compile/type.go
+++ b/lib/vdl/compile/type.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/parse"
)
// TypeDef represents a user-defined named type definition in the compiled
diff --git a/lib/vdl/compile/type_test.go b/lib/vdl/compile/type_test.go
index 77a2a23..8569e4d 100644
--- a/lib/vdl/compile/type_test.go
+++ b/lib/vdl/compile/type_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
const qual = "package path qualified identifier"
diff --git a/lib/vdl/parse/parse.go b/lib/vdl/parse/parse.go
index 77d8710..ba89984 100644
--- a/lib/vdl/parse/parse.go
+++ b/lib/vdl/parse/parse.go
@@ -20,7 +20,7 @@
"strings"
"text/scanner"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Opts specifies vdl parsing options.
diff --git a/lib/vdl/parse/parse_test.go b/lib/vdl/parse/parse_test.go
index f633243..5ee99f5 100644
--- a/lib/vdl/parse/parse_test.go
+++ b/lib/vdl/parse/parse_test.go
@@ -8,9 +8,9 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func pos(line, col int) parse.Pos {
diff --git a/lib/vdl/parse/result.go b/lib/vdl/parse/result.go
index dd5281e..6f2fb9b 100644
--- a/lib/vdl/parse/result.go
+++ b/lib/vdl/parse/result.go
@@ -6,7 +6,7 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Pos captures positional information during parsing.
diff --git a/lib/vdl/testdata/arith/advanced.vdl b/lib/vdl/testdata/arith/advanced.vdl
index a89403a..8d676a4 100644
--- a/lib/vdl/testdata/arith/advanced.vdl
+++ b/lib/vdl/testdata/arith/advanced.vdl
@@ -1,7 +1,7 @@
package arith
import (
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
)
// Trigonometry is an interface that specifies a couple trigonometric functions.
diff --git a/lib/vdl/testdata/arith/advanced.vdl.go b/lib/vdl/testdata/arith/advanced.vdl.go
index de93308..c972c21 100644
--- a/lib/vdl/testdata/arith/advanced.vdl.go
+++ b/lib/vdl/testdata/arith/advanced.vdl.go
@@ -10,7 +10,7 @@
"v.io/v23/ipc"
// VDL user imports
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
)
// TrigonometryClientMethods is the client interface
@@ -135,7 +135,7 @@
// descTrigonometry hides the desc to keep godoc clean.
var descTrigonometry = ipc.InterfaceDesc{
Name: "Trigonometry",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// Trigonometry is an interface that specifies a couple trigonometric functions.",
Methods: []ipc.MethodDesc{
{
@@ -270,10 +270,10 @@
// descAdvancedMath hides the desc to keep godoc clean.
var descAdvancedMath = ipc.InterfaceDesc{
Name: "AdvancedMath",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios.",
Embeds: []ipc.EmbedDesc{
- {"Trigonometry", "v.io/core/veyron/lib/vdl/testdata/arith", "// Trigonometry is an interface that specifies a couple trigonometric functions."},
- {"Exp", "v.io/core/veyron/lib/vdl/testdata/arith/exp", ``},
+ {"Trigonometry", "v.io/x/ref/lib/vdl/testdata/arith", "// Trigonometry is an interface that specifies a couple trigonometric functions."},
+ {"Exp", "v.io/x/ref/lib/vdl/testdata/arith/exp", ``},
},
}
diff --git a/lib/vdl/testdata/arith/arith.vdl b/lib/vdl/testdata/arith/arith.vdl
index 8cfc3be..2554222 100644
--- a/lib/vdl/testdata/arith/arith.vdl
+++ b/lib/vdl/testdata/arith/arith.vdl
@@ -25,7 +25,7 @@
// Test the import mechanism.
import (
- "v.io/core/veyron/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/testdata/base"
)
// Constants.
diff --git a/lib/vdl/testdata/arith/arith.vdl.go b/lib/vdl/testdata/arith/arith.vdl.go
index 6df5088..e8324e1 100644
--- a/lib/vdl/testdata/arith/arith.vdl.go
+++ b/lib/vdl/testdata/arith/arith.vdl.go
@@ -35,8 +35,8 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
- "v.io/core/veyron/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/base"
)
// Yes shows that bools may be untyped.
@@ -491,7 +491,7 @@
// descArith hides the desc to keep godoc clean.
var descArith = ipc.InterfaceDesc{
Name: "Arith",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error.",
Methods: []ipc.MethodDesc{
{
@@ -851,10 +851,10 @@
// descCalculator hides the desc to keep godoc clean.
var descCalculator = ipc.InterfaceDesc{
Name: "Calculator",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Embeds: []ipc.EmbedDesc{
- {"Arith", "v.io/core/veyron/lib/vdl/testdata/arith", "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error."},
- {"AdvancedMath", "v.io/core/veyron/lib/vdl/testdata/arith", "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios."},
+ {"Arith", "v.io/x/ref/lib/vdl/testdata/arith", "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error."},
+ {"AdvancedMath", "v.io/x/ref/lib/vdl/testdata/arith", "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios."},
},
Methods: []ipc.MethodDesc{
{
diff --git a/lib/vdl/testdata/arith/exp/exp.vdl.go b/lib/vdl/testdata/arith/exp/exp.vdl.go
index 07f15ee..a808cbc 100644
--- a/lib/vdl/testdata/arith/exp/exp.vdl.go
+++ b/lib/vdl/testdata/arith/exp/exp.vdl.go
@@ -115,7 +115,7 @@
// descExp hides the desc to keep godoc clean.
var descExp = ipc.InterfaceDesc{
Name: "Exp",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith/exp",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith/exp",
Methods: []ipc.MethodDesc{
{
Name: "Exp",
diff --git a/lib/vdl/testdata/base/base.vdl.go b/lib/vdl/testdata/base/base.vdl.go
index 820c537..f3f0124 100644
--- a/lib/vdl/testdata/base/base.vdl.go
+++ b/lib/vdl/testdata/base/base.vdl.go
@@ -19,91 +19,91 @@
type NamedBool bool
func (NamedBool) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedBool"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedBool"
}) {
}
type NamedByte byte
func (NamedByte) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedByte"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedByte"
}) {
}
type NamedUint16 uint16
func (NamedUint16) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint16"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint16"
}) {
}
type NamedUint32 uint32
func (NamedUint32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint32"
}) {
}
type NamedUint64 uint64
func (NamedUint64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint64"
}) {
}
type NamedInt16 int16
func (NamedInt16) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt16"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt16"
}) {
}
type NamedInt32 int32
func (NamedInt32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt32"
}) {
}
type NamedInt64 int64
func (NamedInt64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt64"
}) {
}
type NamedFloat32 float32
func (NamedFloat32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedFloat32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedFloat32"
}) {
}
type NamedFloat64 float64
func (NamedFloat64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedFloat64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedFloat64"
}) {
}
type NamedComplex64 complex64
func (NamedComplex64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedComplex64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedComplex64"
}) {
}
type NamedComplex128 complex128
func (NamedComplex128) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedComplex128"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedComplex128"
}) {
}
type NamedString string
func (NamedString) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedString"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedString"
}) {
}
@@ -155,7 +155,7 @@
}
func (NamedEnum) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedEnum"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedEnum"
Enum struct{ A, B, C string }
}) {
}
@@ -163,28 +163,28 @@
type NamedArray [2]bool
func (NamedArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedArray"
}) {
}
type NamedList []uint32
func (NamedList) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedList"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedList"
}) {
}
type NamedSet map[string]struct{}
func (NamedSet) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedSet"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedSet"
}) {
}
type NamedMap map[string]float32
func (NamedMap) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedMap"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedMap"
}) {
}
@@ -195,7 +195,7 @@
}
func (NamedStruct) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedStruct"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedStruct"
}) {
}
@@ -219,7 +219,7 @@
NamedUnionC struct{ Value int32 }
// __NamedUnionReflect describes the NamedUnion union type.
__NamedUnionReflect struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUnion"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUnion"
Type NamedUnion
Union struct {
A NamedUnionA
@@ -279,7 +279,7 @@
}
func (Scalars) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Scalars"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Scalars"
}) {
}
@@ -314,14 +314,14 @@
}
func (KeyScalars) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.KeyScalars"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.KeyScalars"
}) {
}
type ScalarsArray [2]Scalars
func (ScalarsArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.ScalarsArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.ScalarsArray"
}) {
}
@@ -335,14 +335,14 @@
}
func (Composites) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Composites"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Composites"
}) {
}
type CompositesArray [2]Composites
func (CompositesArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.CompositesArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.CompositesArray"
}) {
}
@@ -355,7 +355,7 @@
}
func (CompComp) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.CompComp"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.CompComp"
}) {
}
@@ -367,7 +367,7 @@
}
func (NestedArgs) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NestedArgs"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NestedArgs"
}) {
}
@@ -378,7 +378,7 @@
}
func (Args) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Args"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Args"
}) {
}
@@ -557,11 +557,11 @@
var CTOAny = vdl.AnyType
var (
- ErrNoParams1 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.NoParams1", verror.NoRetry, "{1:}{2:} en msg")
- ErrNoParams2 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.NoParams2", verror.RetryRefetch, "{1:}{2:} en msg")
- ErrWithParams1 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.WithParams1", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
- ErrWithParams2 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.WithParams2", verror.RetryRefetch, "{1:}{2:} en x={3} y={4}")
- errNotExported = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.notExported", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
+ ErrNoParams1 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams1", verror.NoRetry, "{1:}{2:} en msg")
+ ErrNoParams2 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams2", verror.RetryRefetch, "{1:}{2:} en msg")
+ ErrWithParams1 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.WithParams1", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
+ ErrWithParams2 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.WithParams2", verror.RetryRefetch, "{1:}{2:} en x={3} y={4}")
+ errNotExported = verror.Register("v.io/x/ref/lib/vdl/testdata/base.notExported", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
)
func init() {
@@ -923,7 +923,7 @@
// descServiceA hides the desc to keep godoc clean.
var descServiceA = ipc.InterfaceDesc{
Name: "ServiceA",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/base",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/base",
Methods: []ipc.MethodDesc{
{
Name: "MethodA1",
@@ -1196,9 +1196,9 @@
// descServiceB hides the desc to keep godoc clean.
var descServiceB = ipc.InterfaceDesc{
Name: "ServiceB",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/base",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/base",
Embeds: []ipc.EmbedDesc{
- {"ServiceA", "v.io/core/veyron/lib/vdl/testdata/base", ``},
+ {"ServiceA", "v.io/x/ref/lib/vdl/testdata/base", ``},
},
Methods: []ipc.MethodDesc{
{
diff --git a/lib/vdl/testdata/nativedep/nativedep.vdl b/lib/vdl/testdata/nativedep/nativedep.vdl
index 8715050..de10fe8 100644
--- a/lib/vdl/testdata/nativedep/nativedep.vdl
+++ b/lib/vdl/testdata/nativedep/nativedep.vdl
@@ -1,6 +1,6 @@
package nativedep
-import "v.io/core/veyron/lib/vdl/testdata/nativetest"
+import "v.io/x/ref/lib/vdl/testdata/nativetest"
type All struct {
A nativetest.WireString
diff --git a/lib/vdl/testdata/nativedep/nativedep.vdl.go b/lib/vdl/testdata/nativedep/nativedep.vdl.go
index ded3c95..ac88410 100644
--- a/lib/vdl/testdata/nativedep/nativedep.vdl.go
+++ b/lib/vdl/testdata/nativedep/nativedep.vdl.go
@@ -9,7 +9,7 @@
// VDL user imports
"time"
- _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+ _ "v.io/x/ref/lib/vdl/testdata/nativetest"
"v.io/v23/vdl/testdata/nativetest"
)
@@ -22,7 +22,7 @@
}
func (All) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativedep.All"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativedep.All"
}) {
}
diff --git a/lib/vdl/testdata/nativedep2/nativedep2.vdl b/lib/vdl/testdata/nativedep2/nativedep2.vdl
index f28e5d1..c9a3553 100644
--- a/lib/vdl/testdata/nativedep2/nativedep2.vdl
+++ b/lib/vdl/testdata/nativedep2/nativedep2.vdl
@@ -4,11 +4,11 @@
// imports right. In particular, the generated file has no code dependencies on
// nativetest, but should have two imports:
// "time"
-// _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+// _ "v.io/x/ref/lib/vdl/testdata/nativetest"
//
// The underscore dependency is added to ensure that nativetest.WireTime is
// registered whenever this package is used, so that the WireTime<->time.Time
// mapping is known by the vdl package.
-import "v.io/core/veyron/lib/vdl/testdata/nativetest"
+import "v.io/x/ref/lib/vdl/testdata/nativetest"
type MyTime nativetest.WireTime
diff --git a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
index d081408..719dd40 100644
--- a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
+++ b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
@@ -9,13 +9,13 @@
// VDL user imports
"time"
- _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+ _ "v.io/x/ref/lib/vdl/testdata/nativetest"
)
type MyTime time.Time
func (MyTime) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativedep2.MyTime"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativedep2.MyTime"
}) {
}
diff --git a/lib/vdl/testdata/nativetest/nativetest.vdl.go b/lib/vdl/testdata/nativetest/nativetest.vdl.go
index f9bdc99..878d370 100644
--- a/lib/vdl/testdata/nativetest/nativetest.vdl.go
+++ b/lib/vdl/testdata/nativetest/nativetest.vdl.go
@@ -16,35 +16,35 @@
type WireString int32
func (WireString) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireString"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireString"
}) {
}
type WireMapStringInt int32
func (WireMapStringInt) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireMapStringInt"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt"
}) {
}
type WireTime int32
func (WireTime) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireTime"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireTime"
}) {
}
type WireSamePkg int32
func (WireSamePkg) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireSamePkg"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg"
}) {
}
type WireMultiImport int32
func (WireMultiImport) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireMultiImport"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport"
}) {
}
@@ -57,7 +57,7 @@
}
func (WireAll) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireAll"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireAll"
}) {
}
diff --git a/lib/vdl/testdata/nativetest/otherfile.vdl.go b/lib/vdl/testdata/nativetest/otherfile.vdl.go
index c56c1f1..301f84a 100644
--- a/lib/vdl/testdata/nativetest/otherfile.vdl.go
+++ b/lib/vdl/testdata/nativetest/otherfile.vdl.go
@@ -15,7 +15,7 @@
type ignoreme string
func (ignoreme) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.ignoreme"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.ignoreme"
}) {
}
diff --git a/lib/vdl/vdltest/vdltest.go b/lib/vdl/vdltest/vdltest.go
index 7dc5c41..36e3841 100644
--- a/lib/vdl/vdltest/vdltest.go
+++ b/lib/vdl/vdltest/vdltest.go
@@ -8,8 +8,8 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// ExpectPass makes sure errs has no errors.
diff --git a/lib/websocket/dialer.go b/lib/websocket/dialer.go
index 8b76f3e..02ea6c6 100644
--- a/lib/websocket/dialer.go
+++ b/lib/websocket/dialer.go
@@ -10,7 +10,7 @@
"github.com/gorilla/websocket"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
)
func Dial(protocol, address string, timeout time.Duration) (net.Conn, error) {
diff --git a/lib/websocket/hybrid.go b/lib/websocket/hybrid.go
index 77f11b2..9928e30 100644
--- a/lib/websocket/hybrid.go
+++ b/lib/websocket/hybrid.go
@@ -4,7 +4,7 @@
"net"
"time"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
)
// TODO(jhahn): Figure out a way for this mapping to be shared.
diff --git a/lib/websocket/listener.go b/lib/websocket/listener.go
index 8405a39..e2a9476 100644
--- a/lib/websocket/listener.go
+++ b/lib/websocket/listener.go
@@ -14,8 +14,8 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/tcputil"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/lib/tcputil"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
var errListenerIsClosed = errors.New("Listener has been Closed")
diff --git a/lib/websocket/v23_internal_test.go b/lib/websocket/v23_internal_test.go
index 25cc4a5..f942dfa 100644
--- a/lib/websocket/v23_internal_test.go
+++ b/lib/websocket/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/lib/websocket/ws_test.go b/lib/websocket/ws_test.go
index 172a68d..97d59da 100644
--- a/lib/websocket/ws_test.go
+++ b/lib/websocket/ws_test.go
@@ -7,7 +7,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func packetTester(t *testing.T, dialer ipc.DialerFunc, listener ipc.ListenerFunc, txProtocol, rxProtocol string) {
diff --git a/profiles/chrome/chromeinit.go b/profiles/chrome/chromeinit.go
index af7481b..45f2511 100644
--- a/profiles/chrome/chromeinit.go
+++ b/profiles/chrome/chromeinit.go
@@ -10,12 +10,12 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/websocket"
- "v.io/core/veyron/profiles/internal"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/wsh_nacl"
- grt "v.io/core/veyron/runtimes/google/rt"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/websocket"
+ "v.io/x/ref/profiles/internal"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/wsh_nacl"
+ grt "v.io/x/ref/runtimes/google/rt"
)
var commonFlags *flags.Flags
diff --git a/profiles/fake/fake_test.go b/profiles/fake/fake_test.go
index c81fc16..7952552 100644
--- a/profiles/fake/fake_test.go
+++ b/profiles/fake/fake_test.go
@@ -5,7 +5,7 @@
"v.io/v23"
- _ "v.io/core/veyron/profiles/fake"
+ _ "v.io/x/ref/profiles/fake"
)
// Ensure that the fake profile can be used to initialize a fake runtime.
diff --git a/profiles/fake/runtime.go b/profiles/fake/runtime.go
index 19640e5..6a2e458 100644
--- a/profiles/fake/runtime.go
+++ b/profiles/fake/runtime.go
@@ -8,7 +8,7 @@
"v.io/v23/context"
"v.io/v23/security"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
type contextKey int
diff --git a/profiles/gce/init.go b/profiles/gce/init.go
index 4c1a3a4..663f07b 100644
--- a/profiles/gce/init.go
+++ b/profiles/gce/init.go
@@ -14,16 +14,16 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/appcycle"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/websocket"
- "v.io/core/veyron/profiles/internal"
- "v.io/core/veyron/profiles/internal/gce"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/wsh"
- grt "v.io/core/veyron/runtimes/google/rt"
+ "v.io/x/ref/lib/appcycle"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/websocket"
+ "v.io/x/ref/profiles/internal"
+ "v.io/x/ref/profiles/internal/gce"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/wsh"
+ grt "v.io/x/ref/runtimes/google/rt"
)
var commonFlags *flags.Flags
diff --git a/profiles/genericinit.go b/profiles/genericinit.go
index 430264a..1758b8d 100644
--- a/profiles/genericinit.go
+++ b/profiles/genericinit.go
@@ -8,14 +8,14 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/appcycle"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/websocket"
- "v.io/core/veyron/profiles/internal"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/wsh"
- grt "v.io/core/veyron/runtimes/google/rt"
+ "v.io/x/ref/lib/appcycle"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/websocket"
+ "v.io/x/ref/profiles/internal"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/wsh"
+ grt "v.io/x/ref/runtimes/google/rt"
)
var commonFlags *flags.Flags
diff --git a/profiles/internal/GO.PACKAGE b/profiles/internal/GO.PACKAGE
index 6322ad9..eaa997e 100644
--- a/profiles/internal/GO.PACKAGE
+++ b/profiles/internal/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/runtimes/google/ipc", "comment":"temporarily allowing dependency from veyron/runtimes/google/ipc"}
+ {"allow": "v.io/x/ref/runtimes/google/ipc", "comment":"temporarily allowing dependency from veyron/runtimes/google/ipc"}
]
}
}
diff --git a/profiles/internal/gce_linux.go b/profiles/internal/gce_linux.go
index 2b42945..c03524d 100644
--- a/profiles/internal/gce_linux.go
+++ b/profiles/internal/gce_linux.go
@@ -7,7 +7,7 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/profiles/internal/gce"
+ "v.io/x/ref/profiles/internal/gce"
)
// GCEPublicAddress returns the public IP address of the GCE instance
diff --git a/profiles/internal/util.go b/profiles/internal/util.go
index 8991c0d..90bac92 100644
--- a/profiles/internal/util.go
+++ b/profiles/internal/util.go
@@ -8,9 +8,9 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netstate"
+ "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netstate"
)
// ParseFlags parses all registered flags taking into account overrides from other
diff --git a/profiles/roaming/net_watcher.go b/profiles/roaming/net_watcher.go
index 79271b4..89f0e97 100644
--- a/profiles/roaming/net_watcher.go
+++ b/profiles/roaming/net_watcher.go
@@ -9,8 +9,8 @@
"v.io/v23"
"v.io/v23/config"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/profiles/roaming"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/profiles/roaming"
)
func main() {
diff --git a/profiles/roaming/print_addrs.go b/profiles/roaming/print_addrs.go
index 2bef89d..98a82cd 100644
--- a/profiles/roaming/print_addrs.go
+++ b/profiles/roaming/print_addrs.go
@@ -4,7 +4,7 @@
import (
"fmt"
- "v.io/core/veyron/lib/netstate"
+ "v.io/x/ref/lib/netstate"
)
func main() {
diff --git a/profiles/roaming/roaming_server.go b/profiles/roaming/roaming_server.go
index 3845ae8..c029376 100644
--- a/profiles/roaming/roaming_server.go
+++ b/profiles/roaming/roaming_server.go
@@ -10,7 +10,7 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/roaming"
+ _ "v.io/x/ref/profiles/roaming"
)
func main() {
diff --git a/profiles/roaming/roaminginit.go b/profiles/roaming/roaminginit.go
index 6adc456..bc280fb 100644
--- a/profiles/roaming/roaminginit.go
+++ b/profiles/roaming/roaminginit.go
@@ -19,20 +19,20 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/appcycle"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netconfig"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/websocket"
- "v.io/core/veyron/profiles/internal"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/wsh"
- grt "v.io/core/veyron/runtimes/google/rt"
- "v.io/core/veyron/services/mgmt/debug"
+ "v.io/x/ref/lib/appcycle"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netconfig"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/websocket"
+ "v.io/x/ref/profiles/internal"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/wsh"
+ grt "v.io/x/ref/runtimes/google/rt"
+ "v.io/x/ref/services/mgmt/debug"
// TODO(cnicolaou,ashankar): move this into flags.
- sflag "v.io/core/veyron/security/flag"
+ sflag "v.io/x/ref/security/flag"
)
const (
diff --git a/profiles/static/staticinit.go b/profiles/static/staticinit.go
index 047fec7..d28e3be 100644
--- a/profiles/static/staticinit.go
+++ b/profiles/static/staticinit.go
@@ -8,19 +8,19 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/appcycle"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/websocket"
- "v.io/core/veyron/profiles/internal"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/wsh"
- grt "v.io/core/veyron/runtimes/google/rt"
- "v.io/core/veyron/services/mgmt/debug"
+ "v.io/x/ref/lib/appcycle"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/websocket"
+ "v.io/x/ref/profiles/internal"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/wsh"
+ grt "v.io/x/ref/runtimes/google/rt"
+ "v.io/x/ref/services/mgmt/debug"
// TODO(cnicolaou,ashankar): move this into flags.
- sflag "v.io/core/veyron/security/flag"
+ sflag "v.io/x/ref/security/flag"
)
var commonFlags *flags.Flags
diff --git a/runtimes/GO.PACKAGE b/runtimes/GO.PACKAGE
index b128dc2..3ceb772 100644
--- a/runtimes/GO.PACKAGE
+++ b/runtimes/GO.PACKAGE
@@ -1,11 +1,11 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/runtimes/..."},
+ {"allow": "v.io/x/ref/runtimes/..."},
{"allow": "v.io/v23/rt/..."},
- {"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/services/...", "comment": "temporarily allowing dependency from services"},
+ {"allow": "v.io/x/ref/lib/...", "comment":"temporarily allowing dependency from lib"},
+ {"allow": "v.io/x/ref/profiles/...", "comment":"temporarily allowing dependency from profiles"},
+ {"allow": "v.io/x/ref/services/...", "comment": "temporarily allowing dependency from services"},
{"deny": "..."}
]
}
diff --git a/runtimes/google/ipc/benchmark/README.txt b/runtimes/google/ipc/benchmark/README.txt
index d44723d..8ca31d3 100644
--- a/runtimes/google/ipc/benchmark/README.txt
+++ b/runtimes/google/ipc/benchmark/README.txt
@@ -23,7 +23,7 @@
overhead is excluded.
$ v23 go test -bench=. -timeout=1h -cpu=1 -benchtime=5s \
- v.io/core/veyron/runtimes/google/ipc/benchmark
+ v.io/x/ref/runtimes/google/ipc/benchmark
PASS
Benchmark____1B 1000 8301357 ns/op 0.00 MB/s
--- Histogram (unit: ms)
diff --git a/runtimes/google/ipc/benchmark/benchmark.vdl.go b/runtimes/google/ipc/benchmark/benchmark.vdl.go
index 5eb526f..7865dd1 100644
--- a/runtimes/google/ipc/benchmark/benchmark.vdl.go
+++ b/runtimes/google/ipc/benchmark/benchmark.vdl.go
@@ -246,7 +246,7 @@
// descBenchmark hides the desc to keep godoc clean.
var descBenchmark = ipc.InterfaceDesc{
Name: "Benchmark",
- PkgPath: "v.io/core/veyron/runtimes/google/ipc/benchmark",
+ PkgPath: "v.io/x/ref/runtimes/google/ipc/benchmark",
Methods: []ipc.MethodDesc{
{
Name: "Echo",
diff --git a/runtimes/google/ipc/benchmark/benchmark/main.go b/runtimes/google/ipc/benchmark/benchmark/main.go
index deba0da..147c827 100644
--- a/runtimes/google/ipc/benchmark/benchmark/main.go
+++ b/runtimes/google/ipc/benchmark/benchmark/main.go
@@ -8,9 +8,9 @@
"testing"
"time"
- tbm "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ tbm "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
"v.io/v23"
"v.io/x/lib/vlog"
diff --git a/runtimes/google/ipc/benchmark/benchmark_test.go b/runtimes/google/ipc/benchmark/benchmark_test.go
index e5d2f3a..4107277 100644
--- a/runtimes/google/ipc/benchmark/benchmark_test.go
+++ b/runtimes/google/ipc/benchmark/benchmark_test.go
@@ -7,10 +7,10 @@
"v.io/v23"
"v.io/v23/context"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
)
var (
diff --git a/runtimes/google/ipc/benchmark/benchmarkd/main.go b/runtimes/google/ipc/benchmark/benchmarkd/main.go
index 94ea0d1..92db8b9 100644
--- a/runtimes/google/ipc/benchmark/benchmarkd/main.go
+++ b/runtimes/google/ipc/benchmark/benchmarkd/main.go
@@ -5,9 +5,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/runtimes/google/ipc/benchmark/internal"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/runtimes/google/ipc/benchmark/internal"
)
func main() {
diff --git a/runtimes/google/ipc/benchmark/glob/glob_test.go b/runtimes/google/ipc/benchmark/glob/glob_test.go
index 3683a8d..1889c0c 100644
--- a/runtimes/google/ipc/benchmark/glob/glob_test.go
+++ b/runtimes/google/ipc/benchmark/glob/glob_test.go
@@ -10,8 +10,8 @@
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func TestNothing(t *testing.T) {
diff --git a/runtimes/google/ipc/benchmark/internal/client.go b/runtimes/google/ipc/benchmark/internal/client.go
index 7918b60..9b109b5 100644
--- a/runtimes/google/ipc/benchmark/internal/client.go
+++ b/runtimes/google/ipc/benchmark/internal/client.go
@@ -9,8 +9,8 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- tbm "v.io/core/veyron/lib/testutil/benchmark"
- "v.io/core/veyron/runtimes/google/ipc/benchmark"
+ tbm "v.io/x/ref/lib/testutil/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/benchmark"
)
// CallEcho calls 'Echo' method 'iterations' times with the given payload size.
diff --git a/runtimes/google/ipc/benchmark/internal/server.go b/runtimes/google/ipc/benchmark/internal/server.go
index 1d20f37..5549cb6 100644
--- a/runtimes/google/ipc/benchmark/internal/server.go
+++ b/runtimes/google/ipc/benchmark/internal/server.go
@@ -1,14 +1,14 @@
package internal
import (
- "v.io/core/veyron/security/flag"
+ "v.io/x/ref/security/flag"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/benchmark"
)
type impl struct {
diff --git a/runtimes/google/ipc/blessings_cache.go b/runtimes/google/ipc/blessings_cache.go
index 06ec74b..20de0cc 100644
--- a/runtimes/google/ipc/blessings_cache.go
+++ b/runtimes/google/ipc/blessings_cache.go
@@ -6,9 +6,9 @@
"reflect"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
// clientEncodeBlessings gets or inserts the blessings into the cache.
diff --git a/runtimes/google/ipc/cancel_test.go b/runtimes/google/ipc/cancel_test.go
index 73321da..50933ed 100644
--- a/runtimes/google/ipc/cancel_test.go
+++ b/runtimes/google/ipc/cancel_test.go
@@ -3,16 +3,16 @@
import (
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/naming/ns"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type fakeAuthorizer int
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index e2967c5..72185cb 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -11,7 +11,6 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/ipc"
@@ -24,14 +23,15 @@
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc"
// TODO(cnicolaou): for local errors, automatically assign a new 'id',
// don't use pkgPath etc. Can then move them into being defined on each line
diff --git a/runtimes/google/ipc/client_test.go b/runtimes/google/ipc/client_test.go
index 292a29a..3913b9f 100644
--- a/runtimes/google/ipc/client_test.go
+++ b/runtimes/google/ipc/client_test.go
@@ -18,14 +18,14 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "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"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func init() {
diff --git a/runtimes/google/ipc/debug_test.go b/runtimes/google/ipc/debug_test.go
index d291e35..f08f957 100644
--- a/runtimes/google/ipc/debug_test.go
+++ b/runtimes/google/ipc/debug_test.go
@@ -11,12 +11,12 @@
"v.io/v23/options"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/stats"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- "v.io/core/veyron/services/mgmt/debug"
+ "v.io/x/ref/lib/stats"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/services/mgmt/debug"
)
func TestDebugServer(t *testing.T) {
diff --git a/runtimes/google/ipc/default_authorizer_test.go b/runtimes/google/ipc/default_authorizer_test.go
index ba4ecb5..c018f27 100644
--- a/runtimes/google/ipc/default_authorizer_test.go
+++ b/runtimes/google/ipc/default_authorizer_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
"v.io/v23"
"v.io/v23/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
func TestDefaultAuthorizer(t *testing.T) {
diff --git a/runtimes/google/ipc/discharges.go b/runtimes/google/ipc/discharges.go
index 946f78f..ac8abdd 100644
--- a/runtimes/google/ipc/discharges.go
+++ b/runtimes/google/ipc/discharges.go
@@ -4,7 +4,7 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
"v.io/v23/context"
"v.io/v23/ipc"
diff --git a/runtimes/google/ipc/errors.vdl.go b/runtimes/google/ipc/errors.vdl.go
index be47167..5210326 100644
--- a/runtimes/google/ipc/errors.vdl.go
+++ b/runtimes/google/ipc/errors.vdl.go
@@ -14,15 +14,15 @@
)
var (
- ErrInvalidBlessings = verror.Register("v.io/core/veyron/runtimes/google/ipc.InvalidBlessings", verror.NoRetry, "{1:}{2:} All valid blessings for this request: {3} (rejected {4}) are disallowed by the policy {5} (rejected {6})")
+ ErrInvalidBlessings = verror.Register("v.io/x/ref/runtimes/google/ipc.InvalidBlessings", verror.NoRetry, "{1:}{2:} All valid blessings for this request: {3} (rejected {4}) are disallowed by the policy {5} (rejected {6})")
// Internal errors.
- errBadRequest = verror.Register("v.io/core/veyron/runtimes/google/ipc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
- errBadNumInputArgs = verror.Register("v.io/core/veyron/runtimes/google/ipc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
- errBadInputArg = verror.Register("v.io/core/veyron/runtimes/google/ipc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
- errBadBlessings = verror.Register("v.io/core/veyron/runtimes/google/ipc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
- errBadBlessingsCache = verror.Register("v.io/core/veyron/runtimes/google/ipc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
- errBadDischarge = verror.Register("v.io/core/veyron/runtimes/google/ipc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
- errBadAuth = verror.Register("v.io/core/veyron/runtimes/google/ipc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
+ errBadRequest = verror.Register("v.io/x/ref/runtimes/google/ipc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
+ errBadNumInputArgs = verror.Register("v.io/x/ref/runtimes/google/ipc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
+ errBadInputArg = verror.Register("v.io/x/ref/runtimes/google/ipc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
+ errBadBlessings = verror.Register("v.io/x/ref/runtimes/google/ipc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
+ errBadBlessingsCache = verror.Register("v.io/x/ref/runtimes/google/ipc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
+ errBadDischarge = verror.Register("v.io/x/ref/runtimes/google/ipc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
+ errBadAuth = verror.Register("v.io/x/ref/runtimes/google/ipc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
)
func init() {
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index de39fa7..a9c9702 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -15,7 +15,6 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -28,19 +27,20 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/glob_test.go b/runtimes/google/ipc/glob_test.go
index 39d9a14..57ce06f 100644
--- a/runtimes/google/ipc/glob_test.go
+++ b/runtimes/google/ipc/glob_test.go
@@ -12,9 +12,9 @@
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/core/veyron/lib/glob"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/glob"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func startServer(ctx *context.T, tree *node) (string, func(), error) {
diff --git a/runtimes/google/ipc/options.go b/runtimes/google/ipc/options.go
index 59ed649..4dcb034 100644
--- a/runtimes/google/ipc/options.go
+++ b/runtimes/google/ipc/options.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/naming"
diff --git a/runtimes/google/ipc/protocols/tcp/init.go b/runtimes/google/ipc/protocols/tcp/init.go
index 653ee91..92fb5b9 100644
--- a/runtimes/google/ipc/protocols/tcp/init.go
+++ b/runtimes/google/ipc/protocols/tcp/init.go
@@ -4,7 +4,7 @@
"net"
"time"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
diff --git a/runtimes/google/ipc/protocols/ws/init.go b/runtimes/google/ipc/protocols/ws/init.go
index f2d9faf..fc01478 100644
--- a/runtimes/google/ipc/protocols/ws/init.go
+++ b/runtimes/google/ipc/protocols/ws/init.go
@@ -3,7 +3,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/wsh/init.go b/runtimes/google/ipc/protocols/wsh/init.go
index 86e6e33..b7eb9b5 100644
--- a/runtimes/google/ipc/protocols/wsh/init.go
+++ b/runtimes/google/ipc/protocols/wsh/init.go
@@ -5,7 +5,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/wsh_nacl/init.go b/runtimes/google/ipc/protocols/wsh_nacl/init.go
index 426cc51..82cfd48 100644
--- a/runtimes/google/ipc/protocols/wsh_nacl/init.go
+++ b/runtimes/google/ipc/protocols/wsh_nacl/init.go
@@ -5,7 +5,7 @@
import (
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/proxy_test.go b/runtimes/google/ipc/proxy_test.go
index d3fa3c5..7aa3da1 100644
--- a/runtimes/google/ipc/proxy_test.go
+++ b/runtimes/google/ipc/proxy_test.go
@@ -18,18 +18,18 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags"
- "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"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
func testContext() *context.T {
diff --git a/runtimes/google/ipc/reserved.go b/runtimes/google/ipc/reserved.go
index 5dbcc81..ff3f63f 100644
--- a/runtimes/google/ipc/reserved.go
+++ b/runtimes/google/ipc/reserved.go
@@ -13,7 +13,7 @@
"v.io/v23/vdlroot/signature"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
)
// reservedInvoker returns a special invoker for reserved methods. This invoker
diff --git a/runtimes/google/ipc/resolve_test.go b/runtimes/google/ipc/resolve_test.go
index 973ed3b..1b93727 100644
--- a/runtimes/google/ipc/resolve_test.go
+++ b/runtimes/google/ipc/resolve_test.go
@@ -8,12 +8,12 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/modules/core"
- "v.io/core/veyron/lib/testutil"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func startMT(t *testing.T, sh *modules.Shell) string {
diff --git a/runtimes/google/ipc/results_store_test.go b/runtimes/google/ipc/results_store_test.go
index c41bdec..6af36b7 100644
--- a/runtimes/google/ipc/results_store_test.go
+++ b/runtimes/google/ipc/results_store_test.go
@@ -5,7 +5,7 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
func randomKeys() []uint64 {
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 778cbd0..1f40e83 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -10,7 +10,6 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/config"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -24,13 +23,14 @@
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- inaming "v.io/core/veyron/runtimes/google/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
// TODO(cnicolaou): finish verror2 -> verror transition, in particular
// for communicating from server to client.
diff --git a/runtimes/google/ipc/server_authorizer_test.go b/runtimes/google/ipc/server_authorizer_test.go
index 05c9d47..1440dbd 100644
--- a/runtimes/google/ipc/server_authorizer_test.go
+++ b/runtimes/google/ipc/server_authorizer_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
"v.io/v23/options"
"v.io/v23/security"
diff --git a/runtimes/google/ipc/server_test.go b/runtimes/google/ipc/server_test.go
index cf3af0a..7835d06 100644
--- a/runtimes/google/ipc/server_test.go
+++ b/runtimes/google/ipc/server_test.go
@@ -15,12 +15,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/netstate"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- inaming "v.io/core/veyron/runtimes/google/naming"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/lib/netstate"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
)
type noMethodsType struct{ Field string }
diff --git a/runtimes/google/ipc/signature_test.go b/runtimes/google/ipc/signature_test.go
index c8079a8..5d35fd6 100644
--- a/runtimes/google/ipc/signature_test.go
+++ b/runtimes/google/ipc/signature_test.go
@@ -13,8 +13,8 @@
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func startSigServer(ctx *context.T, sig sigImpl) (string, func(), error) {
diff --git a/runtimes/google/ipc/sort_endpoints.go b/runtimes/google/ipc/sort_endpoints.go
index cb7f6d5..286a0ac 100644
--- a/runtimes/google/ipc/sort_endpoints.go
+++ b/runtimes/google/ipc/sort_endpoints.go
@@ -8,9 +8,9 @@
"v.io/v23/naming"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
type errorAccumulator struct {
diff --git a/runtimes/google/ipc/stats.go b/runtimes/google/ipc/stats.go
index f07561e..cbc6315 100644
--- a/runtimes/google/ipc/stats.go
+++ b/runtimes/google/ipc/stats.go
@@ -4,9 +4,9 @@
"sync"
"time"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/lib/stats/histogram"
"v.io/v23/naming"
)
diff --git a/runtimes/google/ipc/stream/benchmark/RESULTS.txt b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
index 85c78ee..d8b8e5f 100644
--- a/runtimes/google/ipc/stream/benchmark/RESULTS.txt
+++ b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
@@ -2,7 +2,7 @@
Platform: Intel(R) Xeon(R) CPU E5-2689 0 @ 2.60GHz, 66114888KB Memory
$ v23 go test -bench=. -cpu=1 -benchtime=5s \
- v.io/core/veyron/runtimes/google/ipc/stream/benchmark
+ v.io/x/ref/runtimes/google/ipc/stream/benchmark
Benchmark_dial_VIF 500000 14292 ns/op
--- Histogram (unit: s)
diff --git a/runtimes/google/ipc/stream/benchmark/benchmark_test.go b/runtimes/google/ipc/stream/benchmark/benchmark_test.go
index 7122cf7..4b62a27 100644
--- a/runtimes/google/ipc/stream/benchmark/benchmark_test.go
+++ b/runtimes/google/ipc/stream/benchmark/benchmark_test.go
@@ -4,7 +4,7 @@
"os"
"testing"
- "v.io/core/veyron/lib/testutil/benchmark"
+ "v.io/x/ref/lib/testutil/benchmark"
)
// A single empty test to avoid:
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vc.go b/runtimes/google/ipc/stream/benchmark/dial_vc.go
index 489be38..6eea01b 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vc.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vc.go
@@ -4,9 +4,9 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/lib/testutil/benchmark"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
"v.io/v23/naming"
"v.io/v23/options"
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vif.go b/runtimes/google/ipc/stream/benchmark/dial_vif.go
index 62b6bd5..f0524e2 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vif.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vif.go
@@ -5,8 +5,8 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/lib/testutil/benchmark"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
"v.io/v23/naming"
"v.io/v23/options"
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_flow.go b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
index 8ab5def..02c1cd8 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_flow.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
@@ -4,11 +4,11 @@
"io"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/options"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
const (
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_tls.go b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
index e727fe3..ed937fb 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_tls.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
@@ -6,7 +6,7 @@
"net"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
)
func benchmarkTLS(b *testing.B, nConns int) {
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_ws.go b/runtimes/google/ipc/stream/benchmark/throughput_ws.go
index aa07582..551a0fb 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_ws.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_ws.go
@@ -5,7 +5,7 @@
"net"
"testing"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
// benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_wsh.go b/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
index 58066a9..a7fd748 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_wsh.go
@@ -5,7 +5,7 @@
"net"
"testing"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
// benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/runtimes/google/ipc/stream/crypto/box.go b/runtimes/google/ipc/stream/crypto/box.go
index 852e7ab..7e87962 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -10,7 +10,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
type boxcrypter struct {
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher_test.go b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
index 3e77663..3685ef2 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher_test.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
@@ -7,7 +7,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
)
// Add space for a MAC.
diff --git a/runtimes/google/ipc/stream/crypto/crypto.go b/runtimes/google/ipc/stream/crypto/crypto.go
index 2000798..a889231 100644
--- a/runtimes/google/ipc/stream/crypto/crypto.go
+++ b/runtimes/google/ipc/stream/crypto/crypto.go
@@ -2,7 +2,7 @@
// securing communication over VCs.
package crypto
-import "v.io/core/veyron/runtimes/google/lib/iobuf"
+import "v.io/x/ref/runtimes/google/lib/iobuf"
type Encrypter interface {
// Encrypt encrypts the provided plaintext data and returns the
diff --git a/runtimes/google/ipc/stream/crypto/crypto_test.go b/runtimes/google/ipc/stream/crypto/crypto_test.go
index b81c117..28bcdf0 100644
--- a/runtimes/google/ipc/stream/crypto/crypto_test.go
+++ b/runtimes/google/ipc/stream/crypto/crypto_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
func quickTest(t *testing.T, e Encrypter, d Decrypter) {
diff --git a/runtimes/google/ipc/stream/crypto/null.go b/runtimes/google/ipc/stream/crypto/null.go
index b8b376f..02fb7bb 100644
--- a/runtimes/google/ipc/stream/crypto/null.go
+++ b/runtimes/google/ipc/stream/crypto/null.go
@@ -1,6 +1,6 @@
package crypto
-import "v.io/core/veyron/runtimes/google/lib/iobuf"
+import "v.io/x/ref/runtimes/google/lib/iobuf"
// NewNullCrypter returns a Crypter that does no encryption/decryption.
func NewNullCrypter() Crypter { return null{} }
diff --git a/runtimes/google/ipc/stream/crypto/tls.go b/runtimes/google/ipc/stream/crypto/tls.go
index cf536be..8463f36 100644
--- a/runtimes/google/ipc/stream/crypto/tls.go
+++ b/runtimes/google/ipc/stream/crypto/tls.go
@@ -12,7 +12,7 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
var errDeadlinesNotSupported = errors.New("deadlines not supported")
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index 1437061..88244d8 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -7,16 +7,16 @@
"strings"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
+ inaming "v.io/x/ref/runtimes/google/naming"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/verror"
"v.io/v23/vom"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var errListenerIsClosed = errors.New("Listener has been Closed")
diff --git a/runtimes/google/ipc/stream/manager/manager.go b/runtimes/google/ipc/stream/manager/manager.go
index 95d54ab..7f33434 100644
--- a/runtimes/google/ipc/stream/manager/manager.go
+++ b/runtimes/google/ipc/stream/manager/manager.go
@@ -14,12 +14,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/stats"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
var errShutDown = errors.New("manager has been shut down")
diff --git a/runtimes/google/ipc/stream/manager/manager_test.go b/runtimes/google/ipc/stream/manager/manager_test.go
index 1a1442d..2b13116 100644
--- a/runtimes/google/ipc/stream/manager/manager_test.go
+++ b/runtimes/google/ipc/stream/manager/manager_test.go
@@ -12,21 +12,21 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/x/ref/runtimes/google/ipc/protocols/ws"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
func newPrincipal(defaultBlessing string) vc.LocalPrincipal {
diff --git a/runtimes/google/ipc/stream/message/coding.go b/runtimes/google/ipc/stream/message/coding.go
index ca2a2dc..e3ebde7 100644
--- a/runtimes/google/ipc/stream/message/coding.go
+++ b/runtimes/google/ipc/stream/message/coding.go
@@ -6,7 +6,7 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
var errLargerThan3ByteUint = errors.New("integer too large to represent in 3 bytes")
diff --git a/runtimes/google/ipc/stream/message/control.go b/runtimes/google/ipc/stream/message/control.go
index cfebcdb..8d18d01 100644
--- a/runtimes/google/ipc/stream/message/control.go
+++ b/runtimes/google/ipc/stream/message/control.go
@@ -5,10 +5,10 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/version"
- inaming "v.io/core/veyron/runtimes/google/naming"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
// Control is the interface implemented by all control messages.
diff --git a/runtimes/google/ipc/stream/message/counters.go b/runtimes/google/ipc/stream/message/counters.go
index 0060413..e0b9b24 100644
--- a/runtimes/google/ipc/stream/message/counters.go
+++ b/runtimes/google/ipc/stream/message/counters.go
@@ -3,7 +3,7 @@
import (
"fmt"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
// CounterID encapsulates the VCI and Flow used for flow control counter
diff --git a/runtimes/google/ipc/stream/message/counters_test.go b/runtimes/google/ipc/stream/message/counters_test.go
index af82141..24a67a9 100644
--- a/runtimes/google/ipc/stream/message/counters_test.go
+++ b/runtimes/google/ipc/stream/message/counters_test.go
@@ -4,7 +4,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
)
func TestCounterID(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/message/data.go b/runtimes/google/ipc/stream/message/data.go
index 88a6566..d07a0f7 100644
--- a/runtimes/google/ipc/stream/message/data.go
+++ b/runtimes/google/ipc/stream/message/data.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// Data encapsulates an application data message.
diff --git a/runtimes/google/ipc/stream/message/message.go b/runtimes/google/ipc/stream/message/message.go
index 739105a..3997161 100644
--- a/runtimes/google/ipc/stream/message/message.go
+++ b/runtimes/google/ipc/stream/message/message.go
@@ -64,10 +64,10 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/ipc/stream/message/message_test.go b/runtimes/google/ipc/stream/message/message_test.go
index ccb9c83..5fb54bb 100644
--- a/runtimes/google/ipc/stream/message/message_test.go
+++ b/runtimes/google/ipc/stream/message/message_test.go
@@ -6,9 +6,9 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// testControlCipher is a super-simple cipher that xor's each byte of the
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl.go b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
index 5a85fb1..4393b14 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl.go
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
@@ -15,7 +15,7 @@
}
func (Request) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Request"
+ Name string "v.io/x/ref/runtimes/google/ipc/stream/proxy.Request"
}) {
}
@@ -30,7 +30,7 @@
}
func (Response) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Response"
+ Name string "v.io/x/ref/runtimes/google/ipc/stream/proxy.Response"
}) {
}
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 11da1e6..f6d3846 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -13,21 +13,21 @@
"v.io/v23/vom"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
- "v.io/core/veyron/lib/stats"
+ "v.io/x/ref/lib/stats"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc/stream/proxy"
var (
errNoRoutingTableEntry = errors.New("routing table has no entry for the VC")
diff --git a/runtimes/google/ipc/stream/proxy/proxy_test.go b/runtimes/google/ipc/stream/proxy/proxy_test.go
index 3c8c283..b88d179 100644
--- a/runtimes/google/ipc/stream/proxy/proxy_test.go
+++ b/runtimes/google/ipc/stream/proxy/proxy_test.go
@@ -8,14 +8,14 @@
"strings"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/stream/proxy/v23_internal_test.go b/runtimes/google/ipc/stream/proxy/v23_internal_test.go
index f88d024..cea70bf 100644
--- a/runtimes/google/ipc/stream/proxy/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/proxy/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index b8817d5..c71e645 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -6,8 +6,8 @@
"fmt"
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
"v.io/v23/ipc/version"
"v.io/v23/security"
diff --git a/runtimes/google/ipc/stream/vc/flow.go b/runtimes/google/ipc/stream/vc/flow.go
index b86ffba..45b1436 100644
--- a/runtimes/google/ipc/stream/vc/flow.go
+++ b/runtimes/google/ipc/stream/vc/flow.go
@@ -1,9 +1,9 @@
package vc
import (
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type flow struct {
diff --git a/runtimes/google/ipc/stream/vc/listener.go b/runtimes/google/ipc/stream/vc/listener.go
index 193bfa4..2b4a97d 100644
--- a/runtimes/google/ipc/stream/vc/listener.go
+++ b/runtimes/google/ipc/stream/vc/listener.go
@@ -3,8 +3,8 @@
import (
"errors"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
var errListenerClosed = errors.New("Listener has been closed")
diff --git a/runtimes/google/ipc/stream/vc/listener_test.go b/runtimes/google/ipc/stream/vc/listener_test.go
index 1d81edd..c352174 100644
--- a/runtimes/google/ipc/stream/vc/listener_test.go
+++ b/runtimes/google/ipc/stream/vc/listener_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/naming"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
type noopFlow struct{}
diff --git a/runtimes/google/ipc/stream/vc/reader.go b/runtimes/google/ipc/stream/vc/reader.go
index bb2f046..9a6072e 100644
--- a/runtimes/google/ipc/stream/vc/reader.go
+++ b/runtimes/google/ipc/stream/vc/reader.go
@@ -6,9 +6,9 @@
"sync"
"sync/atomic"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
// readHandler is the interface used by the reader to notify other components
diff --git a/runtimes/google/ipc/stream/vc/reader_test.go b/runtimes/google/ipc/stream/vc/reader_test.go
index a2100ba..8d2d8a0 100644
--- a/runtimes/google/ipc/stream/vc/reader_test.go
+++ b/runtimes/google/ipc/stream/vc/reader_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
type testReadHandler struct{ items []uint }
diff --git a/runtimes/google/ipc/stream/vc/v23_internal_test.go b/runtimes/google/ipc/stream/vc/v23_internal_test.go
index 8309b11..bfe8e63 100644
--- a/runtimes/google/ipc/stream/vc/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/vc/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vc/vc.go b/runtimes/google/ipc/stream/vc/vc.go
index 7305328..2643bd4 100644
--- a/runtimes/google/ipc/stream/vc/vc.go
+++ b/runtimes/google/ipc/stream/vc/vc.go
@@ -13,13 +13,12 @@
"sync"
"time"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc/version"
"v.io/v23/naming"
@@ -27,6 +26,7 @@
"v.io/v23/security"
"v.io/v23/vom"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/vc_test.go b/runtimes/google/ipc/stream/vc/vc_test.go
index f8b622a..3e3f31c 100644
--- a/runtimes/google/ipc/stream/vc/vc_test.go
+++ b/runtimes/google/ipc/stream/vc/vc_test.go
@@ -14,20 +14,20 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/context"
"v.io/v23/ipc/version"
"v.io/v23/naming"
"v.io/v23/options"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/writer.go b/runtimes/google/ipc/stream/vc/writer.go
index 3dae782..6ce40ae 100644
--- a/runtimes/google/ipc/stream/vc/writer.go
+++ b/runtimes/google/ipc/stream/vc/writer.go
@@ -7,9 +7,9 @@
"sync"
"sync/atomic"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
var errWriterClosed = errors.New("attempt to call Write on Flow that has been Closed")
diff --git a/runtimes/google/ipc/stream/vc/writer_test.go b/runtimes/google/ipc/stream/vc/writer_test.go
index 02a6484..c6034b7 100644
--- a/runtimes/google/ipc/stream/vc/writer_test.go
+++ b/runtimes/google/ipc/stream/vc/writer_test.go
@@ -7,10 +7,10 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/sync"
)
// TestWrite is a very basic, easy to follow, but not very thorough test of the
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index 7b5af01..6a66629 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -8,15 +8,15 @@
"golang.org/x/crypto/nacl/box"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
ipcversion "v.io/v23/ipc/version"
"v.io/v23/options"
"v.io/v23/security"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
var (
diff --git a/runtimes/google/ipc/stream/vif/set_test.go b/runtimes/google/ipc/stream/vif/set_test.go
index bea5190..4d8a454 100644
--- a/runtimes/google/ipc/stream/vif/set_test.go
+++ b/runtimes/google/ipc/stream/vif/set_test.go
@@ -12,8 +12,8 @@
"v.io/v23/ipc"
"v.io/v23/naming"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
)
var supportsIPv6 bool
diff --git a/runtimes/google/ipc/stream/vif/setup_conn.go b/runtimes/google/ipc/stream/vif/setup_conn.go
index a983a37..7faf9d1 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn.go
@@ -3,9 +3,9 @@
import (
"io"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// setupConn writes the data to the net.Conn using HopSetupStream messages.
diff --git a/runtimes/google/ipc/stream/vif/setup_conn_test.go b/runtimes/google/ipc/stream/vif/setup_conn_test.go
index 562386e..e33d9e5 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn_test.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn_test.go
@@ -8,7 +8,7 @@
"sync"
"testing"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/ipc/stream/vif/v23_internal_test.go b/runtimes/google/ipc/stream/vif/v23_internal_test.go
index fd5f2ab..380f691 100644
--- a/runtimes/google/ipc/stream/vif/v23_internal_test.go
+++ b/runtimes/google/ipc/stream/vif/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/ipc/stream/vif/vcmap.go b/runtimes/google/ipc/stream/vif/vcmap.go
index 5669304..ab4f49d 100644
--- a/runtimes/google/ipc/stream/vif/vcmap.go
+++ b/runtimes/google/ipc/stream/vif/vcmap.go
@@ -4,9 +4,9 @@
"sort"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/pcqueue"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/pcqueue"
)
// vcMap implements a thread-safe map of vc.VC objects (vcInfo) keyed by their VCI.
diff --git a/runtimes/google/ipc/stream/vif/vcmap_test.go b/runtimes/google/ipc/stream/vif/vcmap_test.go
index abf8056..a56dd39 100644
--- a/runtimes/google/ipc/stream/vif/vcmap_test.go
+++ b/runtimes/google/ipc/stream/vif/vcmap_test.go
@@ -4,7 +4,7 @@
"reflect"
"testing"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
)
func TestVCMap(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/vif/vif.go b/runtimes/google/ipc/stream/vif/vif.go
index f142a8e..2da6ec5 100644
--- a/runtimes/google/ipc/stream/vif/vif.go
+++ b/runtimes/google/ipc/stream/vif/vif.go
@@ -14,18 +14,6 @@
"strings"
"sync"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/core/veyron/runtimes/google/ipc/stream/id"
- "v.io/core/veyron/runtimes/google/ipc/stream/message"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/core/veyron/runtimes/google/lib/pcqueue"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/options"
@@ -33,9 +21,21 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/crypto"
+ "v.io/x/ref/runtimes/google/ipc/stream/id"
+ "v.io/x/ref/runtimes/google/ipc/stream/message"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/version"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/pcqueue"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
-const pkgPath = "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+const pkgPath = "v.io/x/ref/runtimes/google/ipc/stream/vif"
var (
errShuttingDown = verror.Register(pkgPath+".errShuttingDown", verror.NoRetry, "{1:}{2:} underlying network connection({3}) shutting down{:_}")
diff --git a/runtimes/google/ipc/stream/vif/vif_test.go b/runtimes/google/ipc/stream/vif/vif_test.go
index 1c12716..e5b3bac 100644
--- a/runtimes/google/ipc/stream/vif/vif_test.go
+++ b/runtimes/google/ipc/stream/vif/vif_test.go
@@ -16,15 +16,15 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- iversion "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/ipc/stream/vif"
+ iversion "v.io/x/ref/runtimes/google/ipc/version"
- "v.io/core/veyron/runtimes/google/ipc/stream"
"v.io/v23/ipc/version"
"v.io/v23/naming"
+ "v.io/x/ref/runtimes/google/ipc/stream"
)
//go:generate v23 test generate
diff --git a/runtimes/google/ipc/stress/internal/client.go b/runtimes/google/ipc/stress/internal/client.go
index 161467d..d5b63c2 100644
--- a/runtimes/google/ipc/stress/internal/client.go
+++ b/runtimes/google/ipc/stress/internal/client.go
@@ -9,7 +9,7 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
func newArg(maxPayloadSize int) (stress.Arg, error) {
diff --git a/runtimes/google/ipc/stress/internal/server.go b/runtimes/google/ipc/stress/internal/server.go
index 909e515..afafc82 100644
--- a/runtimes/google/ipc/stress/internal/server.go
+++ b/runtimes/google/ipc/stress/internal/server.go
@@ -10,7 +10,7 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
type impl struct {
diff --git a/runtimes/google/ipc/stress/internal/util.go b/runtimes/google/ipc/stress/internal/util.go
index 8cc6da9..6fc0a09 100644
--- a/runtimes/google/ipc/stress/internal/util.go
+++ b/runtimes/google/ipc/stress/internal/util.go
@@ -4,7 +4,7 @@
"crypto/md5"
"encoding/binary"
- "v.io/core/veyron/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress"
)
// doSum returns the MD5 checksum of the arg.
diff --git a/runtimes/google/ipc/stress/stress.vdl.go b/runtimes/google/ipc/stress/stress.vdl.go
index c23e511..33dc547 100644
--- a/runtimes/google/ipc/stress/stress.vdl.go
+++ b/runtimes/google/ipc/stress/stress.vdl.go
@@ -22,7 +22,7 @@
}
func (Arg) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stress.Arg"
+ Name string "v.io/x/ref/runtimes/google/ipc/stress.Arg"
}) {
}
@@ -32,7 +32,7 @@
}
func (Stats) __VDLReflect(struct {
- Name string "v.io/core/veyron/runtimes/google/ipc/stress.Stats"
+ Name string "v.io/x/ref/runtimes/google/ipc/stress.Stats"
}) {
}
@@ -308,7 +308,7 @@
// descStress hides the desc to keep godoc clean.
var descStress = ipc.InterfaceDesc{
Name: "Stress",
- PkgPath: "v.io/core/veyron/runtimes/google/ipc/stress",
+ PkgPath: "v.io/x/ref/runtimes/google/ipc/stress",
Methods: []ipc.MethodDesc{
{
Name: "Sum",
diff --git a/runtimes/google/ipc/stress/stress/main.go b/runtimes/google/ipc/stress/stress/main.go
index aa42b90..ed269e9 100644
--- a/runtimes/google/ipc/stress/stress/main.go
+++ b/runtimes/google/ipc/stress/stress/main.go
@@ -12,9 +12,9 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stress"
- "v.io/core/veyron/runtimes/google/ipc/stress/internal"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stress"
+ "v.io/x/ref/runtimes/google/ipc/stress/internal"
)
var (
diff --git a/runtimes/google/ipc/stress/stressd/main.go b/runtimes/google/ipc/stress/stressd/main.go
index b8f6361..b20dfe5 100644
--- a/runtimes/google/ipc/stress/stressd/main.go
+++ b/runtimes/google/ipc/stress/stressd/main.go
@@ -9,9 +9,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stress/internal"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stress/internal"
)
var (
diff --git a/runtimes/google/ipc/v23_test.go b/runtimes/google/ipc/v23_test.go
index 8f500e5..614873d 100644
--- a/runtimes/google/ipc/v23_test.go
+++ b/runtimes/google/ipc/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("childPing", ``, childPing)
diff --git a/runtimes/google/ipc/version/version.go b/runtimes/google/ipc/version/version.go
index 16d8395..06a49e7 100644
--- a/runtimes/google/ipc/version/version.go
+++ b/runtimes/google/ipc/version/version.go
@@ -3,7 +3,7 @@
import (
"fmt"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/ipc/version"
"v.io/v23/naming"
diff --git a/runtimes/google/ipc/version/version_test.go b/runtimes/google/ipc/version/version_test.go
index 5b6d850..4d93993 100644
--- a/runtimes/google/ipc/version/version_test.go
+++ b/runtimes/google/ipc/version/version_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/ipc/version"
"v.io/v23/naming"
diff --git a/runtimes/google/lib/bqueue/bqueue.go b/runtimes/google/lib/bqueue/bqueue.go
index fc5c9b5..128a442 100644
--- a/runtimes/google/lib/bqueue/bqueue.go
+++ b/runtimes/google/lib/bqueue/bqueue.go
@@ -33,7 +33,7 @@
import (
"errors"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
// Priority is an integer priority. Smaller is greater priority.
diff --git a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
index 4210556..3b01341 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
@@ -23,10 +23,10 @@
"io"
"sync"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/deque"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/deque"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
// T defines the type of round-robin buffer queues. The queue has multiple
diff --git a/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go b/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
index 01e5e1e..ddd973d 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
@@ -5,8 +5,8 @@
"runtime"
"testing"
- "v.io/core/veyron/runtimes/google/lib/bqueue"
- "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/x/ref/runtimes/google/lib/bqueue"
+ "v.io/x/ref/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/lib/deque/deque_test.go b/runtimes/google/lib/deque/deque_test.go
index 50a3078..bffaed0 100644
--- a/runtimes/google/lib/deque/deque_test.go
+++ b/runtimes/google/lib/deque/deque_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/deque/v23_internal_test.go b/runtimes/google/lib/deque/v23_internal_test.go
index f359898..4381586 100644
--- a/runtimes/google/lib/deque/v23_internal_test.go
+++ b/runtimes/google/lib/deque/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/pcqueue/v23_internal_test.go b/runtimes/google/lib/pcqueue/v23_internal_test.go
index a30e721..15b84d8 100644
--- a/runtimes/google/lib/pcqueue/v23_internal_test.go
+++ b/runtimes/google/lib/pcqueue/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/publisher/publisher_test.go b/runtimes/google/lib/publisher/publisher_test.go
index ac40b9e..2721a0d 100644
--- a/runtimes/google/lib/publisher/publisher_test.go
+++ b/runtimes/google/lib/publisher/publisher_test.go
@@ -11,10 +11,10 @@
"v.io/v23/naming/ns"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/runtimes/google/lib/publisher"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/runtimes/google/lib/publisher"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/publisher/v23_internal_test.go b/runtimes/google/lib/publisher/v23_internal_test.go
index c41eac0..9c60f4c 100644
--- a/runtimes/google/lib/publisher/v23_internal_test.go
+++ b/runtimes/google/lib/publisher/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/sync/v23_internal_test.go b/runtimes/google/lib/sync/v23_internal_test.go
index ac7ffbf..1ad406c 100644
--- a/runtimes/google/lib/sync/v23_internal_test.go
+++ b/runtimes/google/lib/sync/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/lib/sync/wait_group_test.go b/runtimes/google/lib/sync/wait_group_test.go
index a41665d..ddf883a 100644
--- a/runtimes/google/lib/sync/wait_group_test.go
+++ b/runtimes/google/lib/sync/wait_group_test.go
@@ -2,7 +2,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/upcqueue/upcqueue.go b/runtimes/google/lib/upcqueue/upcqueue.go
index 5c64c92..232fa90 100644
--- a/runtimes/google/lib/upcqueue/upcqueue.go
+++ b/runtimes/google/lib/upcqueue/upcqueue.go
@@ -15,8 +15,8 @@
"errors"
"sync"
- "v.io/core/veyron/runtimes/google/lib/deque"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/x/ref/runtimes/google/lib/deque"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
var (
diff --git a/runtimes/google/lib/upcqueue/upcqueue_test.go b/runtimes/google/lib/upcqueue/upcqueue_test.go
index f78b347..15ac2ef 100644
--- a/runtimes/google/lib/upcqueue/upcqueue_test.go
+++ b/runtimes/google/lib/upcqueue/upcqueue_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- vsync "v.io/core/veyron/runtimes/google/lib/sync"
"v.io/x/lib/vlog"
+ vsync "v.io/x/ref/runtimes/google/lib/sync"
)
//go:generate v23 test generate
diff --git a/runtimes/google/lib/upcqueue/v23_internal_test.go b/runtimes/google/lib/upcqueue/v23_internal_test.go
index 83bc900..fe6dbaa 100644
--- a/runtimes/google/lib/upcqueue/v23_internal_test.go
+++ b/runtimes/google/lib/upcqueue/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/naming/namespace/acl_test.go b/runtimes/google/naming/namespace/acl_test.go
index 4502155..796668e 100644
--- a/runtimes/google/naming/namespace/acl_test.go
+++ b/runtimes/google/naming/namespace/acl_test.go
@@ -11,10 +11,10 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- service "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ service "v.io/x/ref/services/mounttable/lib"
)
func init() {
diff --git a/runtimes/google/naming/namespace/all_test.go b/runtimes/google/naming/namespace/all_test.go
index 2bde787..9d87d4b 100644
--- a/runtimes/google/naming/namespace/all_test.go
+++ b/runtimes/google/naming/namespace/all_test.go
@@ -18,12 +18,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/naming/namespace"
- vsecurity "v.io/core/veyron/security"
- service "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/naming/namespace"
+ vsecurity "v.io/x/ref/security"
+ service "v.io/x/ref/services/mounttable/lib"
)
//go:generate v23 test generate
diff --git a/runtimes/google/naming/namespace/glob.go b/runtimes/google/naming/namespace/glob.go
index ddf72e9..cdb70ef 100644
--- a/runtimes/google/naming/namespace/glob.go
+++ b/runtimes/google/naming/namespace/glob.go
@@ -4,7 +4,7 @@
"io"
"strings"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
"v.io/v23"
"v.io/v23/context"
diff --git a/runtimes/google/naming/namespace/namespace.go b/runtimes/google/naming/namespace/namespace.go
index 3ece801..003feb1 100644
--- a/runtimes/google/naming/namespace/namespace.go
+++ b/runtimes/google/naming/namespace/namespace.go
@@ -5,7 +5,7 @@
"sync"
"time"
- inaming "v.io/core/veyron/runtimes/google/naming"
+ inaming "v.io/x/ref/runtimes/google/naming"
"v.io/v23/naming"
"v.io/v23/security"
@@ -18,7 +18,7 @@
var serverPatternRegexp = regexp.MustCompile("^\\[([^\\]]+)\\](.*)")
-const pkgPath = "v.io/core/veyron/runtimes/google/naming/namespace"
+const pkgPath = "v.io/x/ref/runtimes/google/naming/namespace"
var (
errNotRootedName = verror.Register(pkgPath+".errNotRootedName", verror.NoRetry, "{1:}{2:} At least one root is not a rooted name{:_}")
diff --git a/runtimes/google/naming/namespace/parallelstartcall.go b/runtimes/google/naming/namespace/parallelstartcall.go
index 3439163..13b08ae 100644
--- a/runtimes/google/naming/namespace/parallelstartcall.go
+++ b/runtimes/google/naming/namespace/parallelstartcall.go
@@ -1,12 +1,12 @@
package namespace
import (
- inaming "v.io/core/veyron/runtimes/google/naming"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
"v.io/v23/options"
"v.io/v23/verror"
+ inaming "v.io/x/ref/runtimes/google/naming"
)
type startStatus struct {
diff --git a/runtimes/google/naming/namespace/v23_internal_test.go b/runtimes/google/naming/namespace/v23_internal_test.go
index c0fa3a1..314919a 100644
--- a/runtimes/google/naming/namespace/v23_internal_test.go
+++ b/runtimes/google/naming/namespace/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/rt/ipc_test.go b/runtimes/google/rt/ipc_test.go
index cfc7544..b13339f 100644
--- a/runtimes/google/rt/ipc_test.go
+++ b/runtimes/google/rt/ipc_test.go
@@ -14,10 +14,10 @@
"v.io/v23/options"
"v.io/v23/security"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
"v.io/v23/verror"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/mgmt.go b/runtimes/google/rt/mgmt.go
index 8830113..34f1b4d 100644
--- a/runtimes/google/rt/mgmt.go
+++ b/runtimes/google/rt/mgmt.go
@@ -11,7 +11,7 @@
"v.io/v23/naming"
"v.io/v23/options"
- "v.io/core/veyron/lib/exec"
+ "v.io/x/ref/lib/exec"
)
func (rt *Runtime) initMgmt(ctx *context.T) error {
diff --git a/runtimes/google/rt/mgmt_test.go b/runtimes/google/rt/mgmt_test.go
index 3aad0f1..168dbaf 100644
--- a/runtimes/google/rt/mgmt_test.go
+++ b/runtimes/google/rt/mgmt_test.go
@@ -16,12 +16,12 @@
"v.io/v23/naming"
"v.io/v23/services/mgmt/appcycle"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- vflag "v.io/core/veyron/security/flag"
- "v.io/core/veyron/services/mgmt/device"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/device"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/rt_test.go b/runtimes/google/rt/rt_test.go
index d33fba2..d564369 100644
--- a/runtimes/google/rt/rt_test.go
+++ b/runtimes/google/rt/rt_test.go
@@ -13,11 +13,11 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- vsecurity "v.io/core/veyron/security"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ vsecurity "v.io/x/ref/security"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/runtime.go b/runtimes/google/rt/runtime.go
index 5e1615c..6bf5d43 100644
--- a/runtimes/google/rt/runtime.go
+++ b/runtimes/google/rt/runtime.go
@@ -21,18 +21,18 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/stats"
- _ "v.io/core/veyron/lib/stats/sysstats"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/core/veyron/runtimes/google/ipc/stream/vc"
- "v.io/core/veyron/runtimes/google/lib/dependency"
- inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/core/veyron/runtimes/google/naming/namespace"
- ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/stats"
+ _ "v.io/x/ref/lib/stats/sysstats"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ imanager "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ "v.io/x/ref/runtimes/google/ipc/stream/vc"
+ "v.io/x/ref/runtimes/google/lib/dependency"
+ inaming "v.io/x/ref/runtimes/google/naming"
+ "v.io/x/ref/runtimes/google/naming/namespace"
+ ivtrace "v.io/x/ref/runtimes/google/vtrace"
)
type contextKey int
diff --git a/runtimes/google/rt/runtime_test.go b/runtimes/google/rt/runtime_test.go
index f806678..b45743a 100644
--- a/runtimes/google/rt/runtime_test.go
+++ b/runtimes/google/rt/runtime_test.go
@@ -7,10 +7,10 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/core/veyron/lib/flags"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/runtimes/google/rt"
- "v.io/core/veyron/security"
+ "v.io/x/ref/lib/flags"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/runtimes/google/rt"
+ "v.io/x/ref/security"
)
// InitForTest creates a context for use in a test.
diff --git a/runtimes/google/rt/security.go b/runtimes/google/rt/security.go
index 63ed87e..3459f68 100644
--- a/runtimes/google/rt/security.go
+++ b/runtimes/google/rt/security.go
@@ -12,9 +12,9 @@
"v.io/v23/mgmt"
"v.io/v23/security"
- "v.io/core/veyron/lib/exec"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/security/agent"
+ "v.io/x/ref/lib/exec"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/agent"
)
func initSecurity(ctx *context.T, credentials string, client ipc.Client) (security.Principal, error) {
diff --git a/runtimes/google/rt/shutdown_servers_test.go b/runtimes/google/rt/shutdown_servers_test.go
index edae758..4970251 100644
--- a/runtimes/google/rt/shutdown_servers_test.go
+++ b/runtimes/google/rt/shutdown_servers_test.go
@@ -14,10 +14,10 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func init() {
diff --git a/runtimes/google/rt/shutdown_test.go b/runtimes/google/rt/shutdown_test.go
index b2201e2..120b0f5 100644
--- a/runtimes/google/rt/shutdown_test.go
+++ b/runtimes/google/rt/shutdown_test.go
@@ -10,9 +10,9 @@
"v.io/v23"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/signals"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/signals"
)
//go:generate v23 test generate
diff --git a/runtimes/google/rt/signal_test.go b/runtimes/google/rt/signal_test.go
index 5401a2b..291977d 100644
--- a/runtimes/google/rt/signal_test.go
+++ b/runtimes/google/rt/signal_test.go
@@ -9,10 +9,10 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func init() {
diff --git a/runtimes/google/rt/v23_test.go b/runtimes/google/rt/v23_test.go
index ab39577..4ca1965 100644
--- a/runtimes/google/rt/v23_test.go
+++ b/runtimes/google/rt/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("noWaiters", ``, noWaiters)
diff --git a/runtimes/google/testing/concurrency/clock_test.go b/runtimes/google/testing/concurrency/clock_test.go
index e3e4714..0166971 100644
--- a/runtimes/google/testing/concurrency/clock_test.go
+++ b/runtimes/google/testing/concurrency/clock_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
//go:generate v23 test generate
diff --git a/runtimes/google/testing/concurrency/mutex_test.go b/runtimes/google/testing/concurrency/mutex_test.go
index a2852b6..a87542d 100644
--- a/runtimes/google/testing/concurrency/mutex_test.go
+++ b/runtimes/google/testing/concurrency/mutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
- "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency/sync"
)
var m sync.Mutex
diff --git a/runtimes/google/testing/concurrency/rwmutex_test.go b/runtimes/google/testing/concurrency/rwmutex_test.go
index a1f9bef..4d2c1fb 100644
--- a/runtimes/google/testing/concurrency/rwmutex_test.go
+++ b/runtimes/google/testing/concurrency/rwmutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
- "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
"v.io/x/lib/vlog"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency/sync"
)
var rw sync.RWMutex
diff --git a/runtimes/google/testing/concurrency/sync/sync.go b/runtimes/google/testing/concurrency/sync/sync.go
index d6f20e5..6d24eaa 100644
--- a/runtimes/google/testing/concurrency/sync/sync.go
+++ b/runtimes/google/testing/concurrency/sync/sync.go
@@ -3,7 +3,7 @@
import (
"sync"
- "v.io/core/veyron/runtimes/google/testing/concurrency"
+ "v.io/x/ref/runtimes/google/testing/concurrency"
)
// Mutex is a wrapper around the Go implementation of Mutex.
diff --git a/runtimes/google/testing/concurrency/v23_internal_test.go b/runtimes/google/testing/concurrency/v23_internal_test.go
index 1069697..55d3f56 100644
--- a/runtimes/google/testing/concurrency/v23_internal_test.go
+++ b/runtimes/google/testing/concurrency/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/runtimes/google/testing/mocks/naming/namespace.go b/runtimes/google/testing/mocks/naming/namespace.go
index 0aeb5bb..4e831c8 100644
--- a/runtimes/google/testing/mocks/naming/namespace.go
+++ b/runtimes/google/testing/mocks/naming/namespace.go
@@ -13,7 +13,7 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- vnamespace "v.io/core/veyron/runtimes/google/naming/namespace"
+ vnamespace "v.io/x/ref/runtimes/google/naming/namespace"
)
// NewSimpleNamespace returns a simple implementation of a Namespace
diff --git a/runtimes/google/vtrace/store.go b/runtimes/google/vtrace/store.go
index b8d0f41..c733ed0 100644
--- a/runtimes/google/vtrace/store.go
+++ b/runtimes/google/vtrace/store.go
@@ -10,7 +10,7 @@
"v.io/v23/uniqueid"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
// Store implements a store for traces. The idea is to keep all the
diff --git a/runtimes/google/vtrace/store_test.go b/runtimes/google/vtrace/store_test.go
index 81808e3..d9eb1fb 100644
--- a/runtimes/google/vtrace/store_test.go
+++ b/runtimes/google/vtrace/store_test.go
@@ -9,7 +9,7 @@
"v.io/v23/uniqueid"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
var nextid = uint64(1)
diff --git a/runtimes/google/vtrace/vtrace.go b/runtimes/google/vtrace/vtrace.go
index ddf8d51..9aca9d7 100644
--- a/runtimes/google/vtrace/vtrace.go
+++ b/runtimes/google/vtrace/vtrace.go
@@ -12,7 +12,7 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
// A span represents an annotated period of time.
diff --git a/runtimes/google/vtrace/vtrace_test.go b/runtimes/google/vtrace/vtrace_test.go
index adbb6ce..376bb30 100644
--- a/runtimes/google/vtrace/vtrace_test.go
+++ b/runtimes/google/vtrace/vtrace_test.go
@@ -14,12 +14,12 @@
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- iipc "v.io/core/veyron/runtimes/google/ipc"
- "v.io/core/veyron/runtimes/google/ipc/stream"
- "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ iipc "v.io/x/ref/runtimes/google/ipc"
+ "v.io/x/ref/runtimes/google/ipc/stream"
+ "v.io/x/ref/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/x/ref/runtimes/google/testing/mocks/naming"
)
func TestNewFromContext(t *testing.T) {
diff --git a/security/GO.PACKAGE b/security/GO.PACKAGE
index ab90b80..d5e1168 100644
--- a/security/GO.PACKAGE
+++ b/security/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/security/..."},
+ {"allow": "v.io/x/ref/security/..."},
{"allow": "...", "comment": "dependencies on veyron/security are temporarily allowed"}
]
}
diff --git a/security/agent/agent_test.go b/security/agent/agent_test.go
index 821033b..327b7a3 100644
--- a/security/agent/agent_test.go
+++ b/security/agent/agent_test.go
@@ -10,13 +10,13 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/context"
diff --git a/security/agent/agent_v23_test.go b/security/agent/agent_v23_test.go
index fe1e0e5..03100ce 100644
--- a/security/agent/agent_v23_test.go
+++ b/security/agent/agent_v23_test.go
@@ -9,7 +9,7 @@
"runtime"
"strings"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -17,7 +17,7 @@
func V23TestTestPassPhraseUse(i *v23tests.T) {
// Test passphrase handling.
- bin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
+ bin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
// Create the passphrase
@@ -51,8 +51,8 @@
func V23TestAllPrincipalMethods(i *v23tests.T) {
// Test all methods of the principal interface.
// (Errors are printed to STDERR)
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- principalBin := i.BuildGoPkg("v.io/core/veyron/security/agent/test_principal")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ principalBin := i.BuildGoPkg("v.io/x/ref/security/agent/test_principal")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
agent := agentBin.WithEnv(credentials).Start(principalBin.Path())
@@ -60,7 +60,7 @@
}
func buildAndRunPingpongServer(i *v23tests.T, rootMTArg string) *v23tests.Binary {
- pingpongBin := i.BuildGoPkg("v.io/core/veyron/security/agent/pingpong")
+ pingpongBin := i.BuildGoPkg("v.io/x/ref/security/agent/pingpong")
pingpongServer := pingpongBin.Start("--server", rootMTArg)
// Make sure pingpong is up and running.
pingpongServer.ExpectRE(".*Listening at.*", -1)
@@ -77,8 +77,8 @@
rootMT, _ := i.GetVar("NAMESPACE_ROOT")
rootMTArg := "--veyron.namespace.root=" + rootMT
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- testChildBin := i.BuildGoPkg("v.io/core/veyron/security/agent/test_child")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ testChildBin := i.BuildGoPkg("v.io/x/ref/security/agent/test_child")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
// Test running a single app.
@@ -126,8 +126,8 @@
rootMTArg := "--veyron.namespace.root=" + ns
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- vrun := i.BuildGoPkg("v.io/core/veyron/tools/vrun")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ vrun := i.BuildGoPkg("v.io/x/ref/tools/vrun")
pingpongBin := buildAndRunPingpongServer(i, rootMTArg)
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index 73cede6..6e5111a 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -12,12 +12,12 @@
"golang.org/x/crypto/ssh/terminal"
- "v.io/core/veyron/lib/flags/consts"
- vsignals "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/flags/consts"
+ vsignals "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/security"
diff --git a/security/agent/cache/cache.go b/security/agent/cache/cache.go
index 3acf943..5ba167c 100644
--- a/security/agent/cache/cache.go
+++ b/security/agent/cache/cache.go
@@ -6,11 +6,11 @@
"fmt"
"sync"
- "v.io/core/veyron/security/agent/lru"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/security/agent/lru"
)
const (
diff --git a/security/agent/cache/cache_test.go b/security/agent/cache/cache_test.go
index 9025fb2..78ad231 100644
--- a/security/agent/cache/cache_test.go
+++ b/security/agent/cache/cache_test.go
@@ -5,9 +5,9 @@
"reflect"
"sync"
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- isecurity "v.io/core/veyron/security"
"v.io/v23/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ isecurity "v.io/x/ref/security"
)
func createRoots() (security.PublicKey, security.BlessingRoots, *cachedRoots) {
diff --git a/security/agent/client.go b/security/agent/client.go
index 92a33ab..f8cb435 100644
--- a/security/agent/client.go
+++ b/security/agent/client.go
@@ -7,8 +7,6 @@
"net"
"os"
- "v.io/core/veyron/lib/unixfd"
- "v.io/core/veyron/security/agent/cache"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -16,6 +14,8 @@
"v.io/v23/security"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/unixfd"
+ "v.io/x/ref/security/agent/cache"
)
// FdVarName is the name of the environment variable containing
diff --git a/security/agent/keymgr/client.go b/security/agent/keymgr/client.go
index 219cea1..aa4b248 100644
--- a/security/agent/keymgr/client.go
+++ b/security/agent/keymgr/client.go
@@ -8,13 +8,13 @@
"strconv"
"sync"
- "v.io/core/veyron/lib/unixfd"
- "v.io/core/veyron/security/agent/server"
"v.io/v23/context"
"v.io/v23/verror"
+ "v.io/x/ref/lib/unixfd"
+ "v.io/x/ref/security/agent/server"
)
-const pkgPath = "v.io/core/veyron/security/agent/keymgr"
+const pkgPath = "v.io/x/ref/security/agent/keymgr"
// Errors
var (
diff --git a/security/agent/keymgr/keymgr_test.go b/security/agent/keymgr/keymgr_test.go
index 91525e6..c055e2c 100644
--- a/security/agent/keymgr/keymgr_test.go
+++ b/security/agent/keymgr/keymgr_test.go
@@ -8,10 +8,10 @@
"syscall"
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/context"
diff --git a/security/agent/pingpong/main.go b/security/agent/pingpong/main.go
index 86f2567..66b07b4 100644
--- a/security/agent/pingpong/main.go
+++ b/security/agent/pingpong/main.go
@@ -11,9 +11,9 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
var runServer = flag.Bool("server", false, "Whether to run in server mode")
diff --git a/security/agent/pingpong/wire.vdl.go b/security/agent/pingpong/wire.vdl.go
index b4b6461..ede4f0c 100644
--- a/security/agent/pingpong/wire.vdl.go
+++ b/security/agent/pingpong/wire.vdl.go
@@ -117,7 +117,7 @@
// descPingPong hides the desc to keep godoc clean.
var descPingPong = ipc.InterfaceDesc{
Name: "PingPong",
- PkgPath: "v.io/core/veyron/security/agent/pingpong",
+ PkgPath: "v.io/x/ref/security/agent/pingpong",
Doc: "// Simple service used in the agent tests.",
Methods: []ipc.MethodDesc{
{
diff --git a/security/agent/server/server.go b/security/agent/server/server.go
index 78e9ace..1879093 100644
--- a/security/agent/server/server.go
+++ b/security/agent/server/server.go
@@ -14,8 +14,6 @@
"strconv"
"sync"
- "v.io/core/veyron/lib/unixfd"
- vsecurity "v.io/core/veyron/security"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -23,11 +21,13 @@
"v.io/v23/security"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/unixfd"
+ vsecurity "v.io/x/ref/security"
)
const PrincipalHandleByteSize = sha512.Size
-const pkgPath = "v.io/core/veyron/security/agent/server"
+const pkgPath = "v.io/x/ref/security/agent/server"
// Errors
var (
diff --git a/security/agent/server/sharing_test.go b/security/agent/server/sharing_test.go
index 6b25166..a4114c5 100644
--- a/security/agent/server/sharing_test.go
+++ b/security/agent/server/sharing_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
func doRead(c chan struct{}) string {
diff --git a/security/agent/server/wire.vdl.go b/security/agent/server/wire.vdl.go
index 65f1fc2..2f23811 100644
--- a/security/agent/server/wire.vdl.go
+++ b/security/agent/server/wire.vdl.go
@@ -471,7 +471,7 @@
// descAgent hides the desc to keep godoc clean.
var descAgent = ipc.InterfaceDesc{
Name: "Agent",
- PkgPath: "v.io/core/veyron/security/agent/server",
+ PkgPath: "v.io/x/ref/security/agent/server",
Methods: []ipc.MethodDesc{
{
Name: "Bless",
diff --git a/security/agent/test_child/main.go b/security/agent/test_child/main.go
index 03e5ab6..3a1e41b 100644
--- a/security/agent/test_child/main.go
+++ b/security/agent/test_child/main.go
@@ -8,7 +8,7 @@
"os/exec"
"syscall"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/consts"
)
var (
diff --git a/security/agent/test_principal/main.go b/security/agent/test_principal/main.go
index f69c3d9..1f53d99 100644
--- a/security/agent/test_principal/main.go
+++ b/security/agent/test_principal/main.go
@@ -9,10 +9,10 @@
"reflect"
"runtime"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
"v.io/v23"
"v.io/v23/security"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func newKey() security.PublicKey {
diff --git a/security/agent/testchild.sh b/security/agent/testchild.sh
deleted file mode 100755
index 76b2124..0000000
--- a/security/agent/testchild.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Helper script for testing two binaries under the same agent.
-
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
-
-main() {
- if [[ -n "${VEYRON_CREDENTIALS}" ]]; then
- shell_test::fail "line ${LINENO}: identity preserved"
- fi
- PINGPONG_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/security/agent/pingpong')"
- shell_test::start_server "${PINGPONG_BIN}" --server
- "${PINGPONG_BIN}" || shell_test::fail "line ${LINENO}: ping"
-
- shell_test::pass
-}
-
-main "$@"
diff --git a/security/agent/v23_test.go b/security/agent/v23_test.go
index f50ab25..bdcc989 100644
--- a/security/agent/v23_test.go
+++ b/security/agent/v23_test.go
@@ -10,9 +10,9 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func init() {
modules.RegisterChild("getPrincipalAndHang", ``, getPrincipalAndHang)
diff --git a/security/audit/auditor_test.go b/security/audit/auditor_test.go
index fbabac4..6cec327 100644
--- a/security/audit/auditor_test.go
+++ b/security/audit/auditor_test.go
@@ -4,7 +4,7 @@
"testing"
"time"
- "v.io/core/veyron/security/audit"
+ "v.io/x/ref/security/audit"
)
func TestEntryString(t *testing.T) {
diff --git a/security/audit/principal_test.go b/security/audit/principal_test.go
index 1c06253..c4a63b5 100644
--- a/security/audit/principal_test.go
+++ b/security/audit/principal_test.go
@@ -10,8 +10,8 @@
"testing"
"time"
- "v.io/core/veyron/security/audit"
"v.io/v23/security"
+ "v.io/x/ref/security/audit"
)
func TestAuditingPrincipal(t *testing.T) {
diff --git a/security/blessingroots.go b/security/blessingroots.go
index c06fe6a..c2527bd 100644
--- a/security/blessingroots.go
+++ b/security/blessingroots.go
@@ -7,7 +7,7 @@
"sort"
"sync"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
)
diff --git a/security/blessingstore.go b/security/blessingstore.go
index 39cb079..8306959 100644
--- a/security/blessingstore.go
+++ b/security/blessingstore.go
@@ -11,7 +11,7 @@
"sort"
"sync"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
"v.io/x/lib/vlog"
diff --git a/security/flag/flag.go b/security/flag/flag.go
index 54dbf8e..49af27e 100644
--- a/security/flag/flag.go
+++ b/security/flag/flag.go
@@ -11,7 +11,7 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
var authFlags *flags.Flags
diff --git a/security/flag/flag_test.go b/security/flag/flag_test.go
index 68095fc..05c15aa 100644
--- a/security/flag/flag_test.go
+++ b/security/flag/flag_test.go
@@ -12,8 +12,8 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/modules"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/x/ref/lib/modules"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
//go:generate v23 test generate
diff --git a/security/flag/v23_internal_test.go b/security/flag/v23_internal_test.go
index 7d6e1a3..9a2e9f0 100644
--- a/security/flag/v23_internal_test.go
+++ b/security/flag/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("tamFromFlag", ``, tamFromFlag)
diff --git a/security/serialization/serialization_test.go b/security/serialization/serialization_test.go
index 0b3cfd6..3167841 100644
--- a/security/serialization/serialization_test.go
+++ b/security/serialization/serialization_test.go
@@ -14,8 +14,8 @@
"strings"
"testing"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
)
diff --git a/security/serialization/types.vdl.go b/security/serialization/types.vdl.go
index db10bba..0cde1a1 100644
--- a/security/serialization/types.vdl.go
+++ b/security/serialization/types.vdl.go
@@ -16,14 +16,14 @@
}
func (SignedHeader) __VDLReflect(struct {
- Name string "v.io/core/veyron/security/serialization.SignedHeader"
+ Name string "v.io/x/ref/security/serialization.SignedHeader"
}) {
}
type HashCode [32]byte
func (HashCode) __VDLReflect(struct {
- Name string "v.io/core/veyron/security/serialization.HashCode"
+ Name string "v.io/x/ref/security/serialization.HashCode"
}) {
}
@@ -47,7 +47,7 @@
SignedDataHash struct{ Value HashCode }
// __SignedDataReflect describes the SignedData union type.
__SignedDataReflect struct {
- Name string "v.io/core/veyron/security/serialization.SignedData"
+ Name string "v.io/x/ref/security/serialization.SignedData"
Type SignedData
Union struct {
Signature SignedDataSignature
diff --git a/security/storage.go b/security/storage.go
index 80cbcc7..4a94972 100644
--- a/security/storage.go
+++ b/security/storage.go
@@ -4,9 +4,9 @@
"fmt"
"io"
- "v.io/core/veyron/security/serialization"
"v.io/v23/security"
"v.io/v23/vom"
+ "v.io/x/ref/security/serialization"
)
func encodeAndStore(obj interface{}, data, signature io.WriteCloser, signer serialization.Signer) error {
diff --git a/services/GO.PACKAGE b/services/GO.PACKAGE
index bf4f724..2d7cca9 100644
--- a/services/GO.PACKAGE
+++ b/services/GO.PACKAGE
@@ -1,11 +1,11 @@
{
"dependencies": {
"incoming": [
- {"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/x/ref/services/..."},
+ {"allow": "v.io/x/ref/lib/...", "comment":"temporarily allowing dependency from lib"},
+ {"allow": "v.io/x/ref/profiles/...", "comment":"temporarily allowing dependency from profiles"},
+ {"allow": "v.io/x/ref/tools/...", "comment":"temporarily allowing dependency from veyron/tools"},
+ {"allow": "v.io/x/ref/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 71ac0e1..4a1fbbd 100644
--- a/services/config/lib/config.go
+++ b/services/config/lib/config.go
@@ -42,7 +42,7 @@
gen int // incremented every config change
}
-const pkgPath = "v.io/core/veyron/services/config/lib"
+const pkgPath = "v.io/x/ref/services/config/lib"
// Errors
var (
diff --git a/services/identity/auditor/blessing_auditor.go b/services/identity/auditor/blessing_auditor.go
index 045f2bb..607db64 100644
--- a/services/identity/auditor/blessing_auditor.go
+++ b/services/identity/auditor/blessing_auditor.go
@@ -6,9 +6,9 @@
"strings"
"time"
- "v.io/core/veyron/security/audit"
"v.io/v23/security"
"v.io/v23/vom"
+ "v.io/x/ref/security/audit"
)
// 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 28ba42e..7e413b6 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/core/veyron/security"
- "v.io/core/veyron/security/audit"
"v.io/v23/security"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/audit"
)
func TestBlessingAuditor(t *testing.T) {
diff --git a/services/identity/auditor/mock_auditor.go b/services/identity/auditor/mock_auditor.go
index 7a4b598..f5fc888 100644
--- a/services/identity/auditor/mock_auditor.go
+++ b/services/identity/auditor/mock_auditor.go
@@ -2,7 +2,7 @@
import (
"reflect"
- "v.io/core/veyron/security/audit"
+ "v.io/x/ref/security/audit"
)
func NewMockBlessingAuditor() (audit.Auditor, BlessingLogReader) {
diff --git a/services/identity/blesser/macaroon.go b/services/identity/blesser/macaroon.go
index 03773c4..2cbb267 100644
--- a/services/identity/blesser/macaroon.go
+++ b/services/identity/blesser/macaroon.go
@@ -4,9 +4,9 @@
"fmt"
"time"
- "v.io/core/veyron/services/identity"
- "v.io/core/veyron/services/identity/oauth"
- "v.io/core/veyron/services/identity/util"
+ "v.io/x/ref/services/identity"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/util"
"v.io/v23/ipc"
"v.io/v23/security"
diff --git a/services/identity/blesser/macaroon_test.go b/services/identity/blesser/macaroon_test.go
index b0e4e0c..28c8376 100644
--- a/services/identity/blesser/macaroon_test.go
+++ b/services/identity/blesser/macaroon_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- "v.io/core/veyron/services/identity/oauth"
- "v.io/core/veyron/services/identity/util"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/util"
"v.io/v23/security"
"v.io/v23/vom"
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index c98ad62..0af1ae1 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -5,10 +5,10 @@
"strings"
"time"
- "v.io/core/veyron/services/identity"
- "v.io/core/veyron/services/identity/oauth"
- "v.io/core/veyron/services/identity/revocation"
- "v.io/core/veyron/services/identity/util"
+ "v.io/x/ref/services/identity"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/util"
"v.io/v23/ipc"
"v.io/v23/security"
diff --git a/services/identity/blesser/oauth_test.go b/services/identity/blesser/oauth_test.go
index c173d8e..9e4c394 100644
--- a/services/identity/blesser/oauth_test.go
+++ b/services/identity/blesser/oauth_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/core/veyron/services/identity/oauth"
+ "v.io/x/ref/services/identity/oauth"
"v.io/v23/security"
)
diff --git a/services/identity/blesser/util_test.go b/services/identity/blesser/util_test.go
index eef7803..b563b33 100644
--- a/services/identity/blesser/util_test.go
+++ b/services/identity/blesser/util_test.go
@@ -1,7 +1,7 @@
package blesser
import (
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/ipc"
"v.io/v23/security"
diff --git a/services/identity/caveats/caveat_factory.go b/services/identity/caveats/caveat_factory.go
index 8083dc0..50e437b 100644
--- a/services/identity/caveats/caveat_factory.go
+++ b/services/identity/caveats/caveat_factory.go
@@ -4,7 +4,7 @@
"fmt"
"time"
- "v.io/core/veyron/services/identity/revocation"
+ "v.io/x/ref/services/identity/revocation"
"v.io/v23/security"
)
diff --git a/services/identity/handlers/blessing_root.go b/services/identity/handlers/blessing_root.go
index 3853478..3ee6186 100644
--- a/services/identity/handlers/blessing_root.go
+++ b/services/identity/handlers/blessing_root.go
@@ -6,9 +6,9 @@
"fmt"
"net/http"
- "v.io/core/veyron/services/identity/util"
"v.io/v23/security"
"v.io/v23/vom"
+ "v.io/x/ref/services/identity/util"
)
// 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 8ec7577..930c5e5 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -11,7 +11,7 @@
"v.io/v23/security"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
func TestBlessingRoot(t *testing.T) {
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 3cca02f..46ed9a3 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -149,7 +149,7 @@
// descOAuthBlesser hides the desc to keep godoc clean.
var descOAuthBlesser = ipc.InterfaceDesc{
Name: "OAuthBlesser",
- PkgPath: "v.io/core/veyron/services/identity",
+ PkgPath: "v.io/x/ref/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{
{
@@ -277,7 +277,7 @@
// descMacaroonBlesser hides the desc to keep godoc clean.
var descMacaroonBlesser = ipc.InterfaceDesc{
Name: "MacaroonBlesser",
- PkgPath: "v.io/core/veyron/services/identity",
+ PkgPath: "v.io/x/ref/services/identity",
Doc: "// MacaroonBlesser returns a blessing given the provided macaroon string.",
Methods: []ipc.MethodDesc{
{
diff --git a/services/identity/identityd/identityd_v23_test.go b/services/identity/identityd/identityd_v23_test.go
index 61271b7..a47d460 100644
--- a/services/identity/identityd/identityd_v23_test.go
+++ b/services/identity/identityd/identityd_v23_test.go
@@ -9,8 +9,8 @@
"strings"
"time"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate .
@@ -76,10 +76,10 @@
fmt.Sprintf("--httpaddr=%s", httpaddr),
}
- i.BuildGoPkg("v.io/core/veyron/services/identity/identityd_test").Start(args...)
+ i.BuildGoPkg("v.io/x/ref/services/identity/identityd_test").Start(args...)
// Use the principal tool to seekblessings.
- principal := i.BuildGoPkg("v.io/core/veyron/tools/principal")
+ principal := i.BuildGoPkg("v.io/x/ref/tools/principal")
// Test an initial seekblessings call.
seekBlessings(i, principal, httpaddr)
// Test that a subsequent call succeeds with the same
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 9d0bb78..920f263 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -13,14 +13,14 @@
"v.io/v23"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/static"
- "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"
- "v.io/core/veyron/services/identity/util"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/blesser"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/server"
+ "v.io/x/ref/services/identity/util"
)
var (
diff --git a/services/identity/identityd/v23_test.go b/services/identity/identityd/v23_test.go
index 3e2aed5..f249854 100644
--- a/services/identity/identityd/v23_test.go
+++ b/services/identity/identityd/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/identity/identityd_test/main.go b/services/identity/identityd_test/main.go
index 0329923..04d5e83 100644
--- a/services/identity/identityd_test/main.go
+++ b/services/identity/identityd_test/main.go
@@ -10,14 +10,14 @@
"v.io/v23"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles/static"
- "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"
- "v.io/core/veyron/services/identity/util"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/blesser"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/server"
+ "v.io/x/ref/services/identity/util"
)
var (
diff --git a/services/identity/oauth/handler.go b/services/identity/oauth/handler.go
index 29e1b7a..5ccc3cc 100644
--- a/services/identity/oauth/handler.go
+++ b/services/identity/oauth/handler.go
@@ -30,13 +30,13 @@
"strings"
"time"
- "v.io/core/veyron/services/identity/auditor"
- "v.io/core/veyron/services/identity/caveats"
- "v.io/core/veyron/services/identity/revocation"
- "v.io/core/veyron/services/identity/util"
"v.io/v23/security"
"v.io/v23/vom"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/util"
)
const (
diff --git a/services/identity/revocation/revocation_test.go b/services/identity/revocation/revocation_test.go
index 043f942..df6d5f5 100644
--- a/services/identity/revocation/revocation_test.go
+++ b/services/identity/revocation/revocation_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- services "v.io/core/veyron/services/security"
- "v.io/core/veyron/services/security/discharger"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ services "v.io/x/ref/services/security"
+ "v.io/x/ref/services/security/discharger"
"v.io/v23"
"v.io/v23/context"
diff --git a/services/identity/server/identityd.go b/services/identity/server/identityd.go
index 0c789cc..c095049 100644
--- a/services/identity/server/identityd.go
+++ b/services/identity/server/identityd.go
@@ -18,17 +18,17 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "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"
- "v.io/core/veyron/services/identity/util"
- services "v.io/core/veyron/services/security"
- "v.io/core/veyron/services/security/discharger"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/security/audit"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/blesser"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/handlers"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/util"
+ services "v.io/x/ref/services/security"
+ "v.io/x/ref/services/security/discharger"
)
const (
diff --git a/services/mgmt/application/applicationd/applicationd_v23_test.go b/services/mgmt/application/applicationd/applicationd_v23_test.go
index 7570990..4649be3 100644
--- a/services/mgmt/application/applicationd/applicationd_v23_test.go
+++ b/services/mgmt/application/applicationd/applicationd_v23_test.go
@@ -5,11 +5,11 @@
"os"
"strings"
- libsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/lib/testutil/v23tests"
- vsecurity "v.io/core/veyron/security"
"v.io/v23/naming"
"v.io/v23/security"
+ libsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/lib/testutil/v23tests"
+ vsecurity "v.io/x/ref/security"
)
//go:generate v23 test generate
@@ -61,10 +61,10 @@
"-veyron.tcp.address=127.0.0.1:0",
"-veyron.credentials=" + serverCred,
}
- i.BuildGoPkg("v.io/core/veyron/services/mgmt/application/applicationd").Start(args...)
+ i.BuildGoPkg("v.io/x/ref/services/mgmt/application/applicationd").Start(args...)
// Build the client binary.
- clientBin := i.BuildGoPkg("v.io/core/veyron/tools/application")
+ clientBin := i.BuildGoPkg("v.io/x/ref/tools/application")
// Generate publisher blessings
principal, err := vsecurity.NewPrincipal()
diff --git a/services/mgmt/application/applicationd/main.go b/services/mgmt/application/applicationd/main.go
index dc16cdf..f37851b 100644
--- a/services/mgmt/application/applicationd/main.go
+++ b/services/mgmt/application/applicationd/main.go
@@ -6,9 +6,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/services/mgmt/application/impl"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/services/mgmt/application/impl"
)
var (
diff --git a/services/mgmt/application/applicationd/v23_test.go b/services/mgmt/application/applicationd/v23_test.go
index 08fdd88..34bbce6 100644
--- a/services/mgmt/application/applicationd/v23_test.go
+++ b/services/mgmt/application/applicationd/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/application/impl/acl_test.go b/services/mgmt/application/impl/acl_test.go
index fd0d108..3190b83 100644
--- a/services/mgmt/application/impl/acl_test.go
+++ b/services/mgmt/application/impl/acl_test.go
@@ -17,12 +17,12 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/services/mgmt/application/impl"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/services/mgmt/application/impl"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
+ "v.io/x/ref/services/mgmt/repository"
)
//go:generate v23 test generate
diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index 3446704..8cb4f4a 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -10,9 +10,9 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/security/flag"
- "v.io/core/veyron/services/mgmt/lib/fs"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/lib/fs"
+ "v.io/x/ref/services/mgmt/repository"
)
// 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 54b734a..03bde1f 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -13,12 +13,12 @@
"v.io/v23/services/mgmt/application"
"v.io/v23/verror"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles/static"
- //vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/services/mgmt/application/impl"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles/static"
+ //vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/services/mgmt/application/impl"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
+ "v.io/x/ref/services/mgmt/repository"
)
func newPublisherSignature(t *testing.T, ctx *context.T, msg []byte) (security.Blessings, security.Signature) {
diff --git a/services/mgmt/application/impl/service.go b/services/mgmt/application/impl/service.go
index a1a1f5f..d10265d 100644
--- a/services/mgmt/application/impl/service.go
+++ b/services/mgmt/application/impl/service.go
@@ -3,9 +3,9 @@
import (
"strings"
- "v.io/core/veyron/services/mgmt/lib/acls"
- "v.io/core/veyron/services/mgmt/lib/fs"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/services/mgmt/lib/acls"
+ "v.io/x/ref/services/mgmt/lib/fs"
+ "v.io/x/ref/services/mgmt/repository"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -28,7 +28,7 @@
suffix string
}
-const pkgPath = "v.io/core/veyron/services/mgmt/application/impl/"
+const pkgPath = "v.io/x/ref/services/mgmt/application/impl/"
var (
ErrInvalidSuffix = verror.Register(pkgPath+".InvalidSuffix", verror.NoRetry, "{1:}{2:} invalid suffix{:_}")
diff --git a/services/mgmt/application/impl/v23_test.go b/services/mgmt/application/impl/v23_test.go
index 9b8812e..ad4161e 100644
--- a/services/mgmt/application/impl/v23_test.go
+++ b/services/mgmt/application/impl/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("appRepository", ``, appRepository)
diff --git a/services/mgmt/binary/binaryd/binaryd_v23_test.go b/services/mgmt/binary/binaryd/binaryd_v23_test.go
index d7a188d..034cfa4 100644
--- a/services/mgmt/binary/binaryd/binaryd_v23_test.go
+++ b/services/mgmt/binary/binaryd/binaryd_v23_test.go
@@ -9,10 +9,10 @@
"os/exec"
"strings"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/lib/testutil/v23tests"
"v.io/v23/naming"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -102,8 +102,8 @@
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
// Build the required binaries.
- binaryRepoBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/binary/binaryd")
- clientBin := i.BuildGoPkg("v.io/core/veyron/tools/binary")
+ binaryRepoBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/binary/binaryd")
+ clientBin := i.BuildGoPkg("v.io/x/ref/tools/binary")
// Generate credentials.
serverCred, serverPrin := security.NewCredentials("server")
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index fb97eb4..ad6e1ae 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -10,10 +10,10 @@
"v.io/v23/context"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/services/mgmt/binary/impl"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/services/mgmt/binary/impl"
)
const defaultDepth = 3
diff --git a/services/mgmt/binary/binaryd/v23_test.go b/services/mgmt/binary/binaryd/v23_test.go
index 88f0595..c621fe1 100644
--- a/services/mgmt/binary/binaryd/v23_test.go
+++ b/services/mgmt/binary/binaryd/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/binary/impl/acl_test.go b/services/mgmt/binary/impl/acl_test.go
index a1896ce..54cb252 100644
--- a/services/mgmt/binary/impl/acl_test.go
+++ b/services/mgmt/binary/impl/acl_test.go
@@ -16,11 +16,11 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/services/mgmt/binary/impl"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/services/mgmt/binary/impl"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
)
//go:generate v23 test generate
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index 6e43fae..5e9ee0d 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -7,7 +7,7 @@
"v.io/v23/security"
"v.io/v23/services/mgmt/repository"
- "v.io/core/veyron/services/mgmt/lib/acls"
+ "v.io/x/ref/services/mgmt/lib/acls"
)
const (
diff --git a/services/mgmt/binary/impl/http.go b/services/mgmt/binary/impl/http.go
index da15212..27e5745 100644
--- a/services/mgmt/binary/impl/http.go
+++ b/services/mgmt/binary/impl/http.go
@@ -9,7 +9,7 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/services/mgmt/binary/impl/multipart"
+ "v.io/x/ref/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 03e4b73..3bfabf9 100644
--- a/services/mgmt/binary/impl/http_test.go
+++ b/services/mgmt/binary/impl/http_test.go
@@ -12,8 +12,8 @@
"v.io/v23/naming"
"v.io/v23/services/mgmt/repository"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/services/mgmt/binary/impl"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/services/mgmt/binary/impl"
)
// 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 ba4edc3..78a728f 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -17,10 +17,10 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/services/mgmt/binary/impl"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/services/mgmt/binary/impl"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
)
const (
diff --git a/services/mgmt/binary/impl/multipart/multipart_test.go b/services/mgmt/binary/impl/multipart/multipart_test.go
index 304d74c..7364ebe 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/core/veyron/services/mgmt/binary/impl/multipart"
+ "v.io/x/ref/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 64e8d7d..80718c9 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -36,7 +36,6 @@
"strings"
"syscall"
- "v.io/core/veyron/services/mgmt/lib/acls"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/v23/services/mgmt/binary"
@@ -44,6 +43,7 @@
"v.io/v23/services/security/access"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/mgmt/lib/acls"
)
// binaryService implements the Binary server interface.
@@ -59,7 +59,7 @@
locks *acls.Locks
}
-const pkgPath = "v.io/core/veyron/services/mgmt/binary/impl"
+const pkgPath = "v.io/x/ref/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/util_test.go b/services/mgmt/binary/impl/util_test.go
index 356d7c7..d15cb67 100644
--- a/services/mgmt/binary/impl/util_test.go
+++ b/services/mgmt/binary/impl/util_test.go
@@ -9,8 +9,8 @@
"v.io/v23/context"
"v.io/v23/services/mgmt/repository"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/services/mgmt/binary/impl"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/services/mgmt/binary/impl"
)
// invokeUpload invokes the Upload RPC using the given client binary
diff --git a/services/mgmt/binary/impl/v23_test.go b/services/mgmt/binary/impl/v23_test.go
index 04bfa6f..9c0642e 100644
--- a/services/mgmt/binary/impl/v23_test.go
+++ b/services/mgmt/binary/impl/v23_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("binaryd", ``, binaryd)
diff --git a/services/mgmt/build/buildd/buildd_v23_test.go b/services/mgmt/build/buildd/buildd_v23_test.go
index 54de166..9f6e3ec 100644
--- a/services/mgmt/build/buildd/buildd_v23_test.go
+++ b/services/mgmt/build/buildd/buildd_v23_test.go
@@ -9,8 +9,8 @@
"runtime"
"strings"
- "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -32,7 +32,7 @@
defer os.RemoveAll(clientCred)
// Start the build server.
- buildServerBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/build/buildd")
+ buildServerBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/build/buildd")
buildServerName := "test-build-server"
goBin, err := exec.LookPath("go")
if err != nil {
@@ -66,7 +66,7 @@
"build", buildServerName, "test",
}
buildEnv := []string{"GOPATH=" + testGoPath, "GOROOT=" + goRoot, "TMPDIR=" + testBinDir}
- buildBin := i.BuildGoPkg("v.io/core/veyron/tools/build")
+ buildBin := i.BuildGoPkg("v.io/x/ref/tools/build")
buildBin.WithEnv(buildEnv...).Start(buildArgs...).WaitOrDie(os.Stdout, os.Stderr)
var testOut bytes.Buffer
testCmd := exec.Command(testBinFile)
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index 6eb78df..49005a0 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -8,10 +8,10 @@
"v.io/v23/services/mgmt/build"
"v.io/x/lib/vlog"
- "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"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/build/impl"
)
var (
diff --git a/services/mgmt/build/buildd/v23_test.go b/services/mgmt/build/buildd/v23_test.go
index 81cedd9..1469093 100644
--- a/services/mgmt/build/buildd/v23_test.go
+++ b/services/mgmt/build/buildd/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index acc7151..2b9e0c6 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -12,8 +12,8 @@
"v.io/v23/context"
"v.io/v23/services/mgmt/build"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
diff --git a/services/mgmt/build/impl/service.go b/services/mgmt/build/impl/service.go
index d403cdd..a35224b 100644
--- a/services/mgmt/build/impl/service.go
+++ b/services/mgmt/build/impl/service.go
@@ -16,7 +16,7 @@
"v.io/x/lib/vlog"
)
-const pkgPath = "v.io/core/veyron/services/mgmt/build/impl"
+const pkgPath = "v.io/x/ref/services/mgmt/build/impl"
// Errors
var (
diff --git a/services/mgmt/build/impl/v23_internal_test.go b/services/mgmt/build/impl/v23_internal_test.go
index 0004205..73b1b67 100644
--- a/services/mgmt/build/impl/v23_internal_test.go
+++ b/services/mgmt/build/impl/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/debug/dispatcher.go b/services/mgmt/debug/dispatcher.go
index 96f3c2e..27b2a36 100644
--- a/services/mgmt/debug/dispatcher.go
+++ b/services/mgmt/debug/dispatcher.go
@@ -7,10 +7,10 @@
"v.io/v23/ipc"
"v.io/v23/security"
- 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"
+ logreaderimpl "v.io/x/ref/services/mgmt/logreader/impl"
+ pprofimpl "v.io/x/ref/services/mgmt/pprof/impl"
+ statsimpl "v.io/x/ref/services/mgmt/stats/impl"
+ vtraceimpl "v.io/x/ref/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 e92fd08..8909c0f 100644
--- a/services/mgmt/debug/dispatcher_test.go
+++ b/services/mgmt/debug/dispatcher_test.go
@@ -23,9 +23,9 @@
"v.io/v23/verror"
"v.io/v23/vtrace"
- libstats "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ libstats "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
// startDebugServer starts a debug server.
diff --git a/services/mgmt/device/config.vdl.go b/services/mgmt/device/config.vdl.go
index a1b101e..e9c48a9 100644
--- a/services/mgmt/device/config.vdl.go
+++ b/services/mgmt/device/config.vdl.go
@@ -119,7 +119,7 @@
// descConfig hides the desc to keep godoc clean.
var descConfig = ipc.InterfaceDesc{
Name: "Config",
- PkgPath: "v.io/core/veyron/services/mgmt/device",
+ PkgPath: "v.io/x/ref/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 fcf2105..f4906bb 100644
--- a/services/mgmt/device/config/config.go
+++ b/services/mgmt/device/config/config.go
@@ -24,8 +24,8 @@
"path/filepath"
"strings"
- "v.io/core/veyron/lib/flags/consts"
"v.io/v23/services/mgmt/application"
+ "v.io/x/ref/lib/flags/consts"
)
// 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 d9d4277..45cdcd9 100644
--- a/services/mgmt/device/config/config_test.go
+++ b/services/mgmt/device/config/config_test.go
@@ -7,7 +7,7 @@
"strings"
"testing"
- "v.io/core/veyron/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/device/config"
"v.io/v23/services/mgmt/application"
)
diff --git a/services/mgmt/device/deviced/commands.go b/services/mgmt/device/deviced/commands.go
index 1585639..61bc7d5 100644
--- a/services/mgmt/device/deviced/commands.go
+++ b/services/mgmt/device/deviced/commands.go
@@ -6,9 +6,9 @@
"v.io/x/lib/cmdline"
- "v.io/core/veyron/services/mgmt/device/impl"
"v.io/v23"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/mgmt/device/impl"
)
var (
diff --git a/services/mgmt/device/deviced/server.go b/services/mgmt/device/deviced/server.go
index df01f28..83f1c23 100644
--- a/services/mgmt/device/deviced/server.go
+++ b/services/mgmt/device/deviced/server.go
@@ -13,11 +13,11 @@
"v.io/x/lib/cmdline"
- vexec "v.io/core/veyron/lib/exec"
- "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/starter"
+ vexec "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/device/starter"
"v.io/v23"
"v.io/v23/ipc"
diff --git a/services/mgmt/device/impl/app_service.go b/services/mgmt/device/impl/app_service.go
index 22eabb1..b9cb816 100644
--- a/services/mgmt/device/impl/app_service.go
+++ b/services/mgmt/device/impl/app_service.go
@@ -145,14 +145,14 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- 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"
- "v.io/core/veyron/services/mgmt/lib/acls"
- libpackages "v.io/core/veyron/services/mgmt/lib/packages"
+ vexec "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/flags/consts"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/keymgr"
+ iconfig "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/lib/acls"
+ libpackages "v.io/x/ref/services/mgmt/lib/packages"
)
// instanceInfo holds state about a running instance.
diff --git a/services/mgmt/device/impl/association_state_test.go b/services/mgmt/device/impl/association_state_test.go
index ee44ef1..f2ddc46 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/core/veyron/services/mgmt/device/impl"
"v.io/v23/services/mgmt/device"
+ "v.io/x/ref/services/mgmt/device/impl"
)
// TestAssociationPersistance verifies correct operation of association
diff --git a/services/mgmt/device/impl/callback.go b/services/mgmt/device/impl/callback.go
index 703b0aa..d8e095b 100644
--- a/services/mgmt/device/impl/callback.go
+++ b/services/mgmt/device/impl/callback.go
@@ -5,8 +5,8 @@
"v.io/v23/mgmt"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/services/mgmt/device"
+ "v.io/x/ref/lib/exec"
+ "v.io/x/ref/services/mgmt/device"
)
// InvokeCallback provides the parent device manager with the given name (which
diff --git a/services/mgmt/device/impl/claim.go b/services/mgmt/device/impl/claim.go
index 14c5eef..eca12f0 100644
--- a/services/mgmt/device/impl/claim.go
+++ b/services/mgmt/device/impl/claim.go
@@ -4,12 +4,12 @@
"crypto/subtle"
"sync"
- "v.io/core/veyron/services/mgmt/lib/acls"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/v23/services/security/access"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/mgmt/lib/acls"
)
// claimable implements the device.Claimable RPC interface and the
diff --git a/services/mgmt/device/impl/device_installer.go b/services/mgmt/device/impl/device_installer.go
index 61435ba..e5f6060 100644
--- a/services/mgmt/device/impl/device_installer.go
+++ b/services/mgmt/device/impl/device_installer.go
@@ -47,9 +47,9 @@
"v.io/v23/naming"
"v.io/v23/services/mgmt/application"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron/services/mgmt/sysinit"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/sysinit"
)
// restartExitCode is the exit code that the device manager should return when it
diff --git a/services/mgmt/device/impl/device_service.go b/services/mgmt/device/impl/device_service.go
index 1344bb8..c84cf6c 100644
--- a/services/mgmt/device/impl/device_service.go
+++ b/services/mgmt/device/impl/device_service.go
@@ -60,11 +60,11 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- vexec "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/flags/consts"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron/services/mgmt/profile"
+ vexec "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/flags/consts"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/profile"
)
type updatingState struct {
diff --git a/services/mgmt/device/impl/dispatcher.go b/services/mgmt/device/impl/dispatcher.go
index c892096..5b6f0e7 100644
--- a/services/mgmt/device/impl/dispatcher.go
+++ b/services/mgmt/device/impl/dispatcher.go
@@ -8,12 +8,12 @@
"strings"
"sync"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/keymgr"
- idevice "v.io/core/veyron/services/mgmt/device"
- "v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron/services/mgmt/lib/acls"
- logsimpl "v.io/core/veyron/services/mgmt/logreader/impl"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/keymgr"
+ idevice "v.io/x/ref/services/mgmt/device"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/lib/acls"
+ logsimpl "v.io/x/ref/services/mgmt/logreader/impl"
"v.io/v23"
"v.io/v23/context"
@@ -63,7 +63,7 @@
deviceSuffix = "device"
configSuffix = "cfg"
- pkgPath = "v.io/core/veyron/services/mgmt/device/impl"
+ pkgPath = "v.io/x/ref/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 b7d972d..96040ef 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/core/veyron/services/mgmt/device/impl"
+ "v.io/x/ref/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 db91252..416dd2b 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -43,19 +43,19 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags/consts"
- "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"
- "v.io/core/veyron/services/mgmt/device/starter"
- libbinary "v.io/core/veyron/services/mgmt/lib/binary"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
- suidhelper "v.io/core/veyron/services/mgmt/suidhelper/impl"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ binaryimpl "v.io/x/ref/services/mgmt/binary/impl"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/device/impl"
+ "v.io/x/ref/services/mgmt/device/starter"
+ libbinary "v.io/x/ref/services/mgmt/lib/binary"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
+ suidhelper "v.io/x/ref/services/mgmt/suidhelper/impl"
)
const (
diff --git a/services/mgmt/device/impl/instance_reaping_test.go b/services/mgmt/device/impl/instance_reaping_test.go
index 7e80f63..587dba7 100644
--- a/services/mgmt/device/impl/instance_reaping_test.go
+++ b/services/mgmt/device/impl/instance_reaping_test.go
@@ -14,10 +14,10 @@
"v.io/v23/services/mgmt/stats"
"v.io/v23/vdl"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
)
// TODO(rjkroege): This helper is generally useful. Move to util_test.go
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index d58de17..5234e14 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -20,7 +20,7 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
+ mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
)
const mockBinaryRepoName = "br"
@@ -103,7 +103,7 @@
// BINARY REPOSITORY INTERFACE IMPLEMENTATION
// TODO(toddw): Move the errors from dispatcher.go into a common location.
-const pkgPath = "v.io/core/veyron/services/mgmt/device/impl"
+const pkgPath = "v.io/x/ref/services/mgmt/device/impl"
var ErrOperationFailed = verror.Register(pkgPath+".OperationFailed", verror.NoRetry, "")
diff --git a/services/mgmt/device/impl/profile.go b/services/mgmt/device/impl/profile.go
index 089242e..004fe2b 100644
--- a/services/mgmt/device/impl/profile.go
+++ b/services/mgmt/device/impl/profile.go
@@ -7,7 +7,7 @@
"runtime"
"strings"
- "v.io/core/veyron/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/profile"
"v.io/v23/services/mgmt/build"
"v.io/v23/services/mgmt/device"
diff --git a/services/mgmt/device/impl/proxy_invoker_test.go b/services/mgmt/device/impl/proxy_invoker_test.go
index 922d82e..436314f 100644
--- a/services/mgmt/device/impl/proxy_invoker_test.go
+++ b/services/mgmt/device/impl/proxy_invoker_test.go
@@ -12,7 +12,7 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/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 8fe235c..a41e94d 100644
--- a/services/mgmt/device/impl/util.go
+++ b/services/mgmt/device/impl/util.go
@@ -9,8 +9,8 @@
"strings"
"time"
- "v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron/services/mgmt/lib/binary"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/lib/binary"
"v.io/v23/context"
"v.io/v23/security"
diff --git a/services/mgmt/device/impl/util_test.go b/services/mgmt/device/impl/util_test.go
index c8e2bca..be0bb48 100644
--- a/services/mgmt/device/impl/util_test.go
+++ b/services/mgmt/device/impl/util_test.go
@@ -10,7 +10,6 @@
"testing"
"time"
- tsecurity "v.io/core/veyron/lib/testutil/security"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -21,11 +20,12 @@
"v.io/v23/services/mgmt/device"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ tsecurity "v.io/x/ref/lib/testutil/security"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/services/mgmt/device/impl"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/services/mgmt/device/impl"
)
const (
diff --git a/services/mgmt/device/starter/starter.go b/services/mgmt/device/starter/starter.go
index ec38c9e..d51b6ab 100644
--- a/services/mgmt/device/starter/starter.go
+++ b/services/mgmt/device/starter/starter.go
@@ -11,11 +11,11 @@
"strconv"
"time"
- "v.io/core/veyron/lib/netstate"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron/services/mgmt/device/impl"
- mounttable "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/netstate"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/services/mgmt/device/config"
+ "v.io/x/ref/services/mgmt/device/impl"
+ mounttable "v.io/x/ref/services/mounttable/lib"
"v.io/v23"
"v.io/v23/context"
diff --git a/services/mgmt/inithelper/main.go b/services/mgmt/inithelper/main.go
index ce13323..7135453 100644
--- a/services/mgmt/inithelper/main.go
+++ b/services/mgmt/inithelper/main.go
@@ -14,7 +14,7 @@
"fmt"
"os"
- "v.io/core/veyron/services/mgmt/sysinit"
+ "v.io/x/ref/services/mgmt/sysinit"
)
func usage() {
diff --git a/services/mgmt/lib/acls/aclaccess.go b/services/mgmt/lib/acls/aclaccess.go
index 1be8dfb..b3169b3 100644
--- a/services/mgmt/lib/acls/aclaccess.go
+++ b/services/mgmt/lib/acls/aclaccess.go
@@ -15,11 +15,11 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/security/serialization"
)
const (
- pkgPath = "v.io/core/veyron/services/mgmt/lib/acls"
+ pkgPath = "v.io/x/ref/services/mgmt/lib/acls"
sigName = "signature"
aclName = "data"
)
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 6da9571..92c7460 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -25,10 +25,10 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/services/mgmt/lib/packages"
+ "v.io/x/ref/services/mgmt/lib/packages"
)
-const pkgPath = "v.io/core/veyron/services/mgmt/lib/binary"
+const pkgPath = "v.io/x/ref/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 94743f3..2915ff9 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -15,9 +15,9 @@
"v.io/v23/services/mgmt/repository"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/binary/impl"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/binary/impl"
)
//go:generate v23 test generate
diff --git a/services/mgmt/lib/binary/v23_internal_test.go b/services/mgmt/lib/binary/v23_internal_test.go
index ec36f83..1b128b9 100644
--- a/services/mgmt/lib/binary/v23_internal_test.go
+++ b/services/mgmt/lib/binary/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index a61b989..6ef9675 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -11,7 +11,7 @@
"strings"
"sync"
- "v.io/core/veyron/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/profile"
"v.io/v23/security"
"v.io/v23/services/mgmt/application"
@@ -23,7 +23,7 @@
// TODO(rjkroege@google.com) Switch Memstore to the mid-August 2014
// style store API.
-const pkgPath = "v.io/core/veyron/services/mgmt/lib/fs"
+const pkgPath = "v.io/x/ref/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 d99b6c2..5069472 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/core/veyron/services/mgmt/lib/fs"
- _ "v.io/core/veyron/services/mgmt/profile"
"v.io/v23/naming"
"v.io/v23/services/mgmt/application"
"v.io/v23/verror"
+ "v.io/x/ref/services/mgmt/lib/fs"
+ _ "v.io/x/ref/services/mgmt/profile"
)
func tempFile(t *testing.T) string {
diff --git a/services/mgmt/lib/packages/packages_test.go b/services/mgmt/lib/packages/packages_test.go
index eb9ac71..8757cd8 100644
--- a/services/mgmt/lib/packages/packages_test.go
+++ b/services/mgmt/lib/packages/packages_test.go
@@ -14,7 +14,7 @@
"v.io/v23/services/mgmt/repository"
- "v.io/core/veyron/services/mgmt/lib/packages"
+ "v.io/x/ref/services/mgmt/lib/packages"
)
func TestInstall(t *testing.T) {
diff --git a/services/mgmt/lib/testutil/modules.go b/services/mgmt/lib/testutil/modules.go
index 5d6435c..a7ee0eb 100644
--- a/services/mgmt/lib/testutil/modules.go
+++ b/services/mgmt/lib/testutil/modules.go
@@ -13,12 +13,12 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "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"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
const (
diff --git a/services/mgmt/logreader/impl/logfile.go b/services/mgmt/logreader/impl/logfile.go
index e983fc9..5b4d0e1 100644
--- a/services/mgmt/logreader/impl/logfile.go
+++ b/services/mgmt/logreader/impl/logfile.go
@@ -18,7 +18,7 @@
"v.io/x/lib/vlog"
)
-const pkgPath = "v.io/core/veyron/services/mgmt/logreader/impl"
+const pkgPath = "v.io/x/ref/services/mgmt/logreader/impl"
var (
errOperationFailed = verror.Register(pkgPath+".errOperationFailed", verror.NoRetry, "{1:}{2:} operation failed{:_}")
diff --git a/services/mgmt/logreader/impl/logfile_test.go b/services/mgmt/logreader/impl/logfile_test.go
index bc40c09..1a59233 100644
--- a/services/mgmt/logreader/impl/logfile_test.go
+++ b/services/mgmt/logreader/impl/logfile_test.go
@@ -6,9 +6,9 @@
"path"
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/logreader/impl"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/logreader/impl"
"v.io/v23"
"v.io/v23/context"
diff --git a/services/mgmt/pprof/client/proxy_test.go b/services/mgmt/pprof/client/proxy_test.go
index ab865d4..f159add 100644
--- a/services/mgmt/pprof/client/proxy_test.go
+++ b/services/mgmt/pprof/client/proxy_test.go
@@ -9,10 +9,10 @@
"v.io/v23"
"v.io/v23/security"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/pprof/client"
- "v.io/core/veyron/services/mgmt/pprof/impl"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/pprof/client"
+ "v.io/x/ref/services/mgmt/pprof/impl"
)
type dispatcher struct {
diff --git a/services/mgmt/pprof/impl/server.go b/services/mgmt/pprof/impl/server.go
index 57e4856..2a4fbc5 100644
--- a/services/mgmt/pprof/impl/server.go
+++ b/services/mgmt/pprof/impl/server.go
@@ -12,7 +12,7 @@
"v.io/v23/verror"
)
-const pkgPath = "v.io/core/veyron/services/mgmt/pprof/impl"
+const pkgPath = "v.io/x/ref/services/mgmt/pprof/impl"
// Errors
var (
diff --git a/services/mgmt/profile/impl/dispatcher.go b/services/mgmt/profile/impl/dispatcher.go
index 80ed4bc..b271ef7 100644
--- a/services/mgmt/profile/impl/dispatcher.go
+++ b/services/mgmt/profile/impl/dispatcher.go
@@ -6,8 +6,8 @@
"v.io/v23/ipc"
"v.io/v23/security"
- "v.io/core/veyron/services/mgmt/lib/fs"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/services/mgmt/lib/fs"
+ "v.io/x/ref/services/mgmt/repository"
)
// 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 eb0c2a5..d5c0b42 100644
--- a/services/mgmt/profile/impl/impl_test.go
+++ b/services/mgmt/profile/impl/impl_test.go
@@ -10,10 +10,10 @@
"v.io/v23/naming"
"v.io/v23/services/mgmt/build"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/repository"
)
var (
diff --git a/services/mgmt/profile/impl/service.go b/services/mgmt/profile/impl/service.go
index 2ec3f93..d435ac5 100644
--- a/services/mgmt/profile/impl/service.go
+++ b/services/mgmt/profile/impl/service.go
@@ -3,9 +3,9 @@
import (
"errors"
- "v.io/core/veyron/services/mgmt/lib/fs"
- "v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/services/mgmt/lib/fs"
+ "v.io/x/ref/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/repository"
"v.io/v23/ipc"
"v.io/v23/naming"
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index c700c18..77ab9a7 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -24,7 +24,7 @@
}
func (Library) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/mgmt/profile.Library"
+ Name string "v.io/x/ref/services/mgmt/profile.Library"
}) {
}
@@ -47,7 +47,7 @@
}
func (Specification) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/mgmt/profile.Specification"
+ Name string "v.io/x/ref/services/mgmt/profile.Specification"
}) {
}
diff --git a/services/mgmt/profile/profiled/main.go b/services/mgmt/profile/profiled/main.go
index b145d2a..bc29399 100644
--- a/services/mgmt/profile/profiled/main.go
+++ b/services/mgmt/profile/profiled/main.go
@@ -6,10 +6,10 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "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"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/profile/impl"
)
var (
diff --git a/services/mgmt/profile/profiled/profiled_v23_test.go b/services/mgmt/profile/profiled/profiled_v23_test.go
index b0085fa..e3c8e18 100644
--- a/services/mgmt/profile/profiled/profiled_v23_test.go
+++ b/services/mgmt/profile/profiled/profiled_v23_test.go
@@ -4,8 +4,8 @@
"os"
"strings"
- "v.io/core/veyron/lib/testutil/v23tests"
"v.io/v23/naming"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -50,9 +50,9 @@
"-name=" + profileRepoName, "-store=" + profileRepoStore,
"-veyron.tcp.address=127.0.0.1:0",
}
- i.BuildGoPkg("v.io/core/veyron/services/mgmt/profile/profiled").Start(args...)
+ i.BuildGoPkg("v.io/x/ref/services/mgmt/profile/profiled").Start(args...)
- clientBin := i.BuildGoPkg("v.io/core/veyron/tools/profile")
+ clientBin := i.BuildGoPkg("v.io/x/ref/tools/profile")
// Create a profile.
const profile = "test-profile"
diff --git a/services/mgmt/profile/profiled/v23_test.go b/services/mgmt/profile/profiled/v23_test.go
index 2a0ff18..6423f2f 100644
--- a/services/mgmt/profile/profiled/v23_test.go
+++ b/services/mgmt/profile/profiled/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index 1db5896..fe59e3a 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -3,7 +3,7 @@
package repository
import (
- "v.io/core/veyron/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/profile"
"v.io/v23/services/mgmt/application"
"v.io/v23/services/security/access"
public "v.io/v23/services/mgmt/repository"
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index 82b735a..68122fd 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -13,11 +13,11 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron/services/mgmt/profile"
"v.io/v23/services/mgmt/application"
"v.io/v23/services/mgmt/repository"
"v.io/v23/services/security/access"
"v.io/v23/services/security/access/object"
+ "v.io/x/ref/services/mgmt/profile"
)
// ApplicationClientMethods is the client interface
@@ -192,7 +192,7 @@
// descApplication hides the desc to keep godoc clean.
var descApplication = ipc.InterfaceDesc{
Name: "Application",
- PkgPath: "v.io/core/veyron/services/mgmt/repository",
+ PkgPath: "v.io/x/ref/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/v23/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."},
@@ -383,7 +383,7 @@
// descProfile hides the desc to keep godoc clean.
var descProfile = ipc.InterfaceDesc{
Name: "Profile",
- PkgPath: "v.io/core/veyron/services/mgmt/repository",
+ PkgPath: "v.io/x/ref/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/v23/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."},
diff --git a/services/mgmt/stats/impl/stats.go b/services/mgmt/stats/impl/stats.go
index 30dea0e..b190044 100644
--- a/services/mgmt/stats/impl/stats.go
+++ b/services/mgmt/stats/impl/stats.go
@@ -6,7 +6,7 @@
"reflect"
"time"
- libstats "v.io/core/veyron/lib/stats"
+ libstats "v.io/x/ref/lib/stats"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -23,7 +23,7 @@
watchFreq time.Duration
}
-const pkgPath = "v.io/core/veyron/services/mgmt/stats/impl"
+const pkgPath = "v.io/x/ref/services/mgmt/stats/impl"
var (
errOperationFailed = verror.Register(pkgPath+".errOperationFailed", verror.NoRetry, "{1:}{2:} operation failed{:_}")
diff --git a/services/mgmt/stats/impl/stats_test.go b/services/mgmt/stats/impl/stats_test.go
index ec92128..52b4ff4 100644
--- a/services/mgmt/stats/impl/stats_test.go
+++ b/services/mgmt/stats/impl/stats_test.go
@@ -14,12 +14,12 @@
"v.io/v23/services/watch/types"
"v.io/v23/vdl"
- 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"
+ libstats "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/histogram"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ istats "v.io/x/ref/services/mgmt/stats"
+ "v.io/x/ref/services/mgmt/stats/impl"
)
type statsDispatcher struct {
diff --git a/services/mgmt/stats/types.vdl.go b/services/mgmt/stats/types.vdl.go
index d39481d..fea5550 100644
--- a/services/mgmt/stats/types.vdl.go
+++ b/services/mgmt/stats/types.vdl.go
@@ -24,7 +24,7 @@
}
func (HistogramValue) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/mgmt/stats.HistogramValue"
+ Name string "v.io/x/ref/services/mgmt/stats.HistogramValue"
}) {
}
@@ -37,7 +37,7 @@
}
func (HistogramBucket) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/mgmt/stats.HistogramBucket"
+ Name string "v.io/x/ref/services/mgmt/stats.HistogramBucket"
}) {
}
diff --git a/services/mgmt/suidhelper/impl/args.go b/services/mgmt/suidhelper/impl/args.go
index 14f6c61..3703e22 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/core/veyron/services/mgmt/suidhelper/impl/flag"
+ sflag "v.io/x/ref/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 a831085..d677e73 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/core/veyron/lib/testutil to depend on this
+// This allows v.io/x/ref/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 fae27d1..82215f5 100644
--- a/services/mgmt/suidhelper/main.go
+++ b/services/mgmt/suidhelper/main.go
@@ -10,7 +10,7 @@
"fmt"
"os"
- "v.io/core/veyron/services/mgmt/suidhelper/impl"
+ "v.io/x/ref/services/mgmt/suidhelper/impl"
)
func main() {
diff --git a/services/mgmt/vtrace/impl/vtrace_test.go b/services/mgmt/vtrace/impl/vtrace_test.go
index c32ac51..8a985c4 100644
--- a/services/mgmt/vtrace/impl/vtrace_test.go
+++ b/services/mgmt/vtrace/impl/vtrace_test.go
@@ -8,9 +8,9 @@
service "v.io/v23/services/mgmt/vtrace"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/vtrace/impl"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/vtrace/impl"
)
func TestVtraceServer(t *testing.T) {
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/lib/collection_test_interface.vdl.go
index f2034a9..493f246 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/lib/collection_test_interface.vdl.go
@@ -140,7 +140,7 @@
// descCollection hides the desc to keep godoc clean.
var descCollection = ipc.InterfaceDesc{
Name: "Collection",
- PkgPath: "v.io/core/veyron/services/mounttable/lib",
+ PkgPath: "v.io/x/ref/services/mounttable/lib",
Methods: []ipc.MethodDesc{
{
Name: "Export",
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index d7b76bc..0b348de 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -9,7 +9,7 @@
"sync"
"time"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
"v.io/v23"
"v.io/v23/ipc"
@@ -22,7 +22,7 @@
)
var (
- errNamingLoop = verror.Register("v.io/core/veyron/services/mountable/lib", verror.NoRetry, "Loop in namespace")
+ errNamingLoop = verror.Register("v.io/x/ref/services/mountable/lib", verror.NoRetry, "Loop in namespace")
traverseTags = []mounttable.Tag{mounttable.Read, mounttable.Resolve, mounttable.Create, mounttable.Admin}
createTags = []mounttable.Tag{mounttable.Create, mounttable.Admin}
removeTags = []mounttable.Tag{mounttable.Admin}
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index e098711..95133aa 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -18,9 +18,9 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
)
// Simulate different processes with different runtimes.
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 3923d60..f42ca9d 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -6,8 +6,8 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/glob"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/glob"
+ "v.io/x/ref/lib/netconfig"
"v.io/v23"
"v.io/v23/ipc"
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index b4f9fa2..4a4f298 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -12,8 +12,8 @@
"v.io/v23/options"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
diff --git a/services/mounttable/lib/v23_internal_test.go b/services/mounttable/lib/v23_internal_test.go
index 63191a3..75af1c0 100644
--- a/services/mounttable/lib/v23_internal_test.go
+++ b/services/mounttable/lib/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 9fc1922..bda91d5 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -9,9 +9,9 @@
"v.io/v23"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- mounttable "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ mounttable "v.io/x/ref/services/mounttable/lib"
)
var (
diff --git a/services/mounttable/mounttabled/mounttabled_v23_test.go b/services/mounttable/mounttabled/mounttabled_v23_test.go
index a8d71e3..7123942 100644
--- a/services/mounttable/mounttabled/mounttabled_v23_test.go
+++ b/services/mounttable/mounttabled/mounttabled_v23_test.go
@@ -5,7 +5,7 @@
"os"
"regexp"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -25,7 +25,7 @@
name, _ := i.GetVar("NAMESPACE_ROOT")
- clientBin := i.BuildGoPkg("v.io/core/veyron/tools/mounttable")
+ clientBin := i.BuildGoPkg("v.io/x/ref/tools/mounttable")
// Get the neighborhood endpoint from the mounttable.
neighborhoodEndpoint := clientBin.Start("glob", name, "nh").ExpectSetEventuallyRE(`^nh (.*) \(TTL .*\)$`)[0][1]
diff --git a/services/mounttable/mounttabled/v23_test.go b/services/mounttable/mounttabled/v23_test.go
index db48ac9..94882ef 100644
--- a/services/mounttable/mounttabled/v23_test.go
+++ b/services/mounttable/mounttabled/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index 4a718d6..1c4de4a 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -15,10 +15,10 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/lib/publisher"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/lib/publisher"
)
var (
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index 04e2c57..9c4f1e1 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -126,7 +126,7 @@
// descDischarger hides the desc to keep godoc clean.
var descDischarger = ipc.InterfaceDesc{
Name: "Discharger",
- PkgPath: "v.io/core/veyron/services/security",
+ PkgPath: "v.io/x/ref/services/security",
Doc: "// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.",
Methods: []ipc.MethodDesc{
{
diff --git a/services/security/discharger/discharger.go b/services/security/discharger/discharger.go
index 7695fec..1463d00 100644
--- a/services/security/discharger/discharger.go
+++ b/services/security/discharger/discharger.go
@@ -4,9 +4,9 @@
"fmt"
"time"
- services "v.io/core/veyron/services/security"
"v.io/v23/ipc"
"v.io/v23/security"
+ services "v.io/x/ref/services/security"
)
// dischargerd issues discharges for all caveats present in the current
diff --git a/services/security/groups/grpserverd/main.go b/services/security/groups/grpserverd/main.go
index a2c8f34..f1b70aa 100644
--- a/services/security/groups/grpserverd/main.go
+++ b/services/security/groups/grpserverd/main.go
@@ -11,10 +11,10 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/services/security/groups/memstore"
- "v.io/core/veyron/services/security/groups/server"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/services/security/groups/memstore"
+ "v.io/x/ref/services/security/groups/server"
)
// TODO(sadovsky): Perhaps this should be one of the standard Veyron flags.
diff --git a/services/security/groups/memstore/memstore.go b/services/security/groups/memstore/memstore.go
index 4582a1a..eaa69dc 100644
--- a/services/security/groups/memstore/memstore.go
+++ b/services/security/groups/memstore/memstore.go
@@ -7,7 +7,7 @@
"strconv"
"sync"
- "v.io/core/veyron/services/security/groups/server"
+ "v.io/x/ref/services/security/groups/server"
)
type entry struct {
diff --git a/services/security/groups/server/server_test.go b/services/security/groups/server/server_test.go
index f8e71b5..61931f4 100644
--- a/services/security/groups/server/server_test.go
+++ b/services/security/groups/server/server_test.go
@@ -14,10 +14,10 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/security/groups/memstore"
- "v.io/core/veyron/services/security/groups/server"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/security/groups/memstore"
+ "v.io/x/ref/services/security/groups/server"
)
func getEntriesOrDie(g groups.GroupClientStub, ctx *context.T, t *testing.T) map[groups.BlessingPatternChunk]struct{} {
diff --git a/services/security/groups/server/types.vdl.go b/services/security/groups/server/types.vdl.go
index 45812c1..f9644d4 100644
--- a/services/security/groups/server/types.vdl.go
+++ b/services/security/groups/server/types.vdl.go
@@ -20,7 +20,7 @@
}
func (groupData) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/security/groups/server.groupData"
+ Name string "v.io/x/ref/services/security/groups/server.groupData"
}) {
}
diff --git a/services/wsprd/account/account.go b/services/wsprd/account/account.go
index 35e50bf..3d0a477 100644
--- a/services/wsprd/account/account.go
+++ b/services/wsprd/account/account.go
@@ -6,12 +6,12 @@
"strings"
"time"
- "v.io/core/veyron/services/wsprd/principal"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/principal"
)
type BlesserService interface {
diff --git a/services/wsprd/account/account.vdl.go b/services/wsprd/account/account.vdl.go
index c613456..6254a70 100644
--- a/services/wsprd/account/account.vdl.go
+++ b/services/wsprd/account/account.vdl.go
@@ -15,7 +15,7 @@
}
func (Caveat) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/account.Caveat"
+ Name string "v.io/x/ref/services/wsprd/account.Caveat"
}) {
}
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index 82dafa1..5a84c66 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -12,11 +12,6 @@
"sync"
"time"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/services/wsprd/ipc/server"
- "v.io/core/veyron/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/namespace"
- "v.io/core/veyron/services/wsprd/principal"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -29,10 +24,15 @@
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/services/wsprd/ipc/server"
+ "v.io/x/ref/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/namespace"
+ "v.io/x/ref/services/wsprd/principal"
)
// pkgPath is the prefix os errors in this package.
-const pkgPath = "v.io/core/veyron/services/wsprd/app"
+const pkgPath = "v.io/x/ref/services/wsprd/app"
// Errors
var (
diff --git a/services/wsprd/app/app.vdl.go b/services/wsprd/app/app.vdl.go
index 450683e..a8b1d03 100644
--- a/services/wsprd/app/app.vdl.go
+++ b/services/wsprd/app/app.vdl.go
@@ -25,7 +25,7 @@
}
func (VeyronRPCRequest) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/app.VeyronRPCRequest"
+ Name string "v.io/x/ref/services/wsprd/app.VeyronRPCRequest"
}) {
}
@@ -35,7 +35,7 @@
}
func (VeyronRPCResponse) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/app.VeyronRPCResponse"
+ Name string "v.io/x/ref/services/wsprd/app.VeyronRPCResponse"
}) {
}
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 20bab21..4c8f3b4 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -8,15 +8,6 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- vsecurity "v.io/core/veyron/security"
- mounttable "v.io/core/veyron/services/mounttable/lib"
- "v.io/core/veyron/services/wsprd/ipc/server"
- "v.io/core/veyron/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/lib/testwriter"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -28,6 +19,15 @@
"v.io/v23/verror"
"v.io/v23/vom"
"v.io/v23/vtrace"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ vsecurity "v.io/x/ref/security"
+ mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/wsprd/ipc/server"
+ "v.io/x/ref/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/lib/testwriter"
)
var (
diff --git a/services/wsprd/app/controller.vdl.go b/services/wsprd/app/controller.vdl.go
index bd8d860..61951f1 100644
--- a/services/wsprd/app/controller.vdl.go
+++ b/services/wsprd/app/controller.vdl.go
@@ -261,7 +261,7 @@
// descController hides the desc to keep godoc clean.
var descController = ipc.InterfaceDesc{
Name: "Controller",
- PkgPath: "v.io/core/veyron/services/wsprd/app",
+ PkgPath: "v.io/x/ref/services/wsprd/app",
Methods: []ipc.MethodDesc{
{
Name: "Serve",
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index 01aab7d..336fdf5 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -6,15 +6,15 @@
"path/filepath"
"runtime"
- "v.io/core/veyron/services/wsprd/lib"
"v.io/v23/verror"
"v.io/v23/vom"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/lib"
)
const (
- verrorPkgPath = "v.io/core/veyron/services/wsprd/app"
+ verrorPkgPath = "v.io/x/ref/services/wsprd/app"
)
var (
diff --git a/services/wsprd/app/mock_jsServer_test.go b/services/wsprd/app/mock_jsServer_test.go
index b3b9e17..1d5595e 100644
--- a/services/wsprd/app/mock_jsServer_test.go
+++ b/services/wsprd/app/mock_jsServer_test.go
@@ -8,12 +8,12 @@
"sync"
"testing"
- "v.io/core/veyron/services/wsprd/ipc/server"
- "v.io/core/veyron/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/principal"
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
"v.io/v23/vom"
+ "v.io/x/ref/services/wsprd/ipc/server"
+ "v.io/x/ref/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/principal"
)
type mockJSServer struct {
diff --git a/services/wsprd/app/stream.go b/services/wsprd/app/stream.go
index 573a6f0..822e2ac 100644
--- a/services/wsprd/app/stream.go
+++ b/services/wsprd/app/stream.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/services/wsprd/lib"
"v.io/v23/ipc"
+ "v.io/x/ref/services/wsprd/lib"
)
type initConfig struct {
diff --git a/services/wsprd/browspr/browspr.go b/services/wsprd/browspr/browspr.go
index 6e61e90..08144eb 100644
--- a/services/wsprd/browspr/browspr.go
+++ b/services/wsprd/browspr/browspr.go
@@ -6,14 +6,14 @@
"reflect"
"sync"
- "v.io/core/veyron/services/wsprd/account"
- "v.io/core/veyron/services/wsprd/principal"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/vdl"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/account"
+ "v.io/x/ref/services/wsprd/principal"
)
// Browspr is an intermediary between our javascript code and the veyron
diff --git a/services/wsprd/browspr/browspr.vdl b/services/wsprd/browspr/browspr.vdl
index ef14e64..263b601 100644
--- a/services/wsprd/browspr/browspr.vdl
+++ b/services/wsprd/browspr/browspr.vdl
@@ -1,7 +1,7 @@
package browspr
import(
- "v.io/core/veyron/services/wsprd/account"
+ "v.io/x/ref/services/wsprd/account"
)
type StartMessage struct {
@@ -14,7 +14,7 @@
}
// Copied from
-// v.io/core/veyron/services/identity/handlers/blessing_root.go, since
+// v.io/x/ref/services/identity/handlers/blessing_root.go, since
// depcop prohibits importing that package.
type blessingRoot struct {
Names []string
diff --git a/services/wsprd/browspr/browspr.vdl.go b/services/wsprd/browspr/browspr.vdl.go
index 15db29e..c0eeeee 100644
--- a/services/wsprd/browspr/browspr.vdl.go
+++ b/services/wsprd/browspr/browspr.vdl.go
@@ -8,7 +8,7 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron/services/wsprd/account"
+ "v.io/x/ref/services/wsprd/account"
)
type StartMessage struct {
@@ -21,12 +21,12 @@
}
func (StartMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.StartMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.StartMessage"
}) {
}
// Copied from
-// v.io/core/veyron/services/identity/handlers/blessing_root.go, since
+// v.io/x/ref/services/identity/handlers/blessing_root.go, since
// depcop prohibits importing that package.
type blessingRoot struct {
Names []string
@@ -34,7 +34,7 @@
}
func (blessingRoot) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.blessingRoot"
+ Name string "v.io/x/ref/services/wsprd/browspr.blessingRoot"
}) {
}
@@ -45,7 +45,7 @@
}
func (AssociateAccountMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.AssociateAccountMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.AssociateAccountMessage"
}) {
}
@@ -54,7 +54,7 @@
}
func (CreateAccountMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.CreateAccountMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.CreateAccountMessage"
}) {
}
@@ -63,7 +63,7 @@
}
func (CleanupMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.CleanupMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.CleanupMessage"
}) {
}
@@ -72,7 +72,7 @@
}
func (OriginHasAccountMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.OriginHasAccountMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.OriginHasAccountMessage"
}) {
}
@@ -80,7 +80,7 @@
}
func (GetAccountsMessage) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/browspr.GetAccountsMessage"
+ Name string "v.io/x/ref/services/wsprd/browspr.GetAccountsMessage"
}) {
}
diff --git a/services/wsprd/browspr/browspr_account_test.go b/services/wsprd/browspr/browspr_account_test.go
index 8142fd2..a1e39ba 100644
--- a/services/wsprd/browspr/browspr_account_test.go
+++ b/services/wsprd/browspr/browspr_account_test.go
@@ -10,8 +10,8 @@
"v.io/v23/security"
"v.io/v23/vdl"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
const topLevelName = "mock-blesser"
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index cb3ac35..68e1720 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -16,12 +16,12 @@
"v.io/v23/vdl"
"v.io/v23/vom"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- mounttable "v.io/core/veyron/services/mounttable/lib"
- "v.io/core/veyron/services/wsprd/app"
- "v.io/core/veyron/services/wsprd/lib"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/wsprd/app"
+ "v.io/x/ref/services/wsprd/lib"
)
func startProxy() (*proxy.Proxy, error) {
diff --git a/services/wsprd/browspr/main/main_nacl.go b/services/wsprd/browspr/main/main_nacl.go
index 5f25676..5b2912b 100644
--- a/services/wsprd/browspr/main/main_nacl.go
+++ b/services/wsprd/browspr/main/main_nacl.go
@@ -8,15 +8,15 @@
"runtime"
"runtime/ppapi"
- "v.io/core/veyron/lib/websocket"
- _ "v.io/core/veyron/profiles/chrome"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/services/wsprd/browspr"
- "v.io/core/veyron/services/wsprd/channel/channel_nacl"
"v.io/v23"
"v.io/v23/security"
"v.io/v23/vdl"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/websocket"
+ _ "v.io/x/ref/profiles/chrome"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/services/wsprd/browspr"
+ "v.io/x/ref/services/wsprd/channel/channel_nacl"
)
func main() {
diff --git a/services/wsprd/browspr/pipe.go b/services/wsprd/browspr/pipe.go
index c055154..6061380 100644
--- a/services/wsprd/browspr/pipe.go
+++ b/services/wsprd/browspr/pipe.go
@@ -4,9 +4,9 @@
"encoding/json"
"fmt"
- "v.io/core/veyron/services/wsprd/app"
- "v.io/core/veyron/services/wsprd/lib"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/app"
+ "v.io/x/ref/services/wsprd/lib"
)
// pipe controls the flow of messages for a specific instance (corresponding to a specific tab).
diff --git a/services/wsprd/browspr/writer.go b/services/wsprd/browspr/writer.go
index 6278583..0bd5c16 100644
--- a/services/wsprd/browspr/writer.go
+++ b/services/wsprd/browspr/writer.go
@@ -1,8 +1,8 @@
package browspr
import (
- "v.io/core/veyron/services/wsprd/app"
- "v.io/core/veyron/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/app"
+ "v.io/x/ref/services/wsprd/lib"
)
// postMessageWriter is a lib.ClientWriter that handles sending messages over postMessage to the extension.
diff --git a/services/wsprd/channel/channel.vdl.go b/services/wsprd/channel/channel.vdl.go
index 5988c5f..deaa85c 100644
--- a/services/wsprd/channel/channel.vdl.go
+++ b/services/wsprd/channel/channel.vdl.go
@@ -15,7 +15,7 @@
}
func (Request) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/channel.Request"
+ Name string "v.io/x/ref/services/wsprd/channel.Request"
}) {
}
@@ -26,7 +26,7 @@
}
func (Response) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/channel.Response"
+ Name string "v.io/x/ref/services/wsprd/channel.Response"
}) {
}
@@ -48,7 +48,7 @@
MessageResponse struct{ Value Response }
// __MessageReflect describes the Message union type.
__MessageReflect struct {
- Name string "v.io/core/veyron/services/wsprd/channel.Message"
+ Name string "v.io/x/ref/services/wsprd/channel.Message"
Type Message
Union struct {
Request MessageRequest
diff --git a/services/wsprd/channel/channel_nacl/channel_nacl.go b/services/wsprd/channel/channel_nacl/channel_nacl.go
index 781e65f..f910ca0 100644
--- a/services/wsprd/channel/channel_nacl/channel_nacl.go
+++ b/services/wsprd/channel/channel_nacl/channel_nacl.go
@@ -7,7 +7,7 @@
"v.io/v23/vdl"
"v.io/v23/vom"
- "v.io/core/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
+ "v.io/x/ref/services/wsprd/channel" // contains most of the logic, factored out for testing
)
type Channel struct {
diff --git a/services/wsprd/channel/channel_test.go b/services/wsprd/channel/channel_test.go
index 5304bcc..4a2506a 100644
--- a/services/wsprd/channel/channel_test.go
+++ b/services/wsprd/channel/channel_test.go
@@ -5,8 +5,8 @@
"sync"
"testing"
- "v.io/core/veyron/services/wsprd/channel"
"v.io/v23/vdl"
+ "v.io/x/ref/services/wsprd/channel"
)
func TestChannelRpcs(t *testing.T) {
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index 8f46ca8..2fdb00a 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -6,7 +6,7 @@
"fmt"
"sync"
- "v.io/core/veyron/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/lib"
"v.io/v23/ipc"
"v.io/v23/security"
diff --git a/services/wsprd/ipc/server/dispatcher_test.go b/services/wsprd/ipc/server/dispatcher_test.go
index 264ed46..67022e3 100644
--- a/services/wsprd/ipc/server/dispatcher_test.go
+++ b/services/wsprd/ipc/server/dispatcher_test.go
@@ -5,12 +5,12 @@
"reflect"
"testing"
- "v.io/core/veyron/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/lib/testwriter"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
+ "v.io/x/ref/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/lib/testwriter"
)
type mockFlowFactory struct {
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index 346427c..b41ef6c 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -11,7 +11,7 @@
var typedNil []int
-const pkgPath = "v.io/core/veyron/services/wsprd/ipc/server"
+const pkgPath = "v.io/x/ref/services/wsprd/ipc/server"
// Errors.
var (
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index ffddebf..d37aa51 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -8,8 +8,8 @@
"sync"
"time"
- "v.io/core/veyron/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/principal"
+ "v.io/x/ref/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/principal"
"v.io/v23"
"v.io/v23/context"
diff --git a/services/wsprd/ipc/server/server.vdl b/services/wsprd/ipc/server/server.vdl
index e729d10..e94afd3 100644
--- a/services/wsprd/ipc/server/server.vdl
+++ b/services/wsprd/ipc/server/server.vdl
@@ -1,7 +1,7 @@
package server
import (
- "v.io/core/veyron/services/wsprd/principal"
+ "v.io/x/ref/services/wsprd/principal"
"v.io/v23/security"
)
diff --git a/services/wsprd/ipc/server/server.vdl.go b/services/wsprd/ipc/server/server.vdl.go
index 562a2fd..58908d5 100644
--- a/services/wsprd/ipc/server/server.vdl.go
+++ b/services/wsprd/ipc/server/server.vdl.go
@@ -11,8 +11,8 @@
"v.io/v23/verror"
// VDL user imports
- "v.io/core/veyron/services/wsprd/principal"
"v.io/v23/security"
+ "v.io/x/ref/services/wsprd/principal"
)
type SecurityContext struct {
@@ -28,7 +28,7 @@
}
func (SecurityContext) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/ipc/server.SecurityContext"
+ Name string "v.io/x/ref/services/wsprd/ipc/server.SecurityContext"
}) {
}
@@ -38,7 +38,7 @@
}
func (CaveatValidationRequest) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationRequest"
+ Name string "v.io/x/ref/services/wsprd/ipc/server.CaveatValidationRequest"
}) {
}
@@ -47,7 +47,7 @@
}
func (CaveatValidationResponse) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationResponse"
+ Name string "v.io/x/ref/services/wsprd/ipc/server.CaveatValidationResponse"
}) {
}
@@ -58,8 +58,8 @@
}
var (
- ErrCaveatValidationTimeout = verror.Register("v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationTimeout", verror.NoRetry, "{1:}{2:} Caveat validation has timed out")
- ErrInvalidValidationResponseFromJavascript = verror.Register("v.io/core/veyron/services/wsprd/ipc/server.InvalidValidationResponseFromJavascript", verror.NoRetry, "{1:}{2:} Invalid validation response from javascript")
+ ErrCaveatValidationTimeout = verror.Register("v.io/x/ref/services/wsprd/ipc/server.CaveatValidationTimeout", verror.NoRetry, "{1:}{2:} Caveat validation has timed out")
+ ErrInvalidValidationResponseFromJavascript = verror.Register("v.io/x/ref/services/wsprd/ipc/server.InvalidValidationResponseFromJavascript", verror.NoRetry, "{1:}{2:} Invalid validation response from javascript")
)
func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index 3671f8c..b516dfa 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -54,7 +54,7 @@
return time.Now().Sub(c.lastAccessed) > ttl
}
-const pkgPath = "v.io/core/veyron/services/wsprd/lib"
+const pkgPath = "v.io/x/ref/services/wsprd/lib"
func (sm *signatureManager) lookupCacheLocked(name string) []signature.Interface {
if entry := sm.cache[name]; entry != nil && !entry.expired() {
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index 2cf47c5..4d62ad3 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -5,13 +5,13 @@
"sync"
"testing"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/profiles/fake"
- mocks_ipc "v.io/core/veyron/runtimes/google/testing/mocks/ipc"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/profiles/fake"
+ mocks_ipc "v.io/x/ref/runtimes/google/testing/mocks/ipc"
)
const (
diff --git a/services/wsprd/lib/testwriter/writer.go b/services/wsprd/lib/testwriter/writer.go
index b684a20..ac77a47 100644
--- a/services/wsprd/lib/testwriter/writer.go
+++ b/services/wsprd/lib/testwriter/writer.go
@@ -8,8 +8,8 @@
"sync"
"time"
- "v.io/core/veyron/services/wsprd/lib"
"v.io/v23/verror"
+ "v.io/x/ref/services/wsprd/lib"
)
type TestHarness interface {
diff --git a/services/wsprd/lib/writer.vdl.go b/services/wsprd/lib/writer.vdl.go
index 2187d50..e0f585d 100644
--- a/services/wsprd/lib/writer.vdl.go
+++ b/services/wsprd/lib/writer.vdl.go
@@ -15,7 +15,7 @@
}
func (ServerRPCReply) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/lib.ServerRPCReply"
+ Name string "v.io/x/ref/services/wsprd/lib.ServerRPCReply"
}) {
}
diff --git a/services/wsprd/namespace/namespace.vdl.go b/services/wsprd/namespace/namespace.vdl.go
index 5963756..49296b3 100644
--- a/services/wsprd/namespace/namespace.vdl.go
+++ b/services/wsprd/namespace/namespace.vdl.go
@@ -131,7 +131,7 @@
// descWorkaround hides the desc to keep godoc clean.
var descWorkaround = ipc.InterfaceDesc{
Name: "Workaround",
- PkgPath: "v.io/core/veyron/services/wsprd/namespace",
+ PkgPath: "v.io/x/ref/services/wsprd/namespace",
Doc: "// TODO(nlacasse,bprosnitz): Remove this unused type and the security import\n// once https://github.com/veyron/release-issues/issues/1202 is fixed.",
Methods: []ipc.MethodDesc{
{
@@ -512,7 +512,7 @@
// descNamespace hides the desc to keep godoc clean.
var descNamespace = ipc.InterfaceDesc{
Name: "Namespace",
- PkgPath: "v.io/core/veyron/services/wsprd/namespace",
+ PkgPath: "v.io/x/ref/services/wsprd/namespace",
Methods: []ipc.MethodDesc{
{
Name: "Glob",
diff --git a/services/wsprd/principal/blessings.vdl.go b/services/wsprd/principal/blessings.vdl.go
index 70939be..a08f2cf 100644
--- a/services/wsprd/principal/blessings.vdl.go
+++ b/services/wsprd/principal/blessings.vdl.go
@@ -14,7 +14,7 @@
}
func (BlessingsHandle) __VDLReflect(struct {
- Name string "v.io/core/veyron/services/wsprd/principal.BlessingsHandle"
+ Name string "v.io/x/ref/services/wsprd/principal.BlessingsHandle"
}) {
}
diff --git a/services/wsprd/principal/principal.go b/services/wsprd/principal/principal.go
index d26d42c..405ef17 100644
--- a/services/wsprd/principal/principal.go
+++ b/services/wsprd/principal/principal.go
@@ -34,8 +34,8 @@
"sync"
"time"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/security/serialization"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
"v.io/v23/verror"
@@ -66,7 +66,7 @@
Accounts map[string]security.Blessings
}
-const pkgPath = "v.io/core/veyron/services/wsprd/principal"
+const pkgPath = "v.io/x/ref/services/wsprd/principal"
// Errors.
var (
diff --git a/services/wsprd/principal/util_test.go b/services/wsprd/principal/util_test.go
index 7708ec2..f0c76b2 100644
--- a/services/wsprd/principal/util_test.go
+++ b/services/wsprd/principal/util_test.go
@@ -4,7 +4,7 @@
"fmt"
"strings"
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/security"
"v.io/v23/verror"
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index e9b4808..aeecd57 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -7,10 +7,10 @@
"v.io/v23"
- "v.io/core/veyron/lib/signals"
+ "v.io/x/ref/lib/signals"
// TODO(cnicolaou,benj): figure out how to support roaming as a chrome plugin
- _ "v.io/core/veyron/profiles/roaming"
- "v.io/core/veyron/services/wsprd/wspr"
+ _ "v.io/x/ref/profiles/roaming"
+ "v.io/x/ref/services/wsprd/wspr"
)
func main() {
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index b961401..fb99139 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -8,10 +8,10 @@
_ "net/http/pprof"
"time"
- "v.io/core/veyron/services/wsprd/app"
- "v.io/core/veyron/services/wsprd/lib"
"v.io/v23"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/app"
+ "v.io/x/ref/services/wsprd/lib"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index fecc6cd..30804d7 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -5,11 +5,11 @@
"path/filepath"
"runtime"
- "v.io/core/veyron/services/wsprd/lib"
+ "v.io/x/ref/services/wsprd/lib"
- "v.io/core/veyron/services/wsprd/app"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/wsprd/app"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/wspr.go b/services/wsprd/wspr/wspr.go
index 8a26f1d..8e60946 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -30,8 +30,8 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/services/wsprd/account"
- "v.io/core/veyron/services/wsprd/principal"
+ "v.io/x/ref/services/wsprd/account"
+ "v.io/x/ref/services/wsprd/principal"
)
const (
diff --git a/tools/GO.PACKAGE b/tools/GO.PACKAGE
index 3797482..6176e10 100644
--- a/tools/GO.PACKAGE
+++ b/tools/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/tools/..."},
+ {"allow": "v.io/x/ref/tools/..."},
{"deny": "..."}
]
}
diff --git a/tools/application/impl.go b/tools/application/impl.go
index 5100c5b..4cae1ee 100644
--- a/tools/application/impl.go
+++ b/tools/application/impl.go
@@ -12,12 +12,12 @@
"strings"
"time"
- "v.io/core/veyron/services/mgmt/repository"
"v.io/v23/context"
"v.io/v23/security"
"v.io/v23/services/mgmt/application"
"v.io/v23/vom"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/services/mgmt/repository"
)
// TODO(ashankar): application.Envelope is no longer JSON friendly
diff --git a/tools/application/impl_test.go b/tools/application/impl_test.go
index c3bd663..9ef3a08 100644
--- a/tools/application/impl_test.go
+++ b/tools/application/impl_test.go
@@ -16,9 +16,9 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/repository"
)
var (
diff --git a/tools/application/main.go b/tools/application/main.go
index b18ec86..03caf91 100644
--- a/tools/application/main.go
+++ b/tools/application/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/binary/impl.go b/tools/binary/impl.go
index a967a39..2739c01 100644
--- a/tools/binary/impl.go
+++ b/tools/binary/impl.go
@@ -4,8 +4,8 @@
"fmt"
"os"
- "v.io/core/veyron/services/mgmt/lib/binary"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/services/mgmt/lib/binary"
)
var cmdDelete = &cmdline.Command{
diff --git a/tools/binary/impl_test.go b/tools/binary/impl_test.go
index ad273eb..e46f0a3 100644
--- a/tools/binary/impl_test.go
+++ b/tools/binary/impl_test.go
@@ -21,8 +21,8 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
type server struct {
diff --git a/tools/binary/main.go b/tools/binary/main.go
index b18ec86..03caf91 100644
--- a/tools/binary/main.go
+++ b/tools/binary/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/build/impl_test.go b/tools/build/impl_test.go
index f60f829..f4bd30f 100644
--- a/tools/build/impl_test.go
+++ b/tools/build/impl_test.go
@@ -14,8 +14,8 @@
"v.io/v23/verror"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
type mock struct{}
@@ -75,7 +75,7 @@
cmd.Init(nil, &stdout, &stderr)
// Test the 'Build' command.
- if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "v.io/core/veyron/tools/build"}); err != nil {
+ if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "v.io/x/ref/tools/build"}); err != nil {
t.Fatalf("%v", err)
}
if expected, got := "", strings.TrimSpace(stdout.String()); got != expected {
diff --git a/tools/build/main.go b/tools/build/main.go
index 3e0dab7..6d3c698 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/debug/debug_v23_test.go b/tools/debug/debug_v23_test.go
index 5bf53a0..f4beb95 100644
--- a/tools/debug/debug_v23_test.go
+++ b/tools/debug/debug_v23_test.go
@@ -10,7 +10,7 @@
"strings"
"time"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -18,7 +18,7 @@
func V23TestDebugGlob(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
inv := binary.Start("glob", "__debug/*")
var want string
@@ -35,7 +35,7 @@
// Create a temp file before we list the logs.
fileName := filepath.Base(i.NewTempFile().Name())
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
output := binary.Start("glob", "__debug/logs/*").Output()
// The output should contain the filename.
@@ -49,7 +49,7 @@
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
path := "__debug/stats/system/hostname"
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
got := binary.Start("stats", "read", path).Output()
hostname, err := os.Hostname()
if err != nil {
@@ -72,7 +72,7 @@
func V23TestLogSize(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
testLogData := "This is a test log file"
file := createTestLogFile(i, testLogData)
@@ -91,7 +91,7 @@
func V23TestStatsRead(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
testLogData := "This is a test log file\n"
file := createTestLogFile(i, testLogData)
logName := filepath.Base(file.Name())
@@ -111,7 +111,7 @@
func V23TestStatsWatch(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
testLogData := "This is a test log file\n"
file := createTestLogFile(i, testLogData)
logName := filepath.Base(file.Name())
@@ -150,7 +150,7 @@
func V23TestVTrace(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
logContent := "Hello, world!\n"
logPath := "__debug/logs/" + filepath.Base(createTestLogFile(i, logContent).Name())
// Create a log file with tracing, read it and check that the resulting trace exists.
@@ -203,7 +203,7 @@
func V23TestPprof(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- binary := i.BuildGoPkg("v.io/core/veyron/tools/debug")
+ binary := i.BuildGoPkg("v.io/x/ref/tools/debug")
inv := binary.Start("pprof", "run", "__debug/pprof", "heap", "--text")
// Assert that a profile indicating the heap size was written out.
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index fd9034e..40c4498 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -10,9 +10,6 @@
"sync"
"time"
- "v.io/core/veyron/lib/glob"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/services/mgmt/pprof/client"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/naming"
@@ -27,6 +24,9 @@
"v.io/v23/vdl"
"v.io/v23/vtrace"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/lib/glob"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/services/mgmt/pprof/client"
)
var (
diff --git a/tools/debug/main.go b/tools/debug/main.go
index b18ec86..03caf91 100644
--- a/tools/debug/main.go
+++ b/tools/debug/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/debug/v23_test.go b/tools/debug/v23_test.go
index a9e94b2..b3cf055 100644
--- a/tools/debug/v23_test.go
+++ b/tools/debug/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/tools/findunusedport/main.go b/tools/findunusedport/main.go
index bac444e..9d08a3a 100644
--- a/tools/findunusedport/main.go
+++ b/tools/findunusedport/main.go
@@ -5,8 +5,8 @@
import (
"fmt"
- "v.io/core/veyron/lib/testutil"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/testutil"
)
func main() {
diff --git a/tools/mgmt/device/impl/acl_test.go b/tools/mgmt/device/impl/acl_test.go
index e8188b2..819660f 100644
--- a/tools/mgmt/device/impl/acl_test.go
+++ b/tools/mgmt/device/impl/acl_test.go
@@ -11,10 +11,10 @@
"v.io/v23/services/security/access"
"v.io/v23/verror"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
-const pkgPath = "v.io/core/veyron/tools/mgmt/device/main"
+const pkgPath = "v.io/x/ref/tools/mgmt/device/main"
var (
errOops = verror.Register(pkgPath+".errOops", verror.NoRetry, "oops!")
diff --git a/tools/mgmt/device/impl/devicemanager_mock_test.go b/tools/mgmt/device/impl/devicemanager_mock_test.go
index 344275f..cebf014 100644
--- a/tools/mgmt/device/impl/devicemanager_mock_test.go
+++ b/tools/mgmt/device/impl/devicemanager_mock_test.go
@@ -20,8 +20,8 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- binlib "v.io/core/veyron/services/mgmt/lib/binary"
- pkglib "v.io/core/veyron/services/mgmt/lib/packages"
+ binlib "v.io/x/ref/services/mgmt/lib/binary"
+ pkglib "v.io/x/ref/services/mgmt/lib/packages"
)
type mockDeviceInvoker struct {
diff --git a/tools/mgmt/device/impl/impl_test.go b/tools/mgmt/device/impl/impl_test.go
index 081bcda..700c3fe 100644
--- a/tools/mgmt/device/impl/impl_test.go
+++ b/tools/mgmt/device/impl/impl_test.go
@@ -15,8 +15,8 @@
"v.io/v23/services/mgmt/device"
"v.io/v23/verror"
- "v.io/core/veyron/security"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ "v.io/x/ref/security"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
func TestListCommand(t *testing.T) {
diff --git a/tools/mgmt/device/impl/instance_impl_test.go b/tools/mgmt/device/impl/instance_impl_test.go
index 1a5e082..7c7df24 100644
--- a/tools/mgmt/device/impl/instance_impl_test.go
+++ b/tools/mgmt/device/impl/instance_impl_test.go
@@ -9,7 +9,7 @@
"v.io/v23/naming"
"v.io/v23/verror"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
func TestStopCommand(t *testing.T) {
diff --git a/tools/mgmt/device/impl/local_install.go b/tools/mgmt/device/impl/local_install.go
index 1502ec7..4054201 100644
--- a/tools/mgmt/device/impl/local_install.go
+++ b/tools/mgmt/device/impl/local_install.go
@@ -23,8 +23,8 @@
"v.io/v23/uniqueid"
"v.io/x/lib/vlog"
- pkglib "v.io/core/veyron/services/mgmt/lib/packages"
"v.io/x/lib/cmdline"
+ pkglib "v.io/x/ref/services/mgmt/lib/packages"
)
var cmdInstallLocal = &cmdline.Command{
diff --git a/tools/mgmt/device/impl/local_install_test.go b/tools/mgmt/device/impl/local_install_test.go
index 4889e62..d7b5374 100644
--- a/tools/mgmt/device/impl/local_install_test.go
+++ b/tools/mgmt/device/impl/local_install_test.go
@@ -16,7 +16,7 @@
"v.io/v23/services/mgmt/application"
"v.io/v23/services/mgmt/device"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
func createFile(t *testing.T, path string, contents string) {
diff --git a/tools/mgmt/device/impl/util_test.go b/tools/mgmt/device/impl/util_test.go
index 04b952a..ecb1d9a 100644
--- a/tools/mgmt/device/impl/util_test.go
+++ b/tools/mgmt/device/impl/util_test.go
@@ -4,9 +4,9 @@
"v.io/v23"
"v.io/v23/context"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
var gctx *context.T
diff --git a/tools/mgmt/device/main.go b/tools/mgmt/device/main.go
index 8eeba2c..d1182e1 100644
--- a/tools/mgmt/device/main.go
+++ b/tools/mgmt/device/main.go
@@ -8,8 +8,8 @@
"v.io/v23"
- _ "v.io/core/veyron/profiles/static"
- "v.io/core/veyron/tools/mgmt/device/impl"
+ _ "v.io/x/ref/profiles/static"
+ "v.io/x/ref/tools/mgmt/device/impl"
)
func main() {
diff --git a/tools/mgmt/mgmt_v23_test.go b/tools/mgmt/mgmt_v23_test.go
index f409e59..779aca2 100644
--- a/tools/mgmt/mgmt_v23_test.go
+++ b/tools/mgmt/mgmt_v23_test.go
@@ -34,8 +34,8 @@
"strings"
"time"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
var (
@@ -75,9 +75,9 @@
}
binStagingDir := mkSubdir("bin")
- agentServerBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- suidHelperBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/suidhelper")
- initHelperBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/inithelper")
+ agentServerBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ suidHelperBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/suidhelper")
+ initHelperBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/inithelper")
// Device manager and principal use their own set of credentials.
// The credentials directory will be populated with Start an application
@@ -85,16 +85,16 @@
// the device ("alice/myworkstation") can talk to it. ALl of the binaries
// that communicate with each other must share this credentials directory.
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
- namespaceBin := i.BuildGoPkg("v.io/core/veyron/tools/namespace").WithEnv(credentials)
- debugBin := i.BuildGoPkg("v.io/core/veyron/tools/debug").WithEnv(credentials)
- deviceBin := i.BuildGoPkg("v.io/core/veyron/tools/mgmt/device").WithEnv(credentials)
- devicedBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/device/deviced").WithEnv(credentials)
+ namespaceBin := i.BuildGoPkg("v.io/x/ref/tools/namespace").WithEnv(credentials)
+ debugBin := i.BuildGoPkg("v.io/x/ref/tools/debug").WithEnv(credentials)
+ deviceBin := i.BuildGoPkg("v.io/x/ref/tools/mgmt/device").WithEnv(credentials)
+ devicedBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/device/deviced").WithEnv(credentials)
deviceScript := i.BinaryFromPath("device/devicex").WithEnv(credentials)
- principalBin := i.BuildGoPkg("v.io/core/veyron/tools/principal").WithEnv(credentials)
- binarydBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/binary/binaryd").WithEnv(credentials)
- binaryBin := i.BuildGoPkg("v.io/core/veyron/tools/binary").WithEnv(credentials)
- applicationdBin := i.BuildGoPkg("v.io/core/veyron/services/mgmt/application/applicationd").WithEnv(credentials)
- applicationBin := i.BuildGoPkg("v.io/core/veyron/tools/application").WithEnv(credentials)
+ principalBin := i.BuildGoPkg("v.io/x/ref/tools/principal").WithEnv(credentials)
+ binarydBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/binary/binaryd").WithEnv(credentials)
+ binaryBin := i.BuildGoPkg("v.io/x/ref/tools/binary").WithEnv(credentials)
+ applicationdBin := i.BuildGoPkg("v.io/x/ref/services/mgmt/application/applicationd").WithEnv(credentials)
+ applicationBin := i.BuildGoPkg("v.io/x/ref/tools/application").WithEnv(credentials)
appDName := "applicationd"
devicedAppName := filepath.Join(appDName, "deviced", "test")
diff --git a/tools/mgmt/shell/lib/shell_test.sh b/tools/mgmt/shell/lib/shell_test.sh
index 82967fb..e99a845 100755
--- a/tools/mgmt/shell/lib/shell_test.sh
+++ b/tools/mgmt/shell/lib/shell_test.sh
@@ -6,7 +6,7 @@
# handler must call shell_test::at_exit to clean up all temporary
# files and directories created by this library.
-source "$(go list -f {{.Dir}} v.io/core/veyron/tools/mgmt)/shell/lib/shell.sh"
+source "$(go list -f {{.Dir}} v.io/x/ref/tools/mgmt)/shell/lib/shell.sh"
trap shell_test::at_exit INT TERM EXIT
@@ -160,7 +160,7 @@
# NAMESPACE_ROOT to point to it.
shell_test::setup_mounttable() {
# Build the mount table daemon and related tools.
- MOUNTTABLED_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mounttable/mounttabled')"
+ MOUNTTABLED_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mounttable/mounttabled')"
# Start the mounttable daemon.
local -r MT_LOG=$(shell::tmp_file)
@@ -221,7 +221,7 @@
shell_test::credentials() {
[[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]] \
|| shell_test::fail "credentials called when running under enable_agent"
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
local -r CRED=$(shell::tmp_dir)
"${PRINCIPAL_BIN}" create --overwrite=true "${CRED}" "$1" >/dev/null || shell_test::fail "line ${LINENO}: create failed"
echo "${CRED}"
@@ -237,7 +237,7 @@
[[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]] \
|| shell_test::fail "forkcredentials called when running under enable_agent"
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
local -r FORKCRED=$(shell::tmp_dir)
"${PRINCIPAL_BIN}" create --overwrite=true "${FORKCRED}" self >/dev/null || shell_test::fail "line ${LINENO}: create failed"
"${PRINCIPAL_BIN}" --veyron.credentials="$1" bless --require_caveats=false "${FORKCRED}" "$2" >blessing || shell_test::fail "line ${LINENO}: bless failed"
@@ -262,12 +262,12 @@
# main "$@"
shell_test::enable_agent() {
if [[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]]; then
- local -r AGENTD="$(shell_test::build_go_binary 'v.io/core/veyron/security/agent/agentd')"
+ local -r AGENTD="$(shell_test::build_go_binary 'v.io/x/ref/security/agent/agentd')"
local -r WORKDIR="${shell_test_WORK_DIR}"
export shell_test_RUNNING_UNDER_AGENT=1
VEYRON_CREDENTIALS="${WORKDIR}/credentials" exec ${AGENTD} --no_passphrase --additional_principals="${WORKDIR}/childcredentials" bash -"$-" "$0" "$@"
shell_test::fail "failed to run test under agent"
else
- VRUN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/vrun')"
+ VRUN="$(shell_test::build_go_binary 'v.io/x/ref/tools/vrun')"
fi
}
diff --git a/tools/mgmt/shell/lib/test.sh b/tools/mgmt/shell/lib/test.sh
index 2e679cb..a2a1e5c 100755
--- a/tools/mgmt/shell/lib/test.sh
+++ b/tools/mgmt/shell/lib/test.sh
@@ -4,7 +4,7 @@
# Unit tests for the shell functions in this directory
#
-source "$(go list -f {{.Dir}} v.io/core/veyron/tools/mgmt)/shell/lib/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/x/ref/tools/mgmt)/shell/lib/shell_test.sh"
test_assert() {
shell_test::assert_eq "foo" "foo" "${LINENO}"
@@ -55,7 +55,7 @@
test_credentials() {
local -r CRED=$(shell_test::credentials alice)
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
"${PRINCIPAL_BIN}" --veyron.credentials="${CRED}" dump >alice.dump || shell_test::fail "line ${LINENO}: ${PRINCIPAL_BIN} dump ${CRED} failed"
cat alice.dump | rmpublickey >got || shell_test::fail "line ${LINENO}: cat alice.dump | rmpublickey failed"
@@ -78,7 +78,7 @@
local -r CRED=$(shell_test::credentials alice)
local -r FORKCRED=$(shell_test::forkcredentials "${CRED}" fork)
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
"${PRINCIPAL_BIN}" --veyron.credentials="${FORKCRED}" dump >alice.dump || shell_test::fail "line ${LINENO}: ${PRINCIPAL_BIN} dump ${CRED} failed"
cat alice.dump | rmpublickey >got || shell_test::fail "line ${LINENO}: cat alice.dump | rmpublickey failed"
diff --git a/tools/mgmt/suid_test.sh b/tools/mgmt/suid_test.sh
index cdcad85..3537cd3 100755
--- a/tools/mgmt/suid_test.sh
+++ b/tools/mgmt/suid_test.sh
@@ -40,7 +40,7 @@
umask 066
fi
- source "$(go list -f {{.Dir}} v.io/core/veyron/tools/mgmt)/shell/lib/shell_test.sh"
+ source "$(go list -f {{.Dir}} v.io/x/ref/tools/mgmt)/shell/lib/shell_test.sh"
# Run the test under the security agent.
shell_test::enable_agent "$@"
@@ -49,19 +49,19 @@
build() {
echo ">> Building binaries"
- 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')"
- 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')"
- AGENTD_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/security/agent/agentd')"
- SUIDHELPER_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/suidhelper')"
- INITHELPER_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/inithelper')"
- DEVICEMANAGER_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/services/mgmt/device/deviced')"
- DEVICE_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/mgmt/device')"
- NAMESPACE_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/namespace')"
- PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
- DEBUG_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/debug')"
- DEVICE_SCRIPT="$(go list -f {{.Dir}} v.io/core/veyron/tools/mgmt/device)/devicex"
+ BINARYD_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mgmt/binary/binaryd')"
+ BINARY_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/binary')"
+ APPLICATIOND_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mgmt/application/applicationd')"
+ APPLICATION_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/application')"
+ AGENTD_BIN="$(shell_test::build_go_binary 'v.io/x/ref/security/agent/agentd')"
+ SUIDHELPER_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mgmt/suidhelper')"
+ INITHELPER_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mgmt/inithelper')"
+ DEVICEMANAGER_BIN="$(shell_test::build_go_binary 'v.io/x/ref/services/mgmt/device/deviced')"
+ DEVICE_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/mgmt/device')"
+ NAMESPACE_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/namespace')"
+ PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
+ DEBUG_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/debug')"
+ DEVICE_SCRIPT="$(go list -f {{.Dir}} v.io/x/ref/tools/mgmt/device)/devicex"
}
# TODO(caprita): Move to shell_tesh.sh
diff --git a/tools/mgmt/v23_test.go b/tools/mgmt/v23_test.go
index c79e203..7f45d21 100644
--- a/tools/mgmt/v23_test.go
+++ b/tools/mgmt/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/tools/mgmt/vbash b/tools/mgmt/vbash
index 92c5c4d..59f0b18 100755
--- a/tools/mgmt/vbash
+++ b/tools/mgmt/vbash
@@ -29,7 +29,7 @@
set -e
-readonly BIN_PACKAGES=(v.io/core/veyron/tools/principal v.io/core/veyron/security/agent/agentd)
+readonly BIN_PACKAGES=(v.io/x/ref/tools/principal v.io/x/ref/security/agent/agentd)
BIN_NAMES=(${BIN_PACKAGES[@]})
for (( i=0; i<${#BIN_PACKAGES[@]}; i++ )); do
BIN_NAMES[$i]=$(basename "${BIN_PACKAGES[$i]}")
diff --git a/tools/mounttable/impl_test.go b/tools/mounttable/impl_test.go
index 7d17d13..114428d 100644
--- a/tools/mounttable/impl_test.go
+++ b/tools/mounttable/impl_test.go
@@ -14,8 +14,8 @@
"v.io/v23/services/security/access"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
type server struct {
diff --git a/tools/mounttable/main.go b/tools/mounttable/main.go
index b18ec86..03caf91 100644
--- a/tools/mounttable/main.go
+++ b/tools/mounttable/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/namespace/main.go b/tools/namespace/main.go
index b18ec86..03caf91 100644
--- a/tools/namespace/main.go
+++ b/tools/namespace/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/naming/simulator/commands.go b/tools/naming/simulator/commands.go
index a1edd55..30642b2 100644
--- a/tools/naming/simulator/commands.go
+++ b/tools/naming/simulator/commands.go
@@ -9,7 +9,7 @@
"regexp"
"strings"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
type builtinCmd func(sh *modules.Shell, state *cmdState, args ...string) (string, error)
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index df99e22..6c6b33b 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -19,10 +19,10 @@
"v.io/v23"
"v.io/v23/context"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- _ "v.io/core/veyron/lib/modules/core"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ _ "v.io/x/ref/lib/modules/core"
+ _ "v.io/x/ref/profiles"
)
type cmdState struct {
diff --git a/tools/naming/simulator/driver_test.go b/tools/naming/simulator/driver_test.go
index 657b46a..f788ddd 100644
--- a/tools/naming/simulator/driver_test.go
+++ b/tools/naming/simulator/driver_test.go
@@ -5,7 +5,7 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func TestFields(t *testing.T) {
diff --git a/tools/naming/simulator/shell_functions.go b/tools/naming/simulator/shell_functions.go
index 4d002e1..935b362 100644
--- a/tools/naming/simulator/shell_functions.go
+++ b/tools/naming/simulator/shell_functions.go
@@ -9,7 +9,7 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func init() {
diff --git a/tools/naming/simulator/simulator_v23_test.go b/tools/naming/simulator/simulator_v23_test.go
index 51fb878..4b68bb5 100644
--- a/tools/naming/simulator/simulator_v23_test.go
+++ b/tools/naming/simulator/simulator_v23_test.go
@@ -11,7 +11,7 @@
"regexp"
"testing"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -23,7 +23,7 @@
}
func V23TestSimulator(t *v23tests.T) {
- binary := t.BuildGoPkg("v.io/core/veyron/tools/naming/simulator")
+ binary := t.BuildGoPkg("v.io/x/ref/tools/naming/simulator")
files, err := ioutil.ReadDir("./testdata")
if err != nil {
t.Fatal(err)
diff --git a/tools/naming/simulator/v23_test.go b/tools/naming/simulator/v23_test.go
index 00bec32..491d9f7 100644
--- a/tools/naming/simulator/v23_test.go
+++ b/tools/naming/simulator/v23_test.go
@@ -10,9 +10,9 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func init() {
modules.RegisterChild("dummy", `HACK: This is a hack to force v23 test generate to generate modules.Dispatch in TestMain.
diff --git a/tools/principal/bless.go b/tools/principal/bless.go
index 64df2a9..bd7e84a 100644
--- a/tools/principal/bless.go
+++ b/tools/principal/bless.go
@@ -13,12 +13,12 @@
"strings"
"time"
- "v.io/core/veyron/services/identity"
- "v.io/core/veyron/services/identity/oauth"
"v.io/v23/context"
"v.io/v23/options"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/services/identity"
+ "v.io/x/ref/services/identity/oauth"
)
func exchangeMacaroonForBlessing(ctx *context.T, macaroonChan <-chan string) (security.Blessings, error) {
diff --git a/tools/principal/caveat.go b/tools/principal/caveat.go
index 1312b31..867e20c 100644
--- a/tools/principal/caveat.go
+++ b/tools/principal/caveat.go
@@ -5,10 +5,10 @@
"regexp"
"strings"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/security"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
)
// caveatsFlag defines a flag.Value for receiving multiple caveat definitions.
diff --git a/tools/principal/main.go b/tools/principal/main.go
index f28f783..550c270 100644
--- a/tools/principal/main.go
+++ b/tools/principal/main.go
@@ -14,14 +14,14 @@
"os/user"
"time"
- _ "v.io/core/veyron/profiles/static"
- vsecurity "v.io/core/veyron/security"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/v23/vom"
"v.io/x/lib/cmdline"
+ _ "v.io/x/ref/profiles/static"
+ vsecurity "v.io/x/ref/security"
)
var (
diff --git a/tools/principal/principal_v23_test.go b/tools/principal/principal_v23_test.go
index 95ea47c..b4a9ade 100644
--- a/tools/principal/principal_v23_test.go
+++ b/tools/principal/principal_v23_test.go
@@ -10,7 +10,7 @@
"strings"
"syscall"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -50,7 +50,7 @@
aliceBlessingFile = filepath.Join(outputDir, "aliceself")
)
- bin := t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin := t.BuildGoPkg("v.io/x/ref/tools/principal")
bin.Start("create", aliceDir, "alice").WaitOrDie(os.Stdout, os.Stderr)
bin = bin.WithEnv("VEYRON_CREDENTIALS=" + aliceDir)
@@ -70,7 +70,7 @@
func V23TestStore(t *v23tests.T) {
var (
outputDir = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
aliceDir = filepath.Join(outputDir, "alice")
aliceFriend = filepath.Join(outputDir, "alice.bless")
bobDir = filepath.Join(outputDir, "bob")
@@ -108,7 +108,7 @@
func V23TestDump(t *v23tests.T) {
var (
outputDir = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
aliceDir = filepath.Join(outputDir, "alice")
)
@@ -150,7 +150,7 @@
func V23TestRecvBlessings(t *v23tests.T) {
var (
outputDir = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
aliceDir = filepath.Join(outputDir, "alice")
carolDir = filepath.Join(outputDir, "carol")
)
@@ -236,7 +236,7 @@
func V23TestFork(t *v23tests.T) {
var (
outputDir = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
aliceDir = filepath.Join(outputDir, "alice")
alicePhoneDir = filepath.Join(outputDir, "alice-phone")
alicePhoneCalendarDir = filepath.Join(outputDir, "alice-phone-calendar")
@@ -323,7 +323,7 @@
func V23TestCreate(t *v23tests.T) {
var (
outputDir = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
aliceDir = filepath.Join(outputDir, "alice")
)
@@ -346,7 +346,7 @@
aliceBlessingFile = filepath.Join(outputDir, "aliceself")
)
- bin := t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin := t.BuildGoPkg("v.io/x/ref/tools/principal")
bin.Start("create", aliceDir, "alice").WaitOrDie(os.Stdout, os.Stderr)
bin = bin.WithEnv("VEYRON_CREDENTIALS=" + aliceDir)
@@ -374,7 +374,7 @@
func V23TestForkWithoutVDLPATH(t *v23tests.T) {
var (
parent = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal").WithEnv("VANADIUM_ROOT=''", "VDLPATH=''")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal").WithEnv("VANADIUM_ROOT=''", "VDLPATH=''")
)
if err := bin.Start("create", parent, "parent").Wait(os.Stdout, os.Stderr); err != nil {
t.Fatalf("create %q failed: %v", parent, err)
@@ -388,7 +388,7 @@
var (
parent = t.NewTempDir()
child = t.NewTempDir()
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
buf bytes.Buffer
)
if err := bin.Start("create", parent, "parent").Wait(os.Stdout, os.Stderr); err != nil {
@@ -411,7 +411,7 @@
func V23TestBless(t *v23tests.T) {
var (
- bin = t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ bin = t.BuildGoPkg("v.io/x/ref/tools/principal")
dir = t.NewTempDir()
aliceDir = filepath.Join(dir, "alice")
bobDir = filepath.Join(dir, "bob")
diff --git a/tools/principal/v23_test.go b/tools/principal/v23_test.go
index ceadd57..810095e 100644
--- a/tools/principal/v23_test.go
+++ b/tools/principal/v23_test.go
@@ -10,9 +10,9 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func init() {
modules.RegisterChild("dummy", `HACK: This is a hack to force v23 test generate to generate modules.Dispatch in TestMain.
diff --git a/tools/profile/impl.go b/tools/profile/impl.go
index 0cdf533..92b1fc9 100644
--- a/tools/profile/impl.go
+++ b/tools/profile/impl.go
@@ -4,11 +4,11 @@
"fmt"
"time"
- "v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron/services/mgmt/repository"
"v.io/v23/context"
"v.io/v23/services/mgmt/build"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/repository"
)
var cmdLabel = &cmdline.Command{
diff --git a/tools/profile/impl_test.go b/tools/profile/impl_test.go
index c346586..e07af3c 100644
--- a/tools/profile/impl_test.go
+++ b/tools/profile/impl_test.go
@@ -14,10 +14,10 @@
"v.io/v23/services/mgmt/build"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron/services/mgmt/repository"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/services/mgmt/profile"
+ "v.io/x/ref/services/mgmt/repository"
)
var (
diff --git a/tools/profile/main.go b/tools/profile/main.go
index b18ec86..03caf91 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -9,7 +9,7 @@
"v.io/v23"
"v.io/v23/context"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/servicerunner/main.go b/tools/servicerunner/main.go
index b48a0ab..4da36de 100644
--- a/tools/servicerunner/main.go
+++ b/tools/servicerunner/main.go
@@ -11,11 +11,11 @@
"v.io/v23"
- "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"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ _ "v.io/x/ref/profiles"
)
func panicOnError(err error) {
diff --git a/tools/servicerunner/servicerunner_test.go b/tools/servicerunner/servicerunner_test.go
index 9ab0a1e..38959bc 100644
--- a/tools/servicerunner/servicerunner_test.go
+++ b/tools/servicerunner/servicerunner_test.go
@@ -12,7 +12,7 @@
"path"
"testing"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/testutil"
)
func TestMain(t *testing.T) {
@@ -26,7 +26,7 @@
bin := path.Join(tmpdir, "servicerunner")
fmt.Println("Building", bin)
- err = exec.Command("v23", "go", "build", "-o", bin, "v.io/core/veyron/tools/servicerunner").Run()
+ err = exec.Command("v23", "go", "build", "-o", bin, "v.io/x/ref/tools/servicerunner").Run()
if err != nil {
t.Fatal(err)
}
diff --git a/tools/vdl/arith_test.go b/tools/vdl/arith_test.go
index f4b1d1a..ddc636e 100644
--- a/tools/vdl/arith_test.go
+++ b/tools/vdl/arith_test.go
@@ -11,15 +11,15 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/vdl/testdata/arith"
- "v.io/core/veyron/lib/vdl/testdata/base"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/testdata/arith"
+ "v.io/x/ref/lib/vdl/testdata/base"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
var generatedError = errors.New("generated error")
@@ -161,15 +161,15 @@
expectDesc(t, serverStub.Describe__(), []ipc.InterfaceDesc{
{
Name: "Calculator",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Embeds: []ipc.EmbedDesc{
{
Name: "Arith",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
},
{
Name: "AdvancedMath",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
},
},
Methods: []ipc.MethodDesc{
@@ -179,7 +179,7 @@
},
{
Name: "Arith",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Methods: []ipc.MethodDesc{
{
Name: "Add",
@@ -222,20 +222,20 @@
},
{
Name: "AdvancedMath",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Embeds: []ipc.EmbedDesc{
{
Name: "Trigonometry",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
},
{
Name: "Exp",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith/exp",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith/exp",
}},
},
{
Name: "Trigonometry",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// Trigonometry is an interface that specifies a couple trigonometric functions.",
Methods: []ipc.MethodDesc{
{
@@ -260,7 +260,7 @@
},
{
Name: "Exp",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith/exp",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith/exp",
Methods: []ipc.MethodDesc{
{
Name: "Exp",
@@ -406,7 +406,7 @@
expectDesc(t, serverStub.Describe__(), []ipc.InterfaceDesc{
{
Name: "Arith",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Methods: []ipc.MethodDesc{
{
Name: "Add",
diff --git a/tools/vdl/doc.go b/tools/vdl/doc.go
index 85f4561..e4831a0 100644
--- a/tools/vdl/doc.go
+++ b/tools/vdl/doc.go
@@ -209,7 +209,7 @@
<packages> are a list of packages to process, similar to the standard go tool.
In its simplest form each package is an import path; e.g.
- "v.io/core/veyron/lib/vdl"
+ "v.io/x/ref/lib/vdl"
A package that is an absolute path or that begins with a . or .. element is
interpreted as a file system path, and denotes the package in that directory.
diff --git a/tools/vdl/main.go b/tools/vdl/main.go
index 2cde447..bcd20ee 100644
--- a/tools/vdl/main.go
+++ b/tools/vdl/main.go
@@ -12,15 +12,15 @@
"path/filepath"
"strings"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/codegen/golang"
- "v.io/core/veyron/lib/vdl/codegen/java"
- "v.io/core/veyron/lib/vdl/codegen/javascript"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdlroot/vdltool"
"v.io/x/lib/cmdline"
"v.io/x/lib/textutil"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/codegen/golang"
+ "v.io/x/ref/lib/vdl/codegen/java"
+ "v.io/x/ref/lib/vdl/codegen/javascript"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func init() {
@@ -78,7 +78,7 @@
<packages> are a list of packages to process, similar to the standard go tool.
In its simplest form each package is an import path; e.g.
- "v.io/core/veyron/lib/vdl"
+ "v.io/x/ref/lib/vdl"
A package that is an absolute path or that begins with a . or .. element is
interpreted as a file system path, and denotes the package in that directory.
diff --git a/tools/vdl/vdl_test.go b/tools/vdl/vdl_test.go
index a9292ac..93b2f9d 100644
--- a/tools/vdl/vdl_test.go
+++ b/tools/vdl/vdl_test.go
@@ -12,7 +12,7 @@
const (
testDir = "../../lib/vdl/testdata/base"
- outPkgPath = "v.io/core/veyron/lib/vdl/testdata/base"
+ outPkgPath = "v.io/x/ref/lib/vdl/testdata/base"
)
// Compares generated VDL files against the copy in the repo.
diff --git a/tools/vom/types.vdl.go b/tools/vom/types.vdl.go
index b996707..fff5e16 100644
--- a/tools/vom/types.vdl.go
+++ b/tools/vom/types.vdl.go
@@ -51,7 +51,7 @@
}
func (dataRep) __VDLReflect(struct {
- Name string "v.io/core/veyron/tools/vom.dataRep"
+ Name string "v.io/x/ref/tools/vom.dataRep"
Enum struct{ Hex, Binary string }
}) {
}
diff --git a/tools/vomtestgen/generate.go b/tools/vomtestgen/generate.go
index 1aa4d07..f685a09 100644
--- a/tools/vomtestgen/generate.go
+++ b/tools/vomtestgen/generate.go
@@ -9,13 +9,13 @@
"path/filepath"
"strings"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/codegen"
- "v.io/core/veyron/lib/vdl/codegen/vdlgen"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
"v.io/v23/vom"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/codegen"
+ "v.io/x/ref/lib/vdl/codegen/vdlgen"
+ "v.io/x/ref/lib/vdl/compile"
)
const (
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index fdaf7a8..91e59ac 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -18,14 +18,14 @@
}
func (Struct) __VDLReflect(struct {
- Name string "v.io/core/veyron/tools/vrpc/test_base.Struct"
+ Name string "v.io/x/ref/tools/vrpc/test_base.Struct"
}) {
}
type Array2Int [2]int32
func (Array2Int) __VDLReflect(struct {
- Name string "v.io/core/veyron/tools/vrpc/test_base.Array2Int"
+ Name string "v.io/x/ref/tools/vrpc/test_base.Array2Int"
}) {
}
@@ -481,7 +481,7 @@
// descTypeTester hides the desc to keep godoc clean.
var descTypeTester = ipc.InterfaceDesc{
Name: "TypeTester",
- PkgPath: "v.io/core/veyron/tools/vrpc/test_base",
+ PkgPath: "v.io/x/ref/tools/vrpc/test_base",
Doc: "// TypeTester methods are listed in alphabetical order, to make it easier to\n// test Signature output, which sorts methods alphabetically.",
Methods: []ipc.MethodDesc{
{
diff --git a/tools/vrpc/vrpc.go b/tools/vrpc/vrpc.go
index 2253077..1241b0b 100644
--- a/tools/vrpc/vrpc.go
+++ b/tools/vrpc/vrpc.go
@@ -10,9 +10,6 @@
"strings"
"time"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/codegen/vdlgen"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc/reserved"
@@ -20,8 +17,11 @@
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/codegen/vdlgen"
+ "v.io/x/ref/lib/vdl/compile"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var gctx *context.T
diff --git a/tools/vrpc/vrpc_test.go b/tools/vrpc/vrpc_test.go
index 18245f1..572843d 100644
--- a/tools/vrpc/vrpc_test.go
+++ b/tools/vrpc/vrpc_test.go
@@ -9,9 +9,9 @@
"v.io/v23/ipc"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/tools/vrpc/test_base"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/tools/vrpc/test_base"
)
type server struct{}
@@ -142,7 +142,7 @@
}
wantSig := `// TypeTester methods are listed in alphabetical order, to make it easier to
// test Signature output, which sorts methods alphabetically.
-type "v.io/core/veyron/tools/vrpc/test_base".TypeTester interface {
+type "v.io/x/ref/tools/vrpc/test_base".TypeTester interface {
// Methods to test support for primitive types.
EchoBool(I1 bool) (O1 bool | error)
EchoByte(I1 byte) (O1 byte | error)
@@ -154,11 +154,11 @@
EchoUint32(I1 uint32) (O1 uint32 | error)
EchoUint64(I1 uint64) (O1 uint64 | error)
// Methods to test support for composite types.
- XEchoArray(I1 "v.io/core/veyron/tools/vrpc/test_base".Array2Int) (O1 "v.io/core/veyron/tools/vrpc/test_base".Array2Int | error)
+ XEchoArray(I1 "v.io/x/ref/tools/vrpc/test_base".Array2Int) (O1 "v.io/x/ref/tools/vrpc/test_base".Array2Int | error)
XEchoMap(I1 map[int32]string) (O1 map[int32]string | error)
XEchoSet(I1 set[int32]) (O1 set[int32] | error)
XEchoSlice(I1 []int32) (O1 []int32 | error)
- XEchoStruct(I1 "v.io/core/veyron/tools/vrpc/test_base".Struct) (O1 "v.io/core/veyron/tools/vrpc/test_base".Struct | error)
+ XEchoStruct(I1 "v.io/x/ref/tools/vrpc/test_base".Struct) (O1 "v.io/x/ref/tools/vrpc/test_base".Struct | error)
// Methods to test support for different number of arguments.
YMultiArg(I1 int32, I2 int32) (O1 int32, O2 int32 | error)
YNoArgs() error
@@ -206,9 +206,9 @@
Tags []any
}
-type "v.io/core/veyron/tools/vrpc/test_base".Array2Int [2]int32
+type "v.io/x/ref/tools/vrpc/test_base".Array2Int [2]int32
-type "v.io/core/veyron/tools/vrpc/test_base".Struct struct {
+type "v.io/x/ref/tools/vrpc/test_base".Struct struct {
X int32
Y int32
}
@@ -232,9 +232,9 @@
{"EchoByte", `EchoByte(I1 byte) (O1 byte | error)`},
{"EchoFloat32", `EchoFloat32(I1 float32) (O1 float32 | error)`},
{"XEchoStruct", `
-XEchoStruct(I1 "v.io/core/veyron/tools/vrpc/test_base".Struct) (O1 "v.io/core/veyron/tools/vrpc/test_base".Struct | error)
+XEchoStruct(I1 "v.io/x/ref/tools/vrpc/test_base".Struct) (O1 "v.io/x/ref/tools/vrpc/test_base".Struct | error)
-type "v.io/core/veyron/tools/vrpc/test_base".Struct struct {
+type "v.io/x/ref/tools/vrpc/test_base".Struct struct {
X int32
Y int32
}
@@ -273,11 +273,11 @@
{"EchoByte", `33`, `byte(33)`},
{"EchoUint32", `44`, `uint32(44)`},
{"EchoUint64", `55`, `uint64(55)`},
- {"XEchoArray", `{1,2}`, `"v.io/core/veyron/tools/vrpc/test_base".Array2Int{1, 2}`},
+ {"XEchoArray", `{1,2}`, `"v.io/x/ref/tools/vrpc/test_base".Array2Int{1, 2}`},
{"XEchoMap", `{1:"a"}`, `map[int32]string{1: "a"}`},
{"XEchoSet", `{1}`, `set[int32]{1}`},
{"XEchoSlice", `{1,2}`, `[]int32{1, 2}`},
- {"XEchoStruct", `{1,2}`, `"v.io/core/veyron/tools/vrpc/test_base".Struct{X: 1, Y: 2}`},
+ {"XEchoStruct", `{1,2}`, `"v.io/x/ref/tools/vrpc/test_base".Struct{X: 1, Y: 2}`},
{"YMultiArg", `1,2`, `int32(1) int32(2)`},
{"YNoArgs", ``, ``},
{"ZStream", `2,true`, `<< true
diff --git a/tools/vrun/internal/v23_test.go b/tools/vrun/internal/v23_test.go
index 54cd5ea..b3abb99 100644
--- a/tools/vrun/internal/v23_test.go
+++ b/tools/vrun/internal/v23_test.go
@@ -9,8 +9,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/tools/vrun/internal/vrun_v23_test.go b/tools/vrun/internal/vrun_v23_test.go
index fbb13cf..9e789ce 100644
--- a/tools/vrun/internal/vrun_v23_test.go
+++ b/tools/vrun/internal/vrun_v23_test.go
@@ -5,16 +5,16 @@
import (
"os"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles/static"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles/static"
)
func V23TestAgentd(t *v23tests.T) {
- vrunBin := t.BuildGoPkg("v.io/core/veyron/tools/vrun")
- pingpongBin := t.BuildGoPkg("v.io/core/veyron/security/agent/pingpong")
- agentdBin := t.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- helperBin := t.BuildGoPkg("v.io/core/veyron/tools/vrun/internal")
- principalBin := t.BuildGoPkg("v.io/core/veyron/tools/principal")
+ vrunBin := t.BuildGoPkg("v.io/x/ref/tools/vrun")
+ pingpongBin := t.BuildGoPkg("v.io/x/ref/security/agent/pingpong")
+ agentdBin := t.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ helperBin := t.BuildGoPkg("v.io/x/ref/tools/vrun/internal")
+ principalBin := t.BuildGoPkg("v.io/x/ref/tools/principal")
v23tests.RunRootMT(t, "--veyron.tcp.address=127.0.0.1:0")
diff --git a/tools/vrun/testchild.sh b/tools/vrun/testchild.sh
deleted file mode 100755
index 916ae52..0000000
--- a/tools/vrun/testchild.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# Helper script for testing vrun.
-
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
-
-main() {
- shell_test::setup_mounttable
-
- local -r PINGPONG="$(shell_test::build_go_binary 'v.io/core/veyron/security/agent/pingpong')"
- local -r VRUN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/vrun')"
- local -r PRINCIPAL="$(shell_test::build_go_binary 'v.io/core/veyron/tools/principal')"
-
- local blessing=$("${PRINCIPAL}" dump | grep Default|cut -d: -f2)
- shell_test::assert_eq "${blessing}" " agent_principal" $LINENO
- blessing=$("${VRUN}" "${PRINCIPAL}" dump | grep Default|cut -d: -f2)
- shell_test::assert_eq "${blessing}" " agent_principal/principal" $LINENO
- blessing=$("${VRUN}" --name=foo "${PRINCIPAL}" dump | grep Default|cut -d: -f2)
- shell_test::assert_eq "${blessing}" " agent_principal/foo" $LINENO
-
- # TODO(ribrdb): test --duration
-
- shell_test::start_server "${VRUN}" "${PINGPONG}" --server
- "${VRUN}" "${PINGPONG}" || shell_test::fail "line ${LINENO}: ping"
- shell_test::pass
-}
-
-main "$@"
diff --git a/tools/vrun/vrun.go b/tools/vrun/vrun.go
index bc3127c..afc3ca5 100644
--- a/tools/vrun/vrun.go
+++ b/tools/vrun/vrun.go
@@ -7,17 +7,17 @@
"syscall"
"time"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/keymgr"
"v.io/x/lib/cmdline"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/keymgr"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/security"
"v.io/x/lib/vlog"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
var durationFlag time.Duration
