TBR renaming v.io/core/veyron to v.io/x/ref
MultiPart: 11/13
Change-Id: I181a7774fc94613c4944afb19feae94beee192d0
diff --git a/client/bundles/fortune/ex0_go/src/client/client.go b/client/bundles/fortune/ex0_go/src/client/client.go
index 1073d6e..e2087ac 100644
--- a/client/bundles/fortune/ex0_go/src/client/client.go
+++ b/client/bundles/fortune/ex0_go/src/client/client.go
@@ -7,8 +7,8 @@
"fmt"
"time"
- _ "v.io/core/veyron/profiles"
"v.io/v23"
+ _ "v.io/x/ref/profiles"
"fortune"
)
diff --git a/client/bundles/fortune/ex0_go/src/server/server.go b/client/bundles/fortune/ex0_go/src/server/server.go
index df011e8..96620ee 100644
--- a/client/bundles/fortune/ex0_go/src/server/server.go
+++ b/client/bundles/fortune/ex0_go/src/server/server.go
@@ -7,12 +7,12 @@
"fmt"
"math/rand"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles"
- vflag "v.io/core/veyron/security/flag"
"v.io/v23"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles"
+ vflag "v.io/x/ref/security/flag"
"fortune"
)
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 1de5037..2ef83cc 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -45,11 +45,11 @@
# Installs various go binaries.
build_go_binaries() {
- shell_test::build_go_binary 'v.io/core/veyron/tools/principal'
- shell_test::build_go_binary 'v.io/core/veyron/services/proxy/proxyd'
- shell_test::build_go_binary 'v.io/core/veyron/services/mounttable/mounttabled'
- shell_test::build_go_binary 'v.io/core/veyron/services/wsprd'
- shell_test::build_go_binary 'v.io/core/veyron/tools/vdl'
+ shell_test::build_go_binary 'v.io/x/ref/tools/principal'
+ shell_test::build_go_binary 'v.io/x/ref/services/proxy/proxyd'
+ shell_test::build_go_binary 'v.io/x/ref/services/mounttable/mounttabled'
+ shell_test::build_go_binary 'v.io/x/ref/services/wsprd'
+ shell_test::build_go_binary 'v.io/x/ref/tools/vdl'
shell_test::build_go_binary 'playground/builder'
}
diff --git a/client/lib/shell/shell_test.sh b/client/lib/shell/shell_test.sh
index 9bfa37b..17c8e76 100755
--- a/client/lib/shell/shell_test.sh
+++ b/client/lib/shell/shell_test.sh
@@ -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/client/lib/shell/test.sh b/client/lib/shell/test.sh
index 620f9d0..55eef87 100755
--- a/client/lib/shell/test.sh
+++ b/client/lib/shell/test.sh
@@ -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/go/src/playground/Dockerfile b/go/src/playground/Dockerfile
index 42bab10..36436a0 100644
--- a/go/src/playground/Dockerfile
+++ b/go/src/playground/Dockerfile
@@ -41,7 +41,7 @@
# Install Vanadium Go dependencies.
WORKDIR /usr/local/vanadium/release
ENV PATH $VANADIUM_ROOT/release/go/bin:$VANADIUM_ROOT/release/projects/playground/go/bin:$VANADIUM_ROOT/bin:$PATH
-RUN v23 go install v.io/core/...
+RUN v23 go install v.io/x/ref/...
RUN v23 go install playground/...
# Uncomment the following lines to install a version of the builder tool using
@@ -59,8 +59,8 @@
# local version of the code. This is useful when developing and testing local
# changes.
#RUN rm $VANADIUM_ROOT/release/go/bin/proxyd
-#ADD proxyd_main.go $VANADIUM_ROOT/release/go/src/v.io/core/veyron/services/proxy/proxyd/main.go
-#RUN v23 go install v.io/core/veyron/services/proxy/proxyd
+#ADD proxyd_main.go $VANADIUM_ROOT/release/go/src/v.io/x/ref/services/proxy/proxyd/main.go
+#RUN v23 go install v.io/x/ref/services/proxy/proxyd
USER playground
WORKDIR /home/playground
diff --git a/go/src/playground/builder/credentials.go b/go/src/playground/builder/credentials.go
index 7bcc1f6..cf29ba9 100644
--- a/go/src/playground/builder/credentials.go
+++ b/go/src/playground/builder/credentials.go
@@ -9,7 +9,7 @@
"os/exec"
"path"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/consts"
)
type credentials struct {
diff --git a/go/src/playground/builder/main.go b/go/src/playground/builder/main.go
index a525533..5f3f177 100644
--- a/go/src/playground/builder/main.go
+++ b/go/src/playground/builder/main.go
@@ -32,8 +32,8 @@
"syscall"
"time"
- vexec "v.io/core/veyron/lib/exec/consts"
- "v.io/core/veyron/lib/flags/consts"
+ vexec "v.io/x/ref/lib/exec/consts"
+ "v.io/x/ref/lib/flags/consts"
"playground/lib"
"playground/lib/event"
diff --git a/go/src/playground/builder/services.go b/go/src/playground/builder/services.go
index 019d32f..cc934c6 100644
--- a/go/src/playground/builder/services.go
+++ b/go/src/playground/builder/services.go
@@ -15,7 +15,7 @@
"strconv"
"time"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/consts"
"playground/lib"
)
diff --git a/go/src/playground/playground_v23_test.go b/go/src/playground/playground_v23_test.go
index 37f7e20..7833a05 100644
--- a/go/src/playground/playground_v23_test.go
+++ b/go/src/playground/playground_v23_test.go
@@ -4,8 +4,8 @@
"os"
"path/filepath"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
@@ -80,10 +80,10 @@
func V23TestPlayground(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- i.BuildGoPkg("v.io/core/veyron/tools/principal")
- i.BuildGoPkg("v.io/core/veyron/tools/vdl")
- i.BuildGoPkg("v.io/core/veyron/services/proxy/proxyd")
- i.BuildGoPkg("v.io/core/veyron/services/wsprd")
+ i.BuildGoPkg("v.io/x/ref/tools/principal")
+ i.BuildGoPkg("v.io/x/ref/tools/vdl")
+ i.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
+ i.BuildGoPkg("v.io/x/ref/services/wsprd")
playgroundPkg := golist(i, "playground")
// strip last three directory components, much easier to read in
diff --git a/go/src/playground/testdata/src/ping/ping.go b/go/src/playground/testdata/src/ping/ping.go
index 0643737..21cc217 100644
--- a/go/src/playground/testdata/src/ping/ping.go
+++ b/go/src/playground/testdata/src/ping/ping.go
@@ -5,9 +5,9 @@
import (
"fmt"
- _ "v.io/core/veyron/profiles"
"v.io/v23"
"v.io/x/lib/vlog"
+ _ "v.io/x/ref/profiles"
"pingpong"
)
diff --git a/go/src/playground/testdata/src/pong/pong.go b/go/src/playground/testdata/src/pong/pong.go
index 8aff4cd..c14b606 100644
--- a/go/src/playground/testdata/src/pong/pong.go
+++ b/go/src/playground/testdata/src/pong/pong.go
@@ -5,11 +5,11 @@
import (
"fmt"
- "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles"
"v.io/v23"
"v.io/v23/ipc"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles"
"pingpong"
)
diff --git a/go/src/playground/v23_test.go b/go/src/playground/v23_test.go
index 489d5af..782e874 100644
--- a/go/src/playground/v23_test.go
+++ b/go/src/playground/v23_test.go
@@ -8,8 +8,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()
