updating the veyron import paths
Change-Id: I5ecfec3cb57cb3825d1b53c0cbb3a672190d0923
diff --git a/lib/config/config.go b/lib/config/config.go
index 6cceb64..f2313e6 100644
--- a/lib/config/config.go
+++ b/lib/config/config.go
@@ -5,8 +5,8 @@
"strings"
"sync"
- "veyron2/verror"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vom"
)
var ErrKeyNotFound = verror.NotFoundf("config key not found")
diff --git a/lib/expect/expect.go b/lib/expect/expect.go
index 28259a8..1573147 100644
--- a/lib/expect/expect.go
+++ b/lib/expect/expect.go
@@ -49,7 +49,7 @@
"strings"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/lib/expect/expect_test.go b/lib/expect/expect_test.go
index 1d4906b..1eadda2 100644
--- a/lib/expect/expect_test.go
+++ b/lib/expect/expect_test.go
@@ -9,7 +9,7 @@
"testing"
"time"
- "veyron/lib/expect"
+ "veyron.io/veyron/veyron/lib/expect"
)
func TestSimple(t *testing.T) {
diff --git a/lib/flags/listen_test.go b/lib/flags/listen_test.go
index 572fd99..6c1fc6c 100644
--- a/lib/flags/listen_test.go
+++ b/lib/flags/listen_test.go
@@ -6,7 +6,7 @@
"strings"
"testing"
- "veyron/lib/flags"
+ "veyron.io/veyron/veyron/lib/flags"
)
func TestIPFlag(t *testing.T) {
diff --git a/lib/modules/core/core.go b/lib/modules/core/core.go
index 56b736d..f2851f7 100644
--- a/lib/modules/core/core.go
+++ b/lib/modules/core/core.go
@@ -23,7 +23,7 @@
//
package core
-import "veyron/lib/modules"
+import "veyron.io/veyron/veyron/lib/modules"
const (
RootMTCommand = "root"
diff --git a/lib/modules/core/core_test.go b/lib/modules/core/core_test.go
index fc104a9..b741bc7 100644
--- a/lib/modules/core/core_test.go
+++ b/lib/modules/core/core_test.go
@@ -7,12 +7,12 @@
"testing"
"time"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/lib/expect"
- "veyron/lib/modules"
- "veyron/lib/modules/core"
- _ "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/expect"
+ "veyron.io/veyron/veyron/lib/modules"
+ "veyron.io/veyron/veyron/lib/modules/core"
+ _ "veyron.io/veyron/veyron/lib/testutil"
)
func TestCommands(t *testing.T) {
diff --git a/lib/modules/core/mounttable.go b/lib/modules/core/mounttable.go
index b9e2d0d..f95cfad 100644
--- a/lib/modules/core/mounttable.go
+++ b/lib/modules/core/mounttable.go
@@ -6,12 +6,12 @@
"os"
"strings"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/lib/modules"
- mounttable "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/lib/modules"
+ mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
)
func init() {
diff --git a/lib/modules/exec.go b/lib/modules/exec.go
index 5da6499..3f27c3e 100644
--- a/lib/modules/exec.go
+++ b/lib/modules/exec.go
@@ -12,10 +12,10 @@
"sync"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
// TODO(cnicolaou): move this to veyron/lib.
- vexec "veyron/services/mgmt/lib/exec"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
)
// execHandle implements both the command and Handle interfaces.
diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go
index 808a413..cd7db53 100644
--- a/lib/modules/modules_test.go
+++ b/lib/modules/modules_test.go
@@ -8,7 +8,7 @@
"testing"
"time"
- "veyron/lib/modules"
+ "veyron.io/veyron/veyron/lib/modules"
)
func init() {
diff --git a/lib/modules/shell.go b/lib/modules/shell.go
index d6ee1bc..f3f9f97 100644
--- a/lib/modules/shell.go
+++ b/lib/modules/shell.go
@@ -43,7 +43,7 @@
"strings"
"sync"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// Shell represents the context within which commands are run.
diff --git a/lib/netconfig/example_test.go b/lib/netconfig/example_test.go
index 56b0cbd..68350ba 100644
--- a/lib/netconfig/example_test.go
+++ b/lib/netconfig/example_test.go
@@ -4,7 +4,7 @@
"fmt"
"log"
- "veyron/lib/netconfig"
+ "veyron.io/veyron/veyron/lib/netconfig"
)
func ExampleNetConfigWatcher() {
diff --git a/lib/netconfig/ipaux_bsd.go b/lib/netconfig/ipaux_bsd.go
index 1002471..2b729f8 100644
--- a/lib/netconfig/ipaux_bsd.go
+++ b/lib/netconfig/ipaux_bsd.go
@@ -12,7 +12,7 @@
"sync"
"syscall"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
/*
diff --git a/lib/netconfig/ipaux_linux.go b/lib/netconfig/ipaux_linux.go
index 9e90003..c598da3 100644
--- a/lib/netconfig/ipaux_linux.go
+++ b/lib/netconfig/ipaux_linux.go
@@ -12,7 +12,7 @@
"syscall"
"time"
"unsafe"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
/*
diff --git a/lib/netstate/netstate_test.go b/lib/netstate/netstate_test.go
index 746341c..05c188e 100644
--- a/lib/netstate/netstate_test.go
+++ b/lib/netstate/netstate_test.go
@@ -5,7 +5,7 @@
"reflect"
"testing"
- "veyron/lib/netstate"
+ "veyron.io/veyron/veyron/lib/netstate"
)
func TestGet(t *testing.T) {
diff --git a/lib/signals/signals.go b/lib/signals/signals.go
index 75ed785..36bf90b 100644
--- a/lib/signals/signals.go
+++ b/lib/signals/signals.go
@@ -5,7 +5,7 @@
"os/signal"
"syscall"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
type stopSignal string
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index 596b9e2..7418a32 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -6,18 +6,18 @@
"syscall"
"testing"
- "veyron2"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/appcycle"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/appcycle"
- _ "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
- "veyron/lib/testutil/security"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/node"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/security"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/node"
)
// TestHelperProcess is boilerplate for the blackbox setup.
diff --git a/lib/stats/counter.go b/lib/stats/counter.go
index 8431407..b8dce27 100644
--- a/lib/stats/counter.go
+++ b/lib/stats/counter.go
@@ -3,7 +3,7 @@
import (
"time"
- "veyron/lib/stats/counter"
+ "veyron.io/veyron/veyron/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 5f3e3e2..03a3951 100644
--- a/lib/stats/counter/counter_test.go
+++ b/lib/stats/counter/counter_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "veyron/lib/stats/counter"
+ "veyron.io/veyron/veyron/lib/stats/counter"
)
func TestCounter(t *testing.T) {
diff --git a/lib/stats/glob.go b/lib/stats/glob.go
index c630e1e..f2db758 100644
--- a/lib/stats/glob.go
+++ b/lib/stats/glob.go
@@ -5,7 +5,7 @@
"sort"
"time"
- "veyron/lib/glob"
+ "veyron.io/veyron/veyron/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 ed2385a..b15c35a 100644
--- a/lib/stats/histogram.go
+++ b/lib/stats/histogram.go
@@ -3,7 +3,7 @@
import (
"time"
- "veyron/lib/stats/histogram"
+ "veyron.io/veyron/veyron/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 ec92e7b..44c3b07 100644
--- a/lib/stats/histogram/histogram.go
+++ b/lib/stats/histogram/histogram.go
@@ -6,8 +6,8 @@
"fmt"
"time"
- "veyron/lib/stats/counter"
- "veyron/services/mgmt/stats"
+ "veyron.io/veyron/veyron/lib/stats/counter"
+ "veyron.io/veyron/veyron/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 d98d9a8..e184142 100644
--- a/lib/stats/histogram/histogram_test.go
+++ b/lib/stats/histogram/histogram_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "veyron/lib/stats/histogram"
+ "veyron.io/veyron/veyron/lib/stats/histogram"
)
func TestHistogram(t *testing.T) {
diff --git a/lib/stats/stats_test.go b/lib/stats/stats_test.go
index 8b9d70d..17e0f61 100644
--- a/lib/stats/stats_test.go
+++ b/lib/stats/stats_test.go
@@ -5,12 +5,12 @@
"testing"
"time"
- libstats "veyron/lib/stats"
- "veyron/lib/stats/counter"
- "veyron/lib/stats/histogram"
- istats "veyron/services/mgmt/stats"
+ libstats "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats/counter"
+ "veyron.io/veyron/veyron/lib/stats/histogram"
+ istats "veyron.io/veyron/veyron/services/mgmt/stats"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func doGlob(root, pattern string, since time.Time, includeValues bool) ([]libstats.KeyValue, error) {
diff --git a/lib/testutil/blackbox/doc.go b/lib/testutil/blackbox/doc.go
index e4af049..48d077a 100644
--- a/lib/testutil/blackbox/doc.go
+++ b/lib/testutil/blackbox/doc.go
@@ -9,7 +9,7 @@
//
// // File: mytestsubprocess.go
// import (
-// "veyron/lib/testutil/blackbox"
+// "veyron.io/veyron/veyron/lib/testutil/blackbox"
// )
//
// func init() {
@@ -30,7 +30,7 @@
// package foo
//
// import (
-// "veyron/lib/testutil/blackbox"
+// "veyron.io/veyron/veyron/lib/testutil/blackbox"
// )
//
// func TestHelperProcess(t *testing.T) {
diff --git a/lib/testutil/blackbox/example_test.go b/lib/testutil/blackbox/example_test.go
index 399ff8f..357a749 100644
--- a/lib/testutil/blackbox/example_test.go
+++ b/lib/testutil/blackbox/example_test.go
@@ -6,7 +6,7 @@
"os"
"testing"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
)
func init() {
diff --git a/lib/testutil/blackbox/faultyconn.go b/lib/testutil/blackbox/faultyconn.go
index 368068e..4463fdd 100644
--- a/lib/testutil/blackbox/faultyconn.go
+++ b/lib/testutil/blackbox/faultyconn.go
@@ -6,7 +6,7 @@
"sync"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
type syncBool struct {
diff --git a/lib/testutil/blackbox/subprocess.go b/lib/testutil/blackbox/subprocess.go
index 984062b..f5e7842 100644
--- a/lib/testutil/blackbox/subprocess.go
+++ b/lib/testutil/blackbox/subprocess.go
@@ -15,7 +15,7 @@
"testing"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
type mainFunc func(argv []string)
diff --git a/lib/testutil/blackbox/subprocess_test.go b/lib/testutil/blackbox/subprocess_test.go
index d3f8bf3..a35e3da 100644
--- a/lib/testutil/blackbox/subprocess_test.go
+++ b/lib/testutil/blackbox/subprocess_test.go
@@ -14,8 +14,8 @@
"testing"
"time"
- "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
)
func isFatalf(t *testing.T, err error, format string, args ...interface{}) {
diff --git a/lib/testutil/init.go b/lib/testutil/init.go
index 188291c..5e9c28f 100644
--- a/lib/testutil/init.go
+++ b/lib/testutil/init.go
@@ -1,7 +1,7 @@
// Package testutil provides initalization and utility routines for unit tests.
//
// All tests should import it, even if only for its initialization:
-// import _ "veyron/lib/testutil"
+// import _ "veyron.io/veyron/veyron/lib/testutil"
//
package testutil
@@ -20,9 +20,9 @@
"time"
// Import blackbox to ensure that it gets to define its flags.
- _ "veyron/lib/testutil/blackbox"
+ _ "veyron.io/veyron/veyron/lib/testutil/blackbox"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/lib/testutil/modules/ls.go b/lib/testutil/modules/ls.go
index 3ea2dd3..8ecabb3 100644
--- a/lib/testutil/modules/ls.go
+++ b/lib/testutil/modules/ls.go
@@ -5,8 +5,8 @@
"strconv"
"strings"
- "veyron2/rt"
- "veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mounttable"
)
type globtag int
diff --git a/lib/testutil/modules/model.go b/lib/testutil/modules/model.go
index a23e3fb..9b98a16 100644
--- a/lib/testutil/modules/model.go
+++ b/lib/testutil/modules/model.go
@@ -11,7 +11,7 @@
"os"
"strings"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
)
func InModule() {
diff --git a/lib/testutil/modules/mounttable.go b/lib/testutil/modules/mounttable.go
index 13559ce..d79c108 100644
--- a/lib/testutil/modules/mounttable.go
+++ b/lib/testutil/modules/mounttable.go
@@ -7,13 +7,13 @@
"strconv"
"strings"
- "veyron/lib/testutil/blackbox"
- mounttable "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/lib/testutil/modules/servers.go b/lib/testutil/modules/servers.go
index 3d25636..c3a46d8 100644
--- a/lib/testutil/modules/servers.go
+++ b/lib/testutil/modules/servers.go
@@ -6,11 +6,11 @@
"strings"
"time"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
)
func init() {
diff --git a/lib/testutil/modules/servers.vdl.go b/lib/testutil/modules/servers.vdl.go
index b81d795..713d7d5 100644
--- a/lib/testutil/modules/servers.vdl.go
+++ b/lib/testutil/modules/servers.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/lib/testutil/modules/utils.go b/lib/testutil/modules/utils.go
index d5dda31..eefee81 100644
--- a/lib/testutil/modules/utils.go
+++ b/lib/testutil/modules/utils.go
@@ -5,7 +5,7 @@
"os"
"sync"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
)
type childList struct {
diff --git a/lib/testutil/security/util.go b/lib/testutil/security/util.go
index 5e8e5d4..9a45b2c 100644
--- a/lib/testutil/security/util.go
+++ b/lib/testutil/security/util.go
@@ -8,11 +8,11 @@
"strconv"
"time"
- "veyron/lib/testutil"
- isecurity "veyron/runtimes/google/security"
- vsecurity "veyron/security"
+ "veyron.io/veyron/veyron/lib/testutil"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
// NewBlessedIdentity creates a new identity and blesses it using the provided blesser
diff --git a/lib/testutil/security/util_test.go b/lib/testutil/security/util_test.go
index 9586f57..5125d1e 100644
--- a/lib/testutil/security/util_test.go
+++ b/lib/testutil/security/util_test.go
@@ -6,11 +6,11 @@
"reflect"
"testing"
- isecurity "veyron/runtimes/google/security"
- vsecurity "veyron/security"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestNewBlessedIdentity(t *testing.T) {
diff --git a/lib/unixfd/unixfd.go b/lib/unixfd/unixfd.go
index 2fa870f..f301a2f 100644
--- a/lib/unixfd/unixfd.go
+++ b/lib/unixfd/unixfd.go
@@ -11,7 +11,7 @@
"strconv"
"sync"
"syscall"
- "veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/ipc/stream"
)
const Network string = "unixfd"
diff --git a/profiles/doc.go b/profiles/doc.go
index f5fc4dc..bee7e06 100644
--- a/profiles/doc.go
+++ b/profiles/doc.go
@@ -21,7 +21,7 @@
// itself via its Init function, since the expected use is that it will
// used automatically as a default by the Runtime. Instead it provides a New
// function. This avoids the need for every main package to import
-// "veyron/profiles", instead, only more specific Profiles must be so imported.
+// "veyron.io/veyron/veyron/profiles", instead, only more specific Profiles must be so imported.
//
// The 'net' Profile adds operating system support for varied network
// configurations and in particular dhcp. It should be used by any application
diff --git a/profiles/gce/init.go b/profiles/gce/init.go
index 915a9f6..575543d 100644
--- a/profiles/gce/init.go
+++ b/profiles/gce/init.go
@@ -6,13 +6,13 @@
import (
"net"
- "veyron/profiles"
+ "veyron.io/veyron/veyron/profiles"
- "veyron2"
- "veyron2/config"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/profiles/internal/gce"
+ "veyron.io/veyron/veyron/profiles/internal/gce"
)
func init() {
diff --git a/profiles/generic.go b/profiles/generic.go
index 7b493e0..223cd0d 100644
--- a/profiles/generic.go
+++ b/profiles/generic.go
@@ -1,10 +1,10 @@
package profiles
import (
- "veyron2"
- "veyron2/config"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
- "veyron/profiles/internal"
+ "veyron.io/veyron/veyron/profiles/internal"
)
type generic struct{}
diff --git a/profiles/internal/util.go b/profiles/internal/util.go
index 156a973..3ec7eee 100644
--- a/profiles/internal/util.go
+++ b/profiles/internal/util.go
@@ -4,7 +4,7 @@
"fmt"
"net"
- "veyron/lib/netstate"
+ "veyron.io/veyron/veyron/lib/netstate"
)
// IPAddressChooser returns the preferred IP address, which is,
diff --git a/profiles/platform_darwin.go b/profiles/platform_darwin.go
index 55e39a3..933b589 100644
--- a/profiles/platform_darwin.go
+++ b/profiles/platform_darwin.go
@@ -9,8 +9,8 @@
import (
"fmt"
- "veyron2"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
)
// Platform returns the description of the Platform this process is running on.
diff --git a/profiles/platform_linux.go b/profiles/platform_linux.go
index b38e12c..58a5fc1 100644
--- a/profiles/platform_linux.go
+++ b/profiles/platform_linux.go
@@ -6,8 +6,8 @@
"fmt"
"syscall"
- "veyron2"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
)
// Platform returns the description of the Platform this process is running on.
diff --git a/profiles/profiles_test.go b/profiles/profiles_test.go
index 5a67c69..6804198 100644
--- a/profiles/profiles_test.go
+++ b/profiles/profiles_test.go
@@ -4,7 +4,7 @@
"os"
"testing"
- "veyron/profiles"
+ "veyron.io/veyron/veyron/profiles"
)
func TestGeneric(t *testing.T) {
diff --git a/profiles/roaming/gce_linux.go b/profiles/roaming/gce_linux.go
index ebab8ec..efd3598 100644
--- a/profiles/roaming/gce_linux.go
+++ b/profiles/roaming/gce_linux.go
@@ -5,10 +5,10 @@
import (
"net"
- "veyron2"
- "veyron2/config"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
- "veyron/profiles/internal/gce"
+ "veyron.io/veyron/veyron/profiles/internal/gce"
)
func handleGCE(rt veyron2.Runtime, publisher *config.Publisher) *net.IPAddr {
diff --git a/profiles/roaming/gce_other.go b/profiles/roaming/gce_other.go
index b528aa2..9d77604 100644
--- a/profiles/roaming/gce_other.go
+++ b/profiles/roaming/gce_other.go
@@ -5,8 +5,8 @@
import (
"net"
- "veyron2"
- "veyron2/config"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
)
func handleGCE(veyron2.Runtime, *config.Publisher) *net.IPAddr {
diff --git a/profiles/roaming/init.go b/profiles/roaming/init.go
index ddad180..156065c 100644
--- a/profiles/roaming/init.go
+++ b/profiles/roaming/init.go
@@ -15,15 +15,15 @@
"fmt"
"net"
- "veyron2"
- "veyron2/config"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/lib/flags"
- "veyron/lib/netconfig"
- "veyron/lib/netstate"
- "veyron/profiles"
+ "veyron.io/veyron/veyron/lib/flags"
+ "veyron.io/veyron/veyron/lib/netconfig"
+ "veyron.io/veyron/veyron/lib/netstate"
+ "veyron.io/veyron/veyron/profiles"
)
const (
diff --git a/profiles/roaming/net_watcher.go b/profiles/roaming/net_watcher.go
index 66f8d35..1c71022 100644
--- a/profiles/roaming/net_watcher.go
+++ b/profiles/roaming/net_watcher.go
@@ -5,10 +5,10 @@
import (
"fmt"
- "veyron2/config"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/profiles/roaming"
+ "veyron.io/veyron/veyron/profiles/roaming"
)
func main() {
diff --git a/profiles/roaming/print_addrs.go b/profiles/roaming/print_addrs.go
index a6260bd..55c4685 100644
--- a/profiles/roaming/print_addrs.go
+++ b/profiles/roaming/print_addrs.go
@@ -4,7 +4,7 @@
import (
"fmt"
- "veyron/lib/netstate"
+ "veyron.io/veyron/veyron/lib/netstate"
)
func main() {
diff --git a/profiles/roaming/roaming_server.go b/profiles/roaming/roaming_server.go
index 20f89cd..73a36ad 100644
--- a/profiles/roaming/roaming_server.go
+++ b/profiles/roaming/roaming_server.go
@@ -5,10 +5,10 @@
import (
"fmt"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/profiles/roaming"
+ "veyron.io/veyron/veyron/profiles/roaming"
)
func main() {
diff --git a/runtimes/google/appcycle/appcycle.go b/runtimes/google/appcycle/appcycle.go
index 1d3eb00..85979e2 100644
--- a/runtimes/google/appcycle/appcycle.go
+++ b/runtimes/google/appcycle/appcycle.go
@@ -8,8 +8,8 @@
package appcycle
import (
- "veyron2"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
)
// AppCycleService is the interface the server implements.
diff --git a/runtimes/google/ipc/benchmarks/bmclient/main.go b/runtimes/google/ipc/benchmarks/bmclient/main.go
index 6065f1c..aee94e8 100644
--- a/runtimes/google/ipc/benchmarks/bmclient/main.go
+++ b/runtimes/google/ipc/benchmarks/bmclient/main.go
@@ -5,9 +5,9 @@
"flag"
"os"
- "veyron/runtimes/google/ipc/benchmarks"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/benchmarks"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
var (
diff --git a/runtimes/google/ipc/benchmarks/bmserver/main.go b/runtimes/google/ipc/benchmarks/bmserver/main.go
index 98ac76f..5d16296 100644
--- a/runtimes/google/ipc/benchmarks/bmserver/main.go
+++ b/runtimes/google/ipc/benchmarks/bmserver/main.go
@@ -4,11 +4,11 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/runtimes/google/ipc/benchmarks"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/benchmarks"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/runtimes/google/ipc/benchmarks/client.go b/runtimes/google/ipc/benchmarks/client.go
index f3e4066..7d7c871 100644
--- a/runtimes/google/ipc/benchmarks/client.go
+++ b/runtimes/google/ipc/benchmarks/client.go
@@ -6,9 +6,9 @@
"io"
"time"
- "veyron2/context"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
// CallEcho calls the Echo method 'iterations' times with the given payload
diff --git a/runtimes/google/ipc/benchmarks/ipc_test.go b/runtimes/google/ipc/benchmarks/ipc_test.go
index 00dac63..cfa7abb 100644
--- a/runtimes/google/ipc/benchmarks/ipc_test.go
+++ b/runtimes/google/ipc/benchmarks/ipc_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "veyron/runtimes/google/ipc/benchmarks"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/benchmarks"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
var runtime = rt.Init()
diff --git a/runtimes/google/ipc/benchmarks/server.go b/runtimes/google/ipc/benchmarks/server.go
index fc14397..a4d7f41 100644
--- a/runtimes/google/ipc/benchmarks/server.go
+++ b/runtimes/google/ipc/benchmarks/server.go
@@ -1,12 +1,12 @@
package benchmarks
import (
- sflag "veyron/security/flag"
+ sflag "veyron.io/veyron/veyron/security/flag"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
type impl struct {
diff --git a/runtimes/google/ipc/benchmarks/service.vdl.go b/runtimes/google/ipc/benchmarks/service.vdl.go
index d60e80b..127b5d8 100644
--- a/runtimes/google/ipc/benchmarks/service.vdl.go
+++ b/runtimes/google/ipc/benchmarks/service.vdl.go
@@ -8,12 +8,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_io "io"
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/runtimes/google/ipc/cancel_test.go b/runtimes/google/ipc/cancel_test.go
index 09b9e7b..adba274 100644
--- a/runtimes/google/ipc/cancel_test.go
+++ b/runtimes/google/ipc/cancel_test.go
@@ -3,14 +3,14 @@
import (
"testing"
- "veyron/runtimes/google/ipc/stream/manager"
- tnaming "veyron/runtimes/google/testing/mocks/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ tnaming "veyron.io/veyron/veyron/runtimes/google/testing/mocks/naming"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
type fakeAuthorizer int
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index 8554995..4a61b55 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -9,19 +9,19 @@
"sync"
"time"
- "veyron/runtimes/google/ipc/version"
- inaming "veyron/runtimes/google/naming"
- "veyron/runtimes/google/vtrace"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ "veyron.io/veyron/veyron/runtimes/google/vtrace"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
var (
diff --git a/runtimes/google/ipc/context.go b/runtimes/google/ipc/context.go
index e7b0354..15a01f3 100644
--- a/runtimes/google/ipc/context.go
+++ b/runtimes/google/ipc/context.go
@@ -4,8 +4,8 @@
"sync"
"time"
- "veyron2"
- "veyron2/context"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
)
// InternalNewContext creates a new context.T. This function should only
diff --git a/runtimes/google/ipc/context_test.go b/runtimes/google/ipc/context_test.go
index 8402809..abefdc3 100644
--- a/runtimes/google/ipc/context_test.go
+++ b/runtimes/google/ipc/context_test.go
@@ -5,10 +5,10 @@
"testing"
"time"
- "veyron/runtimes/google/testing/mocks/runtime"
- "veyron/runtimes/google/vtrace"
+ "veyron.io/veyron/veyron/runtimes/google/testing/mocks/runtime"
+ "veyron.io/veyron/veyron/runtimes/google/vtrace"
- "veyron2/context"
+ "veyron.io/veyron/veyron2/context"
)
// We need a special way to create contexts for tests. We
diff --git a/runtimes/google/ipc/discharges.go b/runtimes/google/ipc/discharges.go
index 469af65..1b35bb1 100644
--- a/runtimes/google/ipc/discharges.go
+++ b/runtimes/google/ipc/discharges.go
@@ -2,12 +2,12 @@
import (
"sync"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vlog"
)
// prepareDischarges retrieves the caveat discharges required for using blessing
diff --git a/runtimes/google/ipc/flow_test.go b/runtimes/google/ipc/flow_test.go
index 9271dd4..ad24c2c 100644
--- a/runtimes/google/ipc/flow_test.go
+++ b/runtimes/google/ipc/flow_test.go
@@ -8,13 +8,13 @@
"testing"
"time"
- _ "veyron/lib/testutil"
- isecurity "veyron/runtimes/google/security"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
)
var testID = newID("test")
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index b265e4f..2a72afe 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -12,29 +12,29 @@
"testing"
"time"
- _ "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
- tsecurity "veyron/lib/testutil/security"
- imanager "veyron/runtimes/google/ipc/stream/manager"
- "veyron/runtimes/google/ipc/stream/proxy"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/ipc/version"
- "veyron/runtimes/google/lib/publisher"
- inaming "veyron/runtimes/google/naming"
- isecurity "veyron/runtimes/google/security"
- tnaming "veyron/runtimes/google/testing/mocks/naming"
- vsecurity "veyron/security"
- "veyron/security/caveat"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ tsecurity "veyron.io/veyron/veyron/lib/testutil/security"
+ imanager "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ "veyron.io/veyron/veyron/runtimes/google/lib/publisher"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ tnaming "veyron.io/veyron/veyron/runtimes/google/testing/mocks/naming"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/caveat"
- "veyron2"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
var (
diff --git a/runtimes/google/ipc/results_store_test.go b/runtimes/google/ipc/results_store_test.go
index 6ddc67a..a6875e9 100644
--- a/runtimes/google/ipc/results_store_test.go
+++ b/runtimes/google/ipc/results_store_test.go
@@ -5,7 +5,7 @@
"sync"
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
)
func randomKeys() []uint64 {
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index a4da6d8..4764944 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -9,24 +9,24 @@
"sync"
"time"
- "veyron/lib/netstate"
- "veyron/runtimes/google/lib/publisher"
- inaming "veyron/runtimes/google/naming"
- isecurity "veyron/runtimes/google/security"
- ivtrace "veyron/runtimes/google/vtrace"
- vsecurity "veyron/security"
+ "veyron.io/veyron/veyron/lib/netstate"
+ "veyron.io/veyron/veyron/runtimes/google/lib/publisher"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ ivtrace "veyron.io/veyron/veyron/runtimes/google/vtrace"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2"
- "veyron2/config"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
+ "veyron.io/veyron/veyron2/vtrace"
)
var (
diff --git a/runtimes/google/ipc/stats.go b/runtimes/google/ipc/stats.go
index 1b8344d..a04e932 100644
--- a/runtimes/google/ipc/stats.go
+++ b/runtimes/google/ipc/stats.go
@@ -4,10 +4,10 @@
"sync"
"time"
- "veyron/lib/stats"
- "veyron/lib/stats/histogram"
+ "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats/histogram"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/naming"
)
type ipcStats struct {
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_flow.go b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
index 8f2392c..ff69e6f 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_flow.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
@@ -4,10 +4,10 @@
"io"
"testing"
- "veyron/runtimes/google/ipc/stream/manager"
- "veyron2"
- "veyron2/ipc/stream"
- "veyron2/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
)
const (
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_tls.go b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
index 40e6b8d..630ae8c 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_tls.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
@@ -10,8 +10,8 @@
"net"
"testing"
- "veyron/runtimes/google/ipc/stream/crypto"
- tls "veyron/runtimes/google/ipc/stream/crypto/tlsfork"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ tls "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto/tlsfork"
)
func benchmarkTLS(b *testing.B, nConns int) {
diff --git a/runtimes/google/ipc/stream/crypto/box.go b/runtimes/google/ipc/stream/crypto/box.go
index 10a9cea..24e6328 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -8,7 +8,7 @@
"fmt"
"io"
"net"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
)
type boxcrypter struct {
diff --git a/runtimes/google/ipc/stream/crypto/crypto.go b/runtimes/google/ipc/stream/crypto/crypto.go
index d881309..b191bf2 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 "veyron/runtimes/google/lib/iobuf"
+import "veyron.io/veyron/veyron/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 c1eeef3..3c28210 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"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/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 0401076..19b5726 100644
--- a/runtimes/google/ipc/stream/crypto/null.go
+++ b/runtimes/google/ipc/stream/crypto/null.go
@@ -1,6 +1,6 @@
package crypto
-import "veyron/runtimes/google/lib/iobuf"
+import "veyron.io/veyron/veyron/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 d07c52c..c791ac0 100644
--- a/runtimes/google/ipc/stream/crypto/tls.go
+++ b/runtimes/google/ipc/stream/crypto/tls.go
@@ -11,7 +11,7 @@
"sync"
"time"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
)
var errDeadlinesNotSupported = errors.New("deadlines not supported")
diff --git a/runtimes/google/ipc/stream/crypto/tls_old.go b/runtimes/google/ipc/stream/crypto/tls_old.go
index 6399b36..e732549 100644
--- a/runtimes/google/ipc/stream/crypto/tls_old.go
+++ b/runtimes/google/ipc/stream/crypto/tls_old.go
@@ -16,9 +16,9 @@
"net"
"sync"
"time"
- tls "veyron/runtimes/google/ipc/stream/crypto/tlsfork"
+ tls "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto/tlsfork"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
)
var errDeadlinesNotSupported = errors.New("deadlines not supported")
diff --git a/runtimes/google/ipc/stream/manager/http.go b/runtimes/google/ipc/stream/manager/http.go
index c8a485c..aa5540d 100644
--- a/runtimes/google/ipc/stream/manager/http.go
+++ b/runtimes/google/ipc/stream/manager/http.go
@@ -4,7 +4,7 @@
"fmt"
"net/http"
- "veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/ipc/stream"
)
// HTTPHandler returns an http.Handler that dumps out debug information from
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index 2bafdbb..ef09914 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -7,16 +7,16 @@
"strings"
"sync"
- "veyron/runtimes/google/ipc/stream/proxy"
- "veyron/runtimes/google/ipc/stream/vif"
- "veyron/runtimes/google/lib/upcqueue"
- inaming "veyron/runtimes/google/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vif"
+ "veyron.io/veyron/veyron/runtimes/google/lib/upcqueue"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
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 389a30c..fc5491f 100644
--- a/runtimes/google/ipc/stream/manager/manager.go
+++ b/runtimes/google/ipc/stream/manager/manager.go
@@ -8,15 +8,15 @@
"strings"
"sync"
- "veyron/runtimes/google/ipc/stream/crypto"
- "veyron/runtimes/google/ipc/stream/vif"
- "veyron/runtimes/google/ipc/version"
- inaming "veyron/runtimes/google/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vif"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
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 0cdeea2..932b8f5 100644
--- a/runtimes/google/ipc/stream/manager/manager_test.go
+++ b/runtimes/google/ipc/stream/manager/manager_test.go
@@ -10,17 +10,17 @@
"strings"
"testing"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
- _ "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/ipc/version"
- inaming "veyron/runtimes/google/naming"
- isecurity "veyron/runtimes/google/security"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
)
func newID(name string) security.PrivateID {
diff --git a/runtimes/google/ipc/stream/message/coding.go b/runtimes/google/ipc/stream/message/coding.go
index 4b45bfc..378bd03 100644
--- a/runtimes/google/ipc/stream/message/coding.go
+++ b/runtimes/google/ipc/stream/message/coding.go
@@ -6,7 +6,7 @@
"fmt"
"io"
- "veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/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 80faa5d..ce58df0 100644
--- a/runtimes/google/ipc/stream/message/control.go
+++ b/runtimes/google/ipc/stream/message/control.go
@@ -5,9 +5,9 @@
"fmt"
"io"
- "veyron/runtimes/google/ipc/stream/id"
- inaming "veyron/runtimes/google/naming"
- "veyron2/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ "veyron.io/veyron/veyron2/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 00ae914..bd3f847 100644
--- a/runtimes/google/ipc/stream/message/counters.go
+++ b/runtimes/google/ipc/stream/message/counters.go
@@ -3,7 +3,7 @@
import (
"fmt"
- "veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/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 85e2484..eea17c9 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"
- "veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/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 2859b43..d0f6804 100644
--- a/runtimes/google/ipc/stream/message/data.go
+++ b/runtimes/google/ipc/stream/message/data.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/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 3502522..db5d58b 100644
--- a/runtimes/google/ipc/stream/message/message.go
+++ b/runtimes/google/ipc/stream/message/message.go
@@ -41,9 +41,9 @@
"fmt"
"io"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/lib/iobuf"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/runtimes/google/ipc/stream/message/message_test.go b/runtimes/google/ipc/stream/message/message_test.go
index 361ddb3..bd1fba8 100644
--- a/runtimes/google/ipc/stream/message/message_test.go
+++ b/runtimes/google/ipc/stream/message/message_test.go
@@ -5,9 +5,9 @@
"reflect"
"testing"
- "veyron/runtimes/google/ipc/version"
- "veyron/runtimes/google/lib/iobuf"
- "veyron2/naming"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron2/naming"
)
func TestControl(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl b/runtimes/google/ipc/stream/proxy/protocol.vdl
index 591e477..d4ac8cb 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl
@@ -22,4 +22,4 @@
// Endpoint is the string representation of an endpoint that can be
// used to communicate with the server through the proxy.
Endpoint string
-}
\ No newline at end of file
+}
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 433ad73..b0d2147 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -5,19 +5,19 @@
"fmt"
"net"
"sync"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/ipc/stream/message"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/ipc/version"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/bqueue/drrqueue"
- "veyron/runtimes/google/lib/iobuf"
- "veyron/runtimes/google/lib/upcqueue"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/message"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/upcqueue"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
var (
diff --git a/runtimes/google/ipc/stream/proxy/proxy_test.go b/runtimes/google/ipc/stream/proxy/proxy_test.go
index cd1d7b4..ff9eb2b 100644
--- a/runtimes/google/ipc/stream/proxy/proxy_test.go
+++ b/runtimes/google/ipc/stream/proxy/proxy_test.go
@@ -8,15 +8,15 @@
"strings"
"testing"
- _ "veyron/lib/testutil"
- "veyron/runtimes/google/ipc/stream/manager"
- "veyron/runtimes/google/ipc/stream/proxy"
- "veyron/runtimes/google/ipc/stream/vc"
- isecurity "veyron/runtimes/google/security"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
func newID(name string) security.PrivateID {
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index 5fa7b53..a752b02 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -7,12 +7,12 @@
"io"
"math/big"
- "veyron/runtimes/google/ipc/stream/crypto"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
- "veyron2/ipc/version"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
const (
diff --git a/runtimes/google/ipc/stream/vc/flow.go b/runtimes/google/ipc/stream/vc/flow.go
index ccad460..9b62c4c 100644
--- a/runtimes/google/ipc/stream/vc/flow.go
+++ b/runtimes/google/ipc/stream/vc/flow.go
@@ -4,8 +4,8 @@
"net"
"time"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
type flow struct {
diff --git a/runtimes/google/ipc/stream/vc/init.go b/runtimes/google/ipc/stream/vc/init.go
index 261df0d..95b9acd 100644
--- a/runtimes/google/ipc/stream/vc/init.go
+++ b/runtimes/google/ipc/stream/vc/init.go
@@ -1,10 +1,10 @@
package vc
import (
- isecurity "veyron/runtimes/google/security"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
var anonymousID security.PrivateID
diff --git a/runtimes/google/ipc/stream/vc/listener.go b/runtimes/google/ipc/stream/vc/listener.go
index b69a589..b344020 100644
--- a/runtimes/google/ipc/stream/vc/listener.go
+++ b/runtimes/google/ipc/stream/vc/listener.go
@@ -3,8 +3,8 @@
import (
"errors"
- "veyron/runtimes/google/lib/upcqueue"
- "veyron2/ipc/stream"
+ "veyron.io/veyron/veyron/runtimes/google/lib/upcqueue"
+ "veyron.io/veyron/veyron2/ipc/stream"
)
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 80c52b4..73020e0 100644
--- a/runtimes/google/ipc/stream/vc/listener_test.go
+++ b/runtimes/google/ipc/stream/vc/listener_test.go
@@ -5,10 +5,10 @@
"testing"
"time"
- isecurity "veyron/runtimes/google/security"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
var testID = newID("test")
diff --git a/runtimes/google/ipc/stream/vc/reader.go b/runtimes/google/ipc/stream/vc/reader.go
index 8362df1..9e26a14 100644
--- a/runtimes/google/ipc/stream/vc/reader.go
+++ b/runtimes/google/ipc/stream/vc/reader.go
@@ -7,9 +7,9 @@
"sync/atomic"
"time"
- "veyron/runtimes/google/lib/iobuf"
- vsync "veyron/runtimes/google/lib/sync"
- "veyron/runtimes/google/lib/upcqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/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 ac75689..4a73158 100644
--- a/runtimes/google/ipc/stream/vc/reader_test.go
+++ b/runtimes/google/ipc/stream/vc/reader_test.go
@@ -8,7 +8,7 @@
"testing/quick"
"time"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
)
type testReadHandler struct{ items []uint }
diff --git a/runtimes/google/ipc/stream/vc/vc.go b/runtimes/google/ipc/stream/vc/vc.go
index d4f3752..d6bfc0d 100644
--- a/runtimes/google/ipc/stream/vc/vc.go
+++ b/runtimes/google/ipc/stream/vc/vc.go
@@ -11,18 +11,18 @@
"strings"
"sync"
- "veyron/runtimes/google/ipc/stream/crypto"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/iobuf"
- vsync "veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
- "veyron2"
- "veyron2/ipc/stream"
- "veyron2/ipc/version"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/vc_test.go b/runtimes/google/ipc/stream/vc/vc_test.go
index c0eaa54..f85f330 100644
--- a/runtimes/google/ipc/stream/vc/vc_test.go
+++ b/runtimes/google/ipc/stream/vc/vc_test.go
@@ -13,19 +13,19 @@
"sync"
"testing"
- "veyron/lib/testutil"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/bqueue/drrqueue"
- "veyron/runtimes/google/lib/iobuf"
- isecurity "veyron/runtimes/google/security"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2"
- "veyron2/ipc/stream"
- "veyron2/ipc/version"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
// Convenience alias to avoid conflicts between the package name "vc" and variables called "vc".
diff --git a/runtimes/google/ipc/stream/vc/writer.go b/runtimes/google/ipc/stream/vc/writer.go
index 3149b12..383beed 100644
--- a/runtimes/google/ipc/stream/vc/writer.go
+++ b/runtimes/google/ipc/stream/vc/writer.go
@@ -7,9 +7,9 @@
"sync/atomic"
"time"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/iobuf"
- vsync "veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ vsync "veyron.io/veyron/veyron/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 336887f..42a263c 100644
--- a/runtimes/google/ipc/stream/vc/writer_test.go
+++ b/runtimes/google/ipc/stream/vc/writer_test.go
@@ -7,10 +7,10 @@
"testing"
"time"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/bqueue/drrqueue"
- "veyron/runtimes/google/lib/iobuf"
- "veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/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/set_test.go b/runtimes/google/ipc/stream/vif/set_test.go
index e704cb3..85c68b3 100644
--- a/runtimes/google/ipc/stream/vif/set_test.go
+++ b/runtimes/google/ipc/stream/vif/set_test.go
@@ -6,9 +6,9 @@
"path"
"testing"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/naming"
- "veyron/runtimes/google/ipc/stream/vif"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vif"
)
func TestSetWithPipes(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/vif/vcmap.go b/runtimes/google/ipc/stream/vif/vcmap.go
index 0ef2f48..1406481 100644
--- a/runtimes/google/ipc/stream/vif/vcmap.go
+++ b/runtimes/google/ipc/stream/vif/vcmap.go
@@ -4,9 +4,9 @@
"sort"
"sync"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/lib/pcqueue"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/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 c9a4992..95636d2 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"
- "veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/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 2bfa7bb..d487ee4 100644
--- a/runtimes/google/ipc/stream/vif/vif.go
+++ b/runtimes/google/ipc/stream/vif/vif.go
@@ -13,21 +13,21 @@
"sync"
"time"
- "veyron/runtimes/google/ipc/stream/id"
- "veyron/runtimes/google/ipc/stream/message"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/ipc/version"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/bqueue/drrqueue"
- "veyron/runtimes/google/lib/iobuf"
- "veyron/runtimes/google/lib/pcqueue"
- vsync "veyron/runtimes/google/lib/sync"
- "veyron/runtimes/google/lib/upcqueue"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/message"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/pcqueue"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/lib/upcqueue"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// VIF implements a "virtual interface" over an underlying network connection
diff --git a/runtimes/google/ipc/stream/vif/vif_test.go b/runtimes/google/ipc/stream/vif/vif_test.go
index 769a90d..8780917 100644
--- a/runtimes/google/ipc/stream/vif/vif_test.go
+++ b/runtimes/google/ipc/stream/vif/vif_test.go
@@ -14,15 +14,15 @@
"sort"
"testing"
- "veyron/lib/testutil"
- "veyron/runtimes/google/ipc/stream/vc"
- "veyron/runtimes/google/ipc/stream/vif"
- iversion "veyron/runtimes/google/ipc/version"
- isecurity "veyron/runtimes/google/security"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vif"
+ iversion "veyron.io/veyron/veyron/runtimes/google/ipc/version"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/ipc/stream"
- "veyron2/ipc/version"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
)
func newLocalID(name string) vc.LocalID {
diff --git a/runtimes/google/ipc/testutil_test.go b/runtimes/google/ipc/testutil_test.go
index df71e4f..a6e214a 100644
--- a/runtimes/google/ipc/testutil_test.go
+++ b/runtimes/google/ipc/testutil_test.go
@@ -4,13 +4,13 @@
"reflect"
"testing"
- _ "veyron/lib/testutil"
- "veyron/runtimes/google/ipc/stream/vc"
- isecurity "veyron/runtimes/google/security"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
)
func makeResultPtrs(ins []interface{}) []interface{} {
diff --git a/runtimes/google/ipc/version/version.go b/runtimes/google/ipc/version/version.go
index a066511..ca86911 100644
--- a/runtimes/google/ipc/version/version.go
+++ b/runtimes/google/ipc/version/version.go
@@ -3,10 +3,10 @@
import (
"fmt"
- inaming "veyron/runtimes/google/naming"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
- "veyron2/ipc/version"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
)
// Range represents a range of IPC versions.
diff --git a/runtimes/google/ipc/version/version_test.go b/runtimes/google/ipc/version/version_test.go
index aa5375c..3f43cdb 100644
--- a/runtimes/google/ipc/version/version_test.go
+++ b/runtimes/google/ipc/version/version_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- inaming "veyron/runtimes/google/naming"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
- "veyron2/ipc/version"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
)
func TestCommonVersion(t *testing.T) {
diff --git a/runtimes/google/lib/bqueue/bqueue.go b/runtimes/google/lib/bqueue/bqueue.go
index e29873c..48229a6 100644
--- a/runtimes/google/lib/bqueue/bqueue.go
+++ b/runtimes/google/lib/bqueue/bqueue.go
@@ -33,7 +33,7 @@
import (
"errors"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/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 d4ef272..9b29fcd 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
@@ -23,10 +23,10 @@
"io"
"sync"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/deque"
- "veyron/runtimes/google/lib/iobuf"
- vsync "veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/deque"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
+ vsync "veyron.io/veyron/veyron/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 555fa93..f1fd72b 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"
- "veyron/runtimes/google/lib/bqueue"
- "veyron/runtimes/google/lib/iobuf"
+ "veyron.io/veyron/veyron/runtimes/google/lib/bqueue"
+ "veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/lib/deque/deque_test.go b/runtimes/google/lib/deque/deque_test.go
index f1b3600..beba945 100644
--- a/runtimes/google/lib/deque/deque_test.go
+++ b/runtimes/google/lib/deque/deque_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
)
func TestBasic(t *testing.T) {
diff --git a/runtimes/google/lib/follow/notify_watcher.go b/runtimes/google/lib/follow/notify_watcher.go
index c5279d8..ed79e9f 100644
--- a/runtimes/google/lib/follow/notify_watcher.go
+++ b/runtimes/google/lib/follow/notify_watcher.go
@@ -8,7 +8,7 @@
"io"
"sync"
- vsync "veyron/runtimes/google/lib/sync"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
)
type fsNotifyWatcher struct {
diff --git a/runtimes/google/lib/follow/stat_watcher.go b/runtimes/google/lib/follow/stat_watcher.go
index 29c8208..6c288f8 100644
--- a/runtimes/google/lib/follow/stat_watcher.go
+++ b/runtimes/google/lib/follow/stat_watcher.go
@@ -6,7 +6,7 @@
"sync"
"time"
- vsync "veyron/runtimes/google/lib/sync"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
)
const (
diff --git a/runtimes/google/lib/functional/op/operations.go b/runtimes/google/lib/functional/op/operations.go
index f036a5e..9e999a9 100644
--- a/runtimes/google/lib/functional/op/operations.go
+++ b/runtimes/google/lib/functional/op/operations.go
@@ -1,7 +1,7 @@
package op
import (
- "veyron/runtimes/google/lib/functional"
+ "veyron.io/veyron/veyron/runtimes/google/lib/functional"
)
// IterDifference iterates through the difference of two sets, applying function f
diff --git a/runtimes/google/lib/functional/op/operations_test.go b/runtimes/google/lib/functional/op/operations_test.go
index d61882a..2d49c46 100644
--- a/runtimes/google/lib/functional/op/operations_test.go
+++ b/runtimes/google/lib/functional/op/operations_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "veyron/runtimes/google/lib/functional"
- "veyron/runtimes/google/lib/functional/rb"
+ "veyron.io/veyron/veyron/runtimes/google/lib/functional"
+ "veyron.io/veyron/veyron/runtimes/google/lib/functional/rb"
)
func intCompare(it1, it2 interface{}) bool {
diff --git a/runtimes/google/lib/functional/rb/rb_set.go b/runtimes/google/lib/functional/rb/rb_set.go
index e929e1e..04d924a 100644
--- a/runtimes/google/lib/functional/rb/rb_set.go
+++ b/runtimes/google/lib/functional/rb/rb_set.go
@@ -33,7 +33,7 @@
package rb
import (
- "veyron/runtimes/google/lib/functional"
+ "veyron.io/veyron/veyron/runtimes/google/lib/functional"
)
// Node colors are RED and BLACK
diff --git a/runtimes/google/lib/functional/rb/rb_set_test.go b/runtimes/google/lib/functional/rb/rb_set_test.go
index 77623ba..26f8f7b 100644
--- a/runtimes/google/lib/functional/rb/rb_set_test.go
+++ b/runtimes/google/lib/functional/rb/rb_set_test.go
@@ -5,8 +5,8 @@
"log"
"testing"
- "veyron/lib/testutil"
- "veyron/runtimes/google/lib/functional"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/lib/functional"
)
const (
diff --git a/runtimes/google/lib/iobuf/allocator.go b/runtimes/google/lib/iobuf/allocator.go
index be6e79d..97ef7b5 100644
--- a/runtimes/google/lib/iobuf/allocator.go
+++ b/runtimes/google/lib/iobuf/allocator.go
@@ -1,6 +1,6 @@
package iobuf
-import "veyron2/vlog"
+import "veyron.io/veyron/veyron2/vlog"
// Allocator is an allocator for Slices that tries to allocate
// contiguously. That is, sequential allocations will tend to be contiguous,
diff --git a/runtimes/google/lib/iobuf/iobuf.go b/runtimes/google/lib/iobuf/iobuf.go
index 80c8618..baa424d 100644
--- a/runtimes/google/lib/iobuf/iobuf.go
+++ b/runtimes/google/lib/iobuf/iobuf.go
@@ -27,7 +27,7 @@
"sync"
"sync/atomic"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// A iobuf is a storage space for memory read from the network. The data should
diff --git a/runtimes/google/lib/pcqueue/pcqueue_test.go b/runtimes/google/lib/pcqueue/pcqueue_test.go
index 00968f7..1439b17 100644
--- a/runtimes/google/lib/pcqueue/pcqueue_test.go
+++ b/runtimes/google/lib/pcqueue/pcqueue_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- _ "veyron/lib/testutil"
- "veyron2/vlog"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/runtimes/google/lib/publisher/publisher.go b/runtimes/google/lib/publisher/publisher.go
index 97e2176..f100be1 100644
--- a/runtimes/google/lib/publisher/publisher.go
+++ b/runtimes/google/lib/publisher/publisher.go
@@ -8,9 +8,9 @@
"strings"
"time"
- "veyron2/context"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
// Publisher manages the publishing of servers in mounttable.
diff --git a/runtimes/google/lib/sync/semaphore_test.go b/runtimes/google/lib/sync/semaphore_test.go
index 10366e8..13379b7 100644
--- a/runtimes/google/lib/sync/semaphore_test.go
+++ b/runtimes/google/lib/sync/semaphore_test.go
@@ -5,7 +5,7 @@
"sync/atomic"
"testing"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
)
func TestSemaphore(t *testing.T) {
diff --git a/runtimes/google/lib/sync/wait_group_test.go b/runtimes/google/lib/sync/wait_group_test.go
index 7a6bc92..76e4bb6 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"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
)
// TestRandom tests Wait after a random sequence of TryAdd's and Done's that
diff --git a/runtimes/google/lib/upcqueue/upcqueue.go b/runtimes/google/lib/upcqueue/upcqueue.go
index bb02091..d58a489 100644
--- a/runtimes/google/lib/upcqueue/upcqueue.go
+++ b/runtimes/google/lib/upcqueue/upcqueue.go
@@ -15,8 +15,8 @@
"errors"
"sync"
- "veyron/runtimes/google/lib/deque"
- vsync "veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron/runtimes/google/lib/deque"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
)
var (
diff --git a/runtimes/google/lib/upcqueue/upcqueue_test.go b/runtimes/google/lib/upcqueue/upcqueue_test.go
index 8ad8b45..adf7b94 100644
--- a/runtimes/google/lib/upcqueue/upcqueue_test.go
+++ b/runtimes/google/lib/upcqueue/upcqueue_test.go
@@ -6,9 +6,9 @@
"testing"
"time"
- _ "veyron/lib/testutil"
- vsync "veyron/runtimes/google/lib/sync"
- "veyron2/vlog"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ vsync "veyron.io/veyron/veyron/runtimes/google/lib/sync"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/runtimes/google/naming/endpoint.go b/runtimes/google/naming/endpoint.go
index b048b7c..4df4a98 100644
--- a/runtimes/google/naming/endpoint.go
+++ b/runtimes/google/naming/endpoint.go
@@ -7,8 +7,8 @@
"strconv"
"strings"
- "veyron2/ipc/version"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
)
const (
diff --git a/runtimes/google/naming/endpoint_test.go b/runtimes/google/naming/endpoint_test.go
index 08bcf43..f0d036b 100644
--- a/runtimes/google/naming/endpoint_test.go
+++ b/runtimes/google/naming/endpoint_test.go
@@ -5,8 +5,8 @@
"reflect"
"testing"
- "veyron2/ipc/version"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/ipc/version"
+ "veyron.io/veyron/veyron2/naming"
)
func TestEndpoint(t *testing.T) {
diff --git a/runtimes/google/naming/namespace/all_test.go b/runtimes/google/naming/namespace/all_test.go
index 6350997..479b5bd 100644
--- a/runtimes/google/naming/namespace/all_test.go
+++ b/runtimes/google/naming/namespace/all_test.go
@@ -9,19 +9,19 @@
"testing"
"time"
- "veyron/lib/glob"
- _ "veyron/lib/testutil"
- "veyron/runtimes/google/naming/namespace"
- service "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/lib/glob"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/runtimes/google/naming/namespace"
+ service "veyron.io/veyron/veyron/services/mounttable/lib"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
func boom(t *testing.T, f string, v ...interface{}) {
diff --git a/runtimes/google/naming/namespace/cache.go b/runtimes/google/naming/namespace/cache.go
index 1229ee4..4686928 100644
--- a/runtimes/google/naming/namespace/cache.go
+++ b/runtimes/google/naming/namespace/cache.go
@@ -6,8 +6,8 @@
"sync"
"time"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
// maxCacheEntries is the max number of cache entries to keep. It exists only so that we
diff --git a/runtimes/google/naming/namespace/cache_test.go b/runtimes/google/naming/namespace/cache_test.go
index 1b6b9ca..e3908a5 100644
--- a/runtimes/google/naming/namespace/cache_test.go
+++ b/runtimes/google/naming/namespace/cache_test.go
@@ -4,7 +4,7 @@
"fmt"
"testing"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2/naming"
)
func compatible(server string, servers []mountedServer) bool {
diff --git a/runtimes/google/naming/namespace/glob.go b/runtimes/google/naming/namespace/glob.go
index 2d79b4b..7328caa 100644
--- a/runtimes/google/naming/namespace/glob.go
+++ b/runtimes/google/naming/namespace/glob.go
@@ -6,11 +6,11 @@
"strings"
"time"
- "veyron/lib/glob"
+ "veyron.io/veyron/veyron/lib/glob"
- "veyron2/context"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
const mountTableGlobReplyStreamLength = 100
diff --git a/runtimes/google/naming/namespace/mount.go b/runtimes/google/naming/namespace/mount.go
index 5307ffd..2577f49 100644
--- a/runtimes/google/naming/namespace/mount.go
+++ b/runtimes/google/naming/namespace/mount.go
@@ -3,9 +3,9 @@
import (
"time"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vlog"
)
// mountIntoMountTable mounts a single server into a single mount table.
diff --git a/runtimes/google/naming/namespace/namespace.go b/runtimes/google/naming/namespace/namespace.go
index 92bff25..1482f67 100644
--- a/runtimes/google/naming/namespace/namespace.go
+++ b/runtimes/google/naming/namespace/namespace.go
@@ -4,9 +4,9 @@
"sync"
"time"
- "veyron2"
- "veyron2/naming"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
)
const defaultMaxResolveDepth = 32
diff --git a/runtimes/google/naming/namespace/resolve.go b/runtimes/google/naming/namespace/resolve.go
index cceaa86..da49886 100644
--- a/runtimes/google/naming/namespace/resolve.go
+++ b/runtimes/google/naming/namespace/resolve.go
@@ -4,11 +4,11 @@
"errors"
"runtime"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
func convertServersToStrings(servers []mountedServer, suffix string) (ret []string) {
diff --git a/runtimes/google/rt/blessingroots.go b/runtimes/google/rt/blessingroots.go
index bff2c08..a457b7a 100644
--- a/runtimes/google/rt/blessingroots.go
+++ b/runtimes/google/rt/blessingroots.go
@@ -5,9 +5,9 @@
"errors"
"sync"
- "veyron/security/serialization"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
const (
diff --git a/runtimes/google/rt/blessingroots_test.go b/runtimes/google/rt/blessingroots_test.go
index 39d823a..628dc73 100644
--- a/runtimes/google/rt/blessingroots_test.go
+++ b/runtimes/google/rt/blessingroots_test.go
@@ -10,7 +10,7 @@
"strings"
"testing"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
type s []string
diff --git a/runtimes/google/rt/blessingstore.go b/runtimes/google/rt/blessingstore.go
index 2feed95..a5c675c 100644
--- a/runtimes/google/rt/blessingstore.go
+++ b/runtimes/google/rt/blessingstore.go
@@ -6,11 +6,11 @@
"reflect"
"sync"
- isecurity "veyron/runtimes/google/security"
- "veyron/security/serialization"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/runtimes/google/rt/blessingstore_test.go b/runtimes/google/rt/blessingstore_test.go
index ac3e949..f071017 100644
--- a/runtimes/google/rt/blessingstore_test.go
+++ b/runtimes/google/rt/blessingstore_test.go
@@ -10,9 +10,9 @@
"testing"
"time"
- isecurity "veyron/runtimes/google/security"
- "veyron2/security"
- "veyron2/vom"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
var (
diff --git a/runtimes/google/rt/http.go b/runtimes/google/rt/http.go
index a890dac..5ed3237 100644
--- a/runtimes/google/rt/http.go
+++ b/runtimes/google/rt/http.go
@@ -10,10 +10,10 @@
// since it installs default HTTP handlers.
"net/http/pprof"
- "veyron/runtimes/google/ipc/stream/manager"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
type debugServer struct {
diff --git a/runtimes/google/rt/ipc.go b/runtimes/google/rt/ipc.go
index 02a382d..4655b01 100644
--- a/runtimes/google/rt/ipc.go
+++ b/runtimes/google/rt/ipc.go
@@ -4,18 +4,18 @@
"errors"
"fmt"
- iipc "veyron/runtimes/google/ipc"
- imanager "veyron/runtimes/google/ipc/stream/manager"
- "veyron/runtimes/google/ipc/stream/vc"
- ivtrace "veyron/runtimes/google/vtrace"
+ iipc "veyron.io/veyron/veyron/runtimes/google/ipc"
+ imanager "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ ivtrace "veyron.io/veyron/veyron/runtimes/google/vtrace"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vtrace"
)
// fixedPublicIDStore implements security.PublicIDStore. It embeds a (fixed) PublicID that
diff --git a/runtimes/google/rt/ipc_test.go b/runtimes/google/rt/ipc_test.go
index d02406b..16da093 100644
--- a/runtimes/google/rt/ipc_test.go
+++ b/runtimes/google/rt/ipc_test.go
@@ -7,15 +7,15 @@
"testing"
"time"
- _ "veyron/lib/testutil"
- isecurity "veyron/runtimes/google/security"
- vsecurity "veyron/security"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
type testService struct{}
diff --git a/runtimes/google/rt/log.go b/runtimes/google/rt/log.go
index 2433a47..13ebf76 100644
--- a/runtimes/google/rt/log.go
+++ b/runtimes/google/rt/log.go
@@ -1,7 +1,7 @@
package rt
import (
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
func (*vrt) Logger() vlog.Logger {
diff --git a/runtimes/google/rt/mgmt.go b/runtimes/google/rt/mgmt.go
index 0492f3a..95b11d3 100644
--- a/runtimes/google/rt/mgmt.go
+++ b/runtimes/google/rt/mgmt.go
@@ -6,13 +6,13 @@
"sync"
"time"
- "veyron/runtimes/google/appcycle"
- "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/runtimes/google/appcycle"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
- "veyron2"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
)
type mgmtImpl struct {
diff --git a/runtimes/google/rt/mgmt_test.go b/runtimes/google/rt/mgmt_test.go
index ff296ae..d11e082 100644
--- a/runtimes/google/rt/mgmt_test.go
+++ b/runtimes/google/rt/mgmt_test.go
@@ -7,18 +7,18 @@
"strings"
"testing"
- "veyron2"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/services/mgmt/appcycle"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/services/mgmt/appcycle"
- _ "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
- "veyron/lib/testutil/security"
- "veyron/runtimes/google/rt"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/node"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/security"
+ "veyron.io/veyron/veyron/runtimes/google/rt"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/node"
)
// TestBasic verifies that the basic plumbing works: LocalStop calls result in
diff --git a/runtimes/google/rt/naming.go b/runtimes/google/rt/naming.go
index 00141a2..98c6e66 100644
--- a/runtimes/google/rt/naming.go
+++ b/runtimes/google/rt/naming.go
@@ -1,8 +1,8 @@
package rt
import (
- inaming "veyron/runtimes/google/naming"
- "veyron2/naming"
+ inaming "veyron.io/veyron/veyron/runtimes/google/naming"
+ "veyron.io/veyron/veyron2/naming"
)
func (rt *vrt) NewEndpoint(ep string) (naming.Endpoint, error) {
diff --git a/runtimes/google/rt/rt.go b/runtimes/google/rt/rt.go
index 717e05c..e5931ae 100644
--- a/runtimes/google/rt/rt.go
+++ b/runtimes/google/rt/rt.go
@@ -7,17 +7,17 @@
"strings"
"sync"
- "veyron2"
- "veyron2/config"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
- "veyron/profiles"
- "veyron/runtimes/google/naming/namespace"
- "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/profiles"
+ "veyron.io/veyron/veyron/runtimes/google/naming/namespace"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
)
type vrt struct {
diff --git a/runtimes/google/rt/rt_test.go b/runtimes/google/rt/rt_test.go
index 06e5fa4..9e4866d 100644
--- a/runtimes/google/rt/rt_test.go
+++ b/runtimes/google/rt/rt_test.go
@@ -6,11 +6,11 @@
"regexp"
"testing"
- _ "veyron/lib/testutil"
- "veyron/lib/testutil/blackbox"
+ _ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
func init() {
diff --git a/runtimes/google/rt/security.go b/runtimes/google/rt/security.go
index 8325c02..09afd27 100644
--- a/runtimes/google/rt/security.go
+++ b/runtimes/google/rt/security.go
@@ -5,15 +5,15 @@
"os"
"os/user"
- "veyron/lib/unixfd"
- isecurity "veyron/runtimes/google/security"
- vsecurity "veyron/security"
- "veyron/security/agent"
+ "veyron.io/veyron/veyron/lib/unixfd"
+ isecurity "veyron.io/veyron/veyron/runtimes/google/security"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/agent"
- "veyron2"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
func (rt *vrt) NewIdentity(name string) (security.PrivateID, error) {
diff --git a/runtimes/google/rt/signal.go b/runtimes/google/rt/signal.go
index d0ef7d4..fc13847 100644
--- a/runtimes/google/rt/signal.go
+++ b/runtimes/google/rt/signal.go
@@ -4,7 +4,7 @@
"os"
"os/signal"
"syscall"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
func (r *vrt) initSignalHandling() {
diff --git a/runtimes/google/rt/signal_test.go b/runtimes/google/rt/signal_test.go
index 452b06c..c0f6235 100644
--- a/runtimes/google/rt/signal_test.go
+++ b/runtimes/google/rt/signal_test.go
@@ -5,10 +5,10 @@
"syscall"
"testing"
- "veyron2"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
- "veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
)
func init() {
diff --git a/runtimes/google/rt/util.go b/runtimes/google/rt/util.go
index d8bfbd1..83271be 100644
--- a/runtimes/google/rt/util.go
+++ b/runtimes/google/rt/util.go
@@ -5,10 +5,10 @@
"os"
"path"
- "veyron/security/serialization"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
func encodeAndStore(obj interface{}, dir, dataFile, sigFile string, signer serialization.Signer) error {
diff --git a/runtimes/google/security/identity.go b/runtimes/google/security/identity.go
index a4765ee..e9fb4e5 100644
--- a/runtimes/google/security/identity.go
+++ b/runtimes/google/security/identity.go
@@ -1,6 +1,6 @@
package security
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
// NewPrivateID returns a new PrivateID that uses the provided Signer to generate
// signatures. The returned PrivateID additionaly contains a single self-signed
diff --git a/runtimes/google/security/identity_chain.go b/runtimes/google/security/identity_chain.go
index d5cd673..d21aea6 100644
--- a/runtimes/google/security/identity_chain.go
+++ b/runtimes/google/security/identity_chain.go
@@ -11,13 +11,13 @@
"reflect"
"time"
- "veyron/runtimes/google/security/keys"
- vsecurity "veyron/security"
- "veyron/security/caveat"
+ "veyron.io/veyron/veyron/runtimes/google/security/keys"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/caveat"
- "veyron2/security"
- "veyron2/security/wire"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vom"
)
const (
diff --git a/runtimes/google/security/identity_set.go b/runtimes/google/security/identity_set.go
index 8cb9de6..c2828a0 100644
--- a/runtimes/google/security/identity_set.go
+++ b/runtimes/google/security/identity_set.go
@@ -7,8 +7,8 @@
"strings"
"time"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
type setPublicID []security.PublicID
diff --git a/runtimes/google/security/identity_test.go b/runtimes/google/security/identity_test.go
index c76c9c7..33b9726 100644
--- a/runtimes/google/security/identity_test.go
+++ b/runtimes/google/security/identity_test.go
@@ -10,12 +10,12 @@
"testing"
"time"
- "veyron/lib/testutil/blackbox"
- "veyron/security/caveat"
- "veyron2/security"
- "veyron2/security/wire"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/security/caveat"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
type S []string
diff --git a/runtimes/google/security/keys/trusted_keys.go b/runtimes/google/security/keys/trusted_keys.go
index 4bd198e..d7bef82 100644
--- a/runtimes/google/security/keys/trusted_keys.go
+++ b/runtimes/google/security/keys/trusted_keys.go
@@ -5,7 +5,7 @@
"reflect"
"sync"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
var (
diff --git a/runtimes/google/security/keys/trusted_keys_test.go b/runtimes/google/security/keys/trusted_keys_test.go
index 694baee..a678190 100644
--- a/runtimes/google/security/keys/trusted_keys_test.go
+++ b/runtimes/google/security/keys/trusted_keys_test.go
@@ -9,7 +9,7 @@
"strings"
"testing"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
func mkkey() security.PublicKey {
diff --git a/runtimes/google/security/performance_test.go b/runtimes/google/security/performance_test.go
index 2045126..f22a9b0 100644
--- a/runtimes/google/security/performance_test.go
+++ b/runtimes/google/security/performance_test.go
@@ -23,7 +23,7 @@
"testing"
"time"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
func benchmarkBless(b *testing.B, blesser security.PrivateID, blessee security.PublicID) {
diff --git a/runtimes/google/security/publicid_store.go b/runtimes/google/security/publicid_store.go
index ed53f727..0f5c855 100644
--- a/runtimes/google/security/publicid_store.go
+++ b/runtimes/google/security/publicid_store.go
@@ -8,10 +8,10 @@
"reflect"
"sync"
- "veyron/security/serialization"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
const (
diff --git a/runtimes/google/security/publicid_store_test.go b/runtimes/google/security/publicid_store_test.go
index 27ce399..0101a12 100644
--- a/runtimes/google/security/publicid_store_test.go
+++ b/runtimes/google/security/publicid_store_test.go
@@ -6,7 +6,7 @@
"reflect"
"testing"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
// verifyNamesAndPublicKey checks that the provided id has exactly the provided
diff --git a/runtimes/google/security/util.go b/runtimes/google/security/util.go
index 8391ab3..2d51108 100644
--- a/runtimes/google/security/util.go
+++ b/runtimes/google/security/util.go
@@ -5,9 +5,9 @@
"errors"
"fmt"
- "veyron/runtimes/google/security/keys"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron/runtimes/google/security/keys"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
var errDeriveMismatch = errors.New("public key does not match that of deriving identity")
diff --git a/runtimes/google/security/util_test.go b/runtimes/google/security/util_test.go
index 38b23ed..92f1362 100644
--- a/runtimes/google/security/util_test.go
+++ b/runtimes/google/security/util_test.go
@@ -8,10 +8,10 @@
"testing"
"time"
- "veyron/runtimes/google/security/keys"
+ "veyron.io/veyron/veyron/runtimes/google/security/keys"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
var (
diff --git a/runtimes/google/testing/concurrency/clock_test.go b/runtimes/google/testing/concurrency/clock_test.go
index 32ae14a..91a52ae 100644
--- a/runtimes/google/testing/concurrency/clock_test.go
+++ b/runtimes/google/testing/concurrency/clock_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
)
// TestClone checks the clone() method of a clock.
diff --git a/runtimes/google/testing/concurrency/mutex_test.go b/runtimes/google/testing/concurrency/mutex_test.go
index 1d0b0f6..f2d0d3f 100644
--- a/runtimes/google/testing/concurrency/mutex_test.go
+++ b/runtimes/google/testing/concurrency/mutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "veyron/runtimes/google/testing/concurrency"
- "veyron/runtimes/google/testing/concurrency/sync"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/testing/concurrency"
+ "veyron.io/veyron/veyron/runtimes/google/testing/concurrency/sync"
+ "veyron.io/veyron/veyron2/vlog"
)
var m sync.Mutex
diff --git a/runtimes/google/testing/concurrency/rwmutex_test.go b/runtimes/google/testing/concurrency/rwmutex_test.go
index 89f0f0b..ef39bf1 100644
--- a/runtimes/google/testing/concurrency/rwmutex_test.go
+++ b/runtimes/google/testing/concurrency/rwmutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "veyron/runtimes/google/testing/concurrency"
- "veyron/runtimes/google/testing/concurrency/sync"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/testing/concurrency"
+ "veyron.io/veyron/veyron/runtimes/google/testing/concurrency/sync"
+ "veyron.io/veyron/veyron2/vlog"
)
var rw sync.RWMutex
diff --git a/runtimes/google/testing/concurrency/sync/sync.go b/runtimes/google/testing/concurrency/sync/sync.go
index 8cca4ed..ec147ab 100644
--- a/runtimes/google/testing/concurrency/sync/sync.go
+++ b/runtimes/google/testing/concurrency/sync/sync.go
@@ -3,7 +3,7 @@
import (
"sync"
- "veyron/runtimes/google/testing/concurrency"
+ "veyron.io/veyron/veyron/runtimes/google/testing/concurrency"
)
// Mutex is a wrapper around the Go implementation of Mutex.
diff --git a/runtimes/google/testing/mocks/ipc/simple_client.go b/runtimes/google/testing/mocks/ipc/simple_client.go
index 9c50041..9cc1a41 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client.go
@@ -6,8 +6,8 @@
"reflect"
"sync"
- "veyron2/context"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
)
// NewSimpleClient creates a new mocked ipc client where the given map of method name
diff --git a/runtimes/google/testing/mocks/ipc/simple_client_test.go b/runtimes/google/testing/mocks/ipc/simple_client_test.go
index 46696b9..8d9c41c 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client_test.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client_test.go
@@ -4,7 +4,7 @@
"testing"
"time"
- "veyron2/context"
+ "veyron.io/veyron/veyron2/context"
)
type fakeContext struct{}
diff --git a/runtimes/google/testing/mocks/naming/namespace.go b/runtimes/google/testing/mocks/naming/namespace.go
index 951ab52..a587e64 100644
--- a/runtimes/google/testing/mocks/naming/namespace.go
+++ b/runtimes/google/testing/mocks/naming/namespace.go
@@ -6,9 +6,9 @@
"sync"
"time"
- "veyron2/context"
- "veyron2/naming"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/verror"
)
// NewSimpleNamespace returns a simple implementation of a Namespace
diff --git a/runtimes/google/testing/mocks/runtime/panic_runtime.go b/runtimes/google/testing/mocks/runtime/panic_runtime.go
index 87a9ee3..03a1fcb 100644
--- a/runtimes/google/testing/mocks/runtime/panic_runtime.go
+++ b/runtimes/google/testing/mocks/runtime/panic_runtime.go
@@ -1,15 +1,15 @@
package runtime
import (
- "veyron2"
- "veyron2/config"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vtrace"
)
// PanicRuntime is a dummy implementation of veyron2.Runtime that panics on every
diff --git a/runtimes/google/testing/timekeeper/manual_time.go b/runtimes/google/testing/timekeeper/manual_time.go
index ec3ee76..6dda478 100644
--- a/runtimes/google/testing/timekeeper/manual_time.go
+++ b/runtimes/google/testing/timekeeper/manual_time.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "veyron/runtimes/google/lib/timekeeper"
+ "veyron.io/veyron/veyron/runtimes/google/lib/timekeeper"
)
// ManualTime is a time keeper that allows control over the advancement of time.
diff --git a/runtimes/google/vtrace/collector.go b/runtimes/google/vtrace/collector.go
index 9352ff2..956b2d2 100644
--- a/runtimes/google/vtrace/collector.go
+++ b/runtimes/google/vtrace/collector.go
@@ -4,9 +4,9 @@
"sync"
"time"
- "veyron2/context"
- "veyron2/uniqueid"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/uniqueid"
+ "veyron.io/veyron/veyron2/vtrace"
)
// collectors collect spans and annotations for output or analysis.
diff --git a/runtimes/google/vtrace/vtrace.go b/runtimes/google/vtrace/vtrace.go
index d9cb1cf..0600677 100644
--- a/runtimes/google/vtrace/vtrace.go
+++ b/runtimes/google/vtrace/vtrace.go
@@ -4,10 +4,10 @@
package vtrace
import (
- "veyron2/context"
- "veyron2/uniqueid"
- "veyron2/vlog"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/uniqueid"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vtrace"
)
// 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 ecbd44d..3f8f586 100644
--- a/runtimes/google/vtrace/vtrace_test.go
+++ b/runtimes/google/vtrace/vtrace_test.go
@@ -4,19 +4,19 @@
"strings"
"testing"
- iipc "veyron/runtimes/google/ipc"
- "veyron/runtimes/google/ipc/stream/manager"
- tnaming "veyron/runtimes/google/testing/mocks/naming"
- truntime "veyron/runtimes/google/testing/mocks/runtime"
- ivtrace "veyron/runtimes/google/vtrace"
+ iipc "veyron.io/veyron/veyron/runtimes/google/ipc"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ tnaming "veyron.io/veyron/veyron/runtimes/google/testing/mocks/naming"
+ truntime "veyron.io/veyron/veyron/runtimes/google/testing/mocks/runtime"
+ ivtrace "veyron.io/veyron/veyron/runtimes/google/vtrace"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/ipc/stream"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/vlog"
- "veyron2/vtrace"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc/stream"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vtrace"
)
// We need a special way to create contexts for tests. We
diff --git a/security/acl_authorizer.go b/security/acl_authorizer.go
index bf59751..fe9fca5 100644
--- a/security/acl_authorizer.go
+++ b/security/acl_authorizer.go
@@ -11,7 +11,7 @@
"os"
"reflect"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
var (
diff --git a/security/acl_authorizer_test.go b/security/acl_authorizer_test.go
index 17573c3..e286d8b 100644
--- a/security/acl_authorizer_test.go
+++ b/security/acl_authorizer_test.go
@@ -7,8 +7,8 @@
"testing"
"time"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
type authMap map[security.PublicID]security.LabelSet
diff --git a/security/agent/agent_test.go b/security/agent/agent_test.go
index f2e46b2..07baf2d 100644
--- a/security/agent/agent_test.go
+++ b/security/agent/agent_test.go
@@ -7,11 +7,11 @@
"os"
"reflect"
"testing"
- "veyron/security/agent"
- "veyron/security/agent/server"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron/security/agent"
+ "veyron.io/veyron/veyron/security/agent/server"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
type fakesigner struct {
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index 9538b1e..fe87790 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -6,9 +6,9 @@
"os"
"os/exec"
"syscall"
- "veyron/security/agent"
- "veyron/security/agent/server"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/security/agent"
+ "veyron.io/veyron/veyron/security/agent/server"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/security/agent/client.go b/security/agent/client.go
index cb32acc..b4c8c41 100644
--- a/security/agent/client.go
+++ b/security/agent/client.go
@@ -6,12 +6,12 @@
"fmt"
"strconv"
- "veyron/lib/unixfd"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/security/wire"
+ "veyron.io/veyron/veyron/lib/unixfd"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
)
// EndpointVarName is the name of the environment variable containing
diff --git a/security/agent/server/server.go b/security/agent/server/server.go
index 71578d7..7eb316d 100644
--- a/security/agent/server/server.go
+++ b/security/agent/server/server.go
@@ -4,11 +4,11 @@
import (
"os"
- "veyron/lib/unixfd"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/security/wire"
+ "veyron.io/veyron/veyron/lib/unixfd"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
)
type Signer interface {
diff --git a/security/agent/server/wire.vdl b/security/agent/server/wire.vdl
index 695aad0..9d06e4b 100644
--- a/security/agent/server/wire.vdl
+++ b/security/agent/server/wire.vdl
@@ -1,8 +1,8 @@
package server
import (
- "veyron2/security"
- "veyron2/security/wire"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
)
type Agent interface {
diff --git a/security/agent/server/wire.vdl.go b/security/agent/server/wire.vdl.go
index ff7e386..15ed863 100644
--- a/security/agent/server/wire.vdl.go
+++ b/security/agent/server/wire.vdl.go
@@ -4,17 +4,17 @@
package server
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
- "veyron2/security/wire"
+ "veyron.io/veyron/veyron2/security/wire"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -182,20 +182,20 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/security.Hash", Tags: []string(nil)}, _gen_wiretype.StructType{
+ _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/security.Hash", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x42, Name: "Purpose"},
_gen_wiretype.FieldType{Type: 0x43, Name: "Hash"},
_gen_wiretype.FieldType{Type: 0x42, Name: "R"},
_gen_wiretype.FieldType{Type: 0x42, Name: "S"},
},
- "veyron2/security.Signature", []string(nil)},
- _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "veyron2/security/wire.KeyCurve", Tags: []string(nil)}, _gen_wiretype.StructType{
+ "veyron.io/veyron/veyron2/security.Signature", []string(nil)},
+ _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "veyron.io/veyron/veyron2/security/wire.KeyCurve", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x46, Name: "Curve"},
_gen_wiretype.FieldType{Type: 0x42, Name: "XY"},
},
- "veyron2/security/wire.PublicKey", []string(nil)},
+ "veyron.io/veyron/veyron2/security/wire.PublicKey", []string(nil)},
}
return result, nil
diff --git a/security/agent/test/main.go b/security/agent/test/main.go
index 0d554fe..2ce3214 100644
--- a/security/agent/test/main.go
+++ b/security/agent/test/main.go
@@ -4,10 +4,10 @@
"flag"
"fmt"
- "veyron/lib/signals"
- sflag "veyron/security/flag"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/lib/signals"
+ sflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
)
var runServer = flag.Bool("server", false, "Whether to run in server mode")
diff --git a/security/agent/test/wire.vdl.go b/security/agent/test/wire.vdl.go
index 87378b1..5a22289 100644
--- a/security/agent/test/wire.vdl.go
+++ b/security/agent/test/wire.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/security/audit/auditor_test.go b/security/audit/auditor_test.go
index 5e4e1bb..3fd3a5e 100644
--- a/security/audit/auditor_test.go
+++ b/security/audit/auditor_test.go
@@ -4,7 +4,7 @@
"testing"
"time"
- "veyron/security/audit"
+ "veyron.io/veyron/veyron/security/audit"
)
func TestEntryString(t *testing.T) {
diff --git a/security/audit/id.go b/security/audit/id.go
index a56700a..0c0cdc4 100644
--- a/security/audit/id.go
+++ b/security/audit/id.go
@@ -4,7 +4,7 @@
"fmt"
"time"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
type auditingID struct {
diff --git a/security/audit/id_test.go b/security/audit/id_test.go
index a0f9304..0af44df 100644
--- a/security/audit/id_test.go
+++ b/security/audit/id_test.go
@@ -10,9 +10,9 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
func TestAuditingID(t *testing.T) {
diff --git a/security/caveat/public_key_caveat.go b/security/caveat/public_key_caveat.go
index 0f928e8..76e8548 100644
--- a/security/caveat/public_key_caveat.go
+++ b/security/caveat/public_key_caveat.go
@@ -8,11 +8,11 @@
"fmt"
"time"
- vsecurity "veyron/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/security"
- "veyron2/security/wire"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vom"
)
// nonceLength specifies the length in bytes of the random nonce used
diff --git a/security/flag/flag.go b/security/flag/flag.go
index 88eceb0..d0820ca 100644
--- a/security/flag/flag.go
+++ b/security/flag/flag.go
@@ -7,13 +7,13 @@
"errors"
"flag"
- vsecurity "veyron/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
var (
- acl = flag.String("acl", "", "acl is an optional JSON-encoded security.ACL that is used to construct a security.Authorizer. Example: \"{\"veyron/alice\":\"RW\"}\" is a JSON-encoded ACL that allows all principals matching \"veyron/alice\" to access all methods with ReadLabel or WriteLabel. If this flag is provided then the \"--acl_file\" must be absent.")
+ acl = flag.String("acl", "", "acl is an optional JSON-encoded security.ACL that is used to construct a security.Authorizer. Example: \"{\"veyron.io/veyron/veyron/alice\":\"RW\"}\" is a JSON-encoded ACL that allows all principals matching \"veyron.io/veyron/veyron/alice\" to access all methods with ReadLabel or WriteLabel. If this flag is provided then the \"--acl_file\" must be absent.")
aclFile = flag.String("acl_file", "", "acl_file is an optional path to a file containing a JSON-encoded security.ACL that is used to construct a security.Authorizer. If this flag is provided then the \"--acl_file\" flag must be absent.")
)
diff --git a/security/flag/flag_test.go b/security/flag/flag_test.go
index ffa8d93..de56a92 100644
--- a/security/flag/flag_test.go
+++ b/security/flag/flag_test.go
@@ -6,10 +6,10 @@
"reflect"
"testing"
- tsecurity "veyron/lib/testutil/security"
- vsecurity "veyron/security"
+ tsecurity "veyron.io/veyron/veyron/lib/testutil/security"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
func TestNewAuthorizerOrDie(t *testing.T) {
diff --git a/security/serialization/serialization_test.go b/security/serialization/serialization_test.go
index 2a64a7d..0ee4df8 100644
--- a/security/serialization/serialization_test.go
+++ b/security/serialization/serialization_test.go
@@ -13,9 +13,9 @@
"strings"
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
type bufferCloser struct {
diff --git a/security/serialization/signing_writer.go b/security/serialization/signing_writer.go
index 85c71f7..6fb83b4 100644
--- a/security/serialization/signing_writer.go
+++ b/security/serialization/signing_writer.go
@@ -8,8 +8,8 @@
"hash"
"io"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
const defaultChunkSizeBytes = 1 << 20
diff --git a/security/serialization/verifying_reader.go b/security/serialization/verifying_reader.go
index d70cd7d..2a240b6 100644
--- a/security/serialization/verifying_reader.go
+++ b/security/serialization/verifying_reader.go
@@ -8,8 +8,8 @@
"fmt"
"io"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// verifyingReader implements io.Reader.
diff --git a/security/util.go b/security/util.go
index e2c37dc..470fe4c 100644
--- a/security/util.go
+++ b/security/util.go
@@ -7,8 +7,8 @@
"fmt"
"io"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
var nullACL security.ACL
diff --git a/security/util_test.go b/security/util_test.go
index c462991..445a54a 100644
--- a/security/util_test.go
+++ b/security/util_test.go
@@ -6,8 +6,8 @@
"reflect"
"testing"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
func TestLoadSaveIdentity(t *testing.T) {
diff --git a/services/config/lib/config.go b/services/config/lib/config.go
index 2e11c38..5712d36 100644
--- a/services/config/lib/config.go
+++ b/services/config/lib/config.go
@@ -17,8 +17,8 @@
"strings"
"sync"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
"code.google.com/p/mdns"
"code.google.com/p/mdns/go_dns"
diff --git a/services/identity/auditor/file.go b/services/identity/auditor/file.go
index f5639e4..5850370 100644
--- a/services/identity/auditor/file.go
+++ b/services/identity/auditor/file.go
@@ -8,10 +8,10 @@
"sync"
"time"
- "veyron/security/audit"
- "veyron2/security/wire"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
type fileAuditor struct {
diff --git a/services/identity/auditor/file_test.go b/services/identity/auditor/file_test.go
index 3b70537..8a98f86 100644
--- a/services/identity/auditor/file_test.go
+++ b/services/identity/auditor/file_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestFileAuditor(t *testing.T) {
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index fb35bb0..bc7e346 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -7,15 +7,15 @@
"strings"
"time"
- "veyron/services/identity"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/revocation"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vlog"
)
type googleOAuth struct {
diff --git a/services/identity/googleoauth/handler.go b/services/identity/googleoauth/handler.go
index 596f96a..0c878ad 100644
--- a/services/identity/googleoauth/handler.go
+++ b/services/identity/googleoauth/handler.go
@@ -22,11 +22,11 @@
"code.google.com/p/goauth2/oauth"
- "veyron/services/identity/auditor"
- "veyron/services/identity/revocation"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
type HandlerArgs struct {
diff --git a/services/identity/handlers/bless.go b/services/identity/handlers/bless.go
index 10fbd77..70d43b7 100644
--- a/services/identity/handlers/bless.go
+++ b/services/identity/handlers/bless.go
@@ -5,8 +5,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
)
// Bless is an http.HandlerFunc that renders/processes a form that takes as
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/handlers/handlers_test.go
index 4793c73..3f8d6ad 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -10,10 +10,10 @@
"testing"
"time"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestObject(t *testing.T) {
diff --git a/services/identity/handlers/object.go b/services/identity/handlers/object.go
index 32289a7..9fd1aa0 100644
--- a/services/identity/handlers/object.go
+++ b/services/identity/handlers/object.go
@@ -3,7 +3,7 @@
import (
"net/http"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
)
// Object implements an http.Handler that writes out the provided object in the
diff --git a/services/identity/handlers/random.go b/services/identity/handlers/random.go
index ec84788..5a19bfd 100644
--- a/services/identity/handlers/random.go
+++ b/services/identity/handlers/random.go
@@ -6,8 +6,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2"
)
// Random is an http.Handler implementation that mints a new Veyron PrivateID
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index 1733c27..5dd2891 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -21,7 +21,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
type OAuthBlesser interface {
// BlessUsingAuthorizationCode exchanges the provided authorization code
// for an access token and then uses that access token to obtain an
@@ -34,4 +34,4 @@
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing.
BlessUsingAccessToken(token string) (blessing any, err error)
-}
\ No newline at end of file
+}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 0b4694a..93ed657 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -6,12 +6,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -37,7 +37,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
// OAuthBlesser is the interface the client binds and uses.
// OAuthBlesser_ExcludingUniversal is the interface without internal framework-added methods
// to enable embedding without method collisions. Not to be used directly by clients.
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 84b752b..ea61737 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -12,23 +12,23 @@
"strings"
"time"
- "veyron/lib/signals"
- vsecurity "veyron/security"
- "veyron/security/audit"
- "veyron/services/identity/auditor"
- "veyron/services/identity/blesser"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/handlers"
- "veyron/services/identity/revocation"
- services "veyron/services/security"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/lib/signals"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/blesser"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/handlers"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/identity/revocation/bless.go b/services/identity/revocation/bless.go
index d2720e6..57dcb71 100644
--- a/services/identity/revocation/bless.go
+++ b/services/identity/revocation/bless.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- vsecurity "veyron/security"
- "veyron/security/audit"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
// Bless creates a blessing on behalf of the identity server.
diff --git a/services/identity/revocation/bless_test.go b/services/identity/revocation/bless_test.go
index 63dc2bc..6e20ad4 100644
--- a/services/identity/revocation/bless_test.go
+++ b/services/identity/revocation/bless_test.go
@@ -7,11 +7,11 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
type auditor struct {
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index c9cdada..c05bd5e 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -10,10 +10,10 @@
"sync"
"time"
- "veyron/security/caveat"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/caveat"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
diff --git a/services/identity/revocation/revoker_test.go b/services/identity/revocation/revoker_test.go
index 036bd37..6e440e4 100644
--- a/services/identity/revocation/revoker_test.go
+++ b/services/identity/revocation/revoker_test.go
@@ -4,13 +4,13 @@
"os"
"path/filepath"
"testing"
- services "veyron/services/security"
- "veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func revokerSetup(t *testing.T) (dischargerID security.PublicID, dischargerEndpoint string, revoker *RevocationManager, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/identity/util/b64vom.go b/services/identity/util/b64vom.go
index 6ed8b4a..1485cca 100644
--- a/services/identity/util/b64vom.go
+++ b/services/identity/util/b64vom.go
@@ -4,7 +4,7 @@
"bytes"
"encoding/base64"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/vom"
)
// Bas64VomEncode returns the base64 encoding of the serialization of i with
diff --git a/services/identity/util/csrf.go b/services/identity/util/csrf.go
index 516cf84..f71253d 100644
--- a/services/identity/util/csrf.go
+++ b/services/identity/util/csrf.go
@@ -10,7 +10,7 @@
"net/http"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
const cookieLen = 16
diff --git a/services/identity/util/write.go b/services/identity/util/write.go
index 07480d3..0572454 100644
--- a/services/identity/util/write.go
+++ b/services/identity/util/write.go
@@ -4,7 +4,7 @@
"html/template"
"net/http"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// HTTPSend encodes obj using VOM and writes it out to the response in base64
diff --git a/services/mgmt/application/applicationd/main.go b/services/mgmt/application/applicationd/main.go
index ed7c519..0928668 100644
--- a/services/mgmt/application/applicationd/main.go
+++ b/services/mgmt/application/applicationd/main.go
@@ -3,12 +3,12 @@
import (
"flag"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/application/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/application/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index dbf6b42..5a08493 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -1,11 +1,11 @@
package impl
import (
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the application repository dispatcher.
diff --git a/services/mgmt/application/impl/impl_test.go b/services/mgmt/application/impl/impl_test.go
index 9f1adcd..5a9f331 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -5,11 +5,11 @@
"reflect"
"testing"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// TestInterface tests that the implementation correctly implements
diff --git a/services/mgmt/application/impl/invoker.go b/services/mgmt/application/impl/invoker.go
index f3f1ec6..33296b0 100644
--- a/services/mgmt/application/impl/invoker.go
+++ b/services/mgmt/application/impl/invoker.go
@@ -4,11 +4,11 @@
"errors"
"strings"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/services/mgmt/application"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker holds the state of an application repository invocation.
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index cfa6001..c5e5f51 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -6,13 +6,13 @@
"os"
"path/filepath"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
- "veyron/services/mgmt/binary/impl"
+ "veyron.io/veyron/veyron/services/mgmt/binary/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index b0a0989..dc6ddcb 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -8,9 +8,9 @@
"path/filepath"
"strings"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
)
const (
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 553639c..5fc06cb 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -9,13 +9,13 @@
"path/filepath"
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/invoker.go b/services/mgmt/binary/impl/invoker.go
index 64a222c..d5821fd 100644
--- a/services/mgmt/binary/impl/invoker.go
+++ b/services/mgmt/binary/impl/invoker.go
@@ -31,11 +31,11 @@
"strconv"
"syscall"
- "veyron2/ipc"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// state holds the state shared across different binary repository
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index 26d8b14..f2e1937 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -4,14 +4,14 @@
"flag"
"os"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/build/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/build/impl"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index cb92f4d..76d7f07 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -8,11 +8,11 @@
"strings"
"testing"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
func init() {
diff --git a/services/mgmt/build/impl/invoker.go b/services/mgmt/build/impl/invoker.go
index f55cee5..051099c 100644
--- a/services/mgmt/build/impl/invoker.go
+++ b/services/mgmt/build/impl/invoker.go
@@ -9,11 +9,11 @@
"path/filepath"
"runtime"
- "veyron2/ipc"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/build"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/build/impl/util.go b/services/mgmt/build/impl/util.go
index 967a1b0..b94528d 100644
--- a/services/mgmt/build/impl/util.go
+++ b/services/mgmt/build/impl/util.go
@@ -3,7 +3,7 @@
import (
"runtime"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
func getArch() build.Architecture {
diff --git a/services/mgmt/debug/debug.vdl b/services/mgmt/debug/debug.vdl
index fe70a6d..c9b075a 100644
--- a/services/mgmt/debug/debug.vdl
+++ b/services/mgmt/debug/debug.vdl
@@ -1,8 +1,8 @@
package debug
import (
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
)
// This interface exists only for the purpose of generating a valid Signature
diff --git a/services/mgmt/debug/debug.vdl.go b/services/mgmt/debug/debug.vdl.go
index a2cb249..f0ed42c 100644
--- a/services/mgmt/debug/debug.vdl.go
+++ b/services/mgmt/debug/debug.vdl.go
@@ -4,17 +4,17 @@
package debug
import (
- "veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/debug/dispatcher.go b/services/mgmt/debug/dispatcher.go
index b7de39e..a0c86cc 100644
--- a/services/mgmt/debug/dispatcher.go
+++ b/services/mgmt/debug/dispatcher.go
@@ -4,15 +4,15 @@
"strings"
"time"
- "veyron/lib/glob"
- logreaderimpl "veyron/services/mgmt/logreader/impl"
- statsimpl "veyron/services/mgmt/stats/impl"
+ "veyron.io/veyron/veyron/lib/glob"
+ logreaderimpl "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
+ statsimpl "veyron.io/veyron/veyron/services/mgmt/stats/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/services/mounttable/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/verror"
)
// dispatcher holds the state of the debug dispatcher.
diff --git a/services/mgmt/debug/server.go b/services/mgmt/debug/server.go
index 2781358..7feb173 100644
--- a/services/mgmt/debug/server.go
+++ b/services/mgmt/debug/server.go
@@ -5,9 +5,9 @@
import (
"fmt"
- "veyron2"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
// StartDebugServer starts a debug server.
diff --git a/services/mgmt/debug/server_test.go b/services/mgmt/debug/server_test.go
index 207b3d9..de3ec35 100644
--- a/services/mgmt/debug/server_test.go
+++ b/services/mgmt/debug/server_test.go
@@ -10,15 +10,15 @@
"testing"
"time"
- libstats "veyron/lib/stats"
- "veyron/services/mgmt/debug"
+ libstats "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/services/mgmt/debug"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
- "veyron2/services/mounttable"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/verror"
)
func TestDebugServer(t *testing.T) {
diff --git a/services/mgmt/debug/signature.go b/services/mgmt/debug/signature.go
index 9f3b33b..68c5fd1 100644
--- a/services/mgmt/debug/signature.go
+++ b/services/mgmt/debug/signature.go
@@ -3,7 +3,7 @@
import (
"strings"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc"
)
type signatureInvoker struct {
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 0535c22..7c87c04 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -13,12 +13,12 @@
"os"
"time"
- "veyron2/context"
- "veyron2/rt"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index 11487cc..b68132d 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -7,12 +7,12 @@
"path/filepath"
"testing"
- "veyron/lib/testutil"
- "veyron/services/mgmt/binary/impl"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/services/mgmt/binary/impl"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/lib/exec/child.go b/services/mgmt/lib/exec/child.go
index 287e521..909c6e9 100644
--- a/services/mgmt/lib/exec/child.go
+++ b/services/mgmt/lib/exec/child.go
@@ -7,7 +7,7 @@
"os"
"sync"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
)
var (
diff --git a/services/mgmt/lib/exec/exec_test.go b/services/mgmt/lib/exec/exec_test.go
index 6f9082d..399f00a 100644
--- a/services/mgmt/lib/exec/exec_test.go
+++ b/services/mgmt/lib/exec/exec_test.go
@@ -10,10 +10,10 @@
"testing"
"time"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
// Use mock timekeeper to avoid actually sleeping during the test.
- "veyron/runtimes/google/testing/timekeeper"
- vexec "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/runtimes/google/testing/timekeeper"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
)
// We always expect there to be exactly three open file descriptors
diff --git a/services/mgmt/lib/exec/parent.go b/services/mgmt/lib/exec/parent.go
index 7822104..91a6147 100644
--- a/services/mgmt/lib/exec/parent.go
+++ b/services/mgmt/lib/exec/parent.go
@@ -9,11 +9,11 @@
"syscall"
"time"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
// TODO(cnicolaou): move timekeeper out of runtimes
- "veyron/runtimes/google/lib/timekeeper"
+ "veyron.io/veyron/veyron/runtimes/google/lib/timekeeper"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index 318529d..f477f1d 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -9,9 +9,9 @@
"strings"
"sync"
- "veyron/services/mgmt/profile"
- "veyron2/services/mgmt/application"
- "veyron2/verror"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/verror"
)
// TODO(rjkroege@google.com) Switch Memstore to the mid-August 2014
diff --git a/services/mgmt/lib/fs/simplestore_test.go b/services/mgmt/lib/fs/simplestore_test.go
index 9aee72d..b967ff8 100644
--- a/services/mgmt/lib/fs/simplestore_test.go
+++ b/services/mgmt/lib/fs/simplestore_test.go
@@ -7,10 +7,10 @@
"reflect"
"testing"
- _ "veyron/services/mgmt/profile"
- "veyron2/naming"
- "veyron2/services/mgmt/application"
- "veyron2/verror"
+ _ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/verror"
)
func TestNewMemstore(t *testing.T) {
diff --git a/services/mgmt/logreader/impl/common.go b/services/mgmt/logreader/impl/common.go
index d80d738..5dd31c7 100644
--- a/services/mgmt/logreader/impl/common.go
+++ b/services/mgmt/logreader/impl/common.go
@@ -8,8 +8,8 @@
"path/filepath"
"strings"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/verror"
)
var (
diff --git a/services/mgmt/logreader/impl/common_test.go b/services/mgmt/logreader/impl/common_test.go
index 991d833..00e2f73 100644
--- a/services/mgmt/logreader/impl/common_test.go
+++ b/services/mgmt/logreader/impl/common_test.go
@@ -2,8 +2,8 @@
import (
"testing"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
)
func startServer(t *testing.T, disp ipc.Dispatcher) (ipc.Server, string, error) {
diff --git a/services/mgmt/logreader/impl/logdir_invoker.go b/services/mgmt/logreader/impl/logdir_invoker.go
index 30d86f5..5beb139 100644
--- a/services/mgmt/logreader/impl/logdir_invoker.go
+++ b/services/mgmt/logreader/impl/logdir_invoker.go
@@ -5,11 +5,11 @@
"path"
"path/filepath"
- "veyron/lib/glob"
+ "veyron.io/veyron/veyron/lib/glob"
- "veyron2/ipc"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// logDirectoryInvoker holds the state of an invocation.
diff --git a/services/mgmt/logreader/impl/logdir_invoker_test.go b/services/mgmt/logreader/impl/logdir_invoker_test.go
index 1cdda4e..0af9a2b 100644
--- a/services/mgmt/logreader/impl/logdir_invoker_test.go
+++ b/services/mgmt/logreader/impl/logdir_invoker_test.go
@@ -8,14 +8,14 @@
"sort"
"testing"
- "veyron/services/mgmt/logreader/impl"
+ "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/verror"
)
type logDirectoryDispatcher struct {
diff --git a/services/mgmt/logreader/impl/logfile_invoker.go b/services/mgmt/logreader/impl/logfile_invoker.go
index 2763aef..00a1b3e 100644
--- a/services/mgmt/logreader/impl/logfile_invoker.go
+++ b/services/mgmt/logreader/impl/logfile_invoker.go
@@ -6,9 +6,9 @@
"os"
"path/filepath"
- "veyron2/ipc"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// logFileInvoker holds the state of a logfile invocation.
diff --git a/services/mgmt/logreader/impl/logfile_invoker_test.go b/services/mgmt/logreader/impl/logfile_invoker_test.go
index a2c3399..9bc0a0e 100644
--- a/services/mgmt/logreader/impl/logfile_invoker_test.go
+++ b/services/mgmt/logreader/impl/logfile_invoker_test.go
@@ -6,15 +6,15 @@
"path"
"testing"
- "veyron/services/mgmt/logreader/impl"
+ "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/verror"
)
type logFileDispatcher struct {
diff --git a/services/mgmt/logreader/impl/reader.go b/services/mgmt/logreader/impl/reader.go
index 29c8698..0a063b1 100644
--- a/services/mgmt/logreader/impl/reader.go
+++ b/services/mgmt/logreader/impl/reader.go
@@ -6,7 +6,7 @@
"strings"
"time"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc"
)
// followReader implements the functionality of io.Reader, plus:
diff --git a/services/mgmt/node/config.vdl.go b/services/mgmt/node/config.vdl.go
index 94110ec..32965b5 100644
--- a/services/mgmt/node/config.vdl.go
+++ b/services/mgmt/node/config.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/node/config/config.go b/services/mgmt/node/config/config.go
index dc1fb78..52eaae9 100644
--- a/services/mgmt/node/config/config.go
+++ b/services/mgmt/node/config/config.go
@@ -23,7 +23,7 @@
"path/filepath"
"strings"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// State specifies how the node manager is configured. This should encapsulate
diff --git a/services/mgmt/node/config/config_test.go b/services/mgmt/node/config/config_test.go
index b7c83d4..ccaa875 100644
--- a/services/mgmt/node/config/config_test.go
+++ b/services/mgmt/node/config/config_test.go
@@ -7,9 +7,9 @@
"strings"
"testing"
- "veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// TestState checks that encoding/decoding State to child/from parent works
diff --git a/services/mgmt/node/impl/app_invoker.go b/services/mgmt/node/impl/app_invoker.go
index 6d5d29b..5fce914 100644
--- a/services/mgmt/node/impl/app_invoker.go
+++ b/services/mgmt/node/impl/app_invoker.go
@@ -94,18 +94,18 @@
"strings"
"time"
- "veyron/lib/config"
- vexec "veyron/services/mgmt/lib/exec"
- iconfig "veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/lib/config"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ iconfig "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/appcycle"
- "veyron2/services/mgmt/application"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/appcycle"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/vlog"
)
// instanceInfo holds state about a running instance.
diff --git a/services/mgmt/node/impl/app_state.go b/services/mgmt/node/impl/app_state.go
index 744dcb5..df5049f 100644
--- a/services/mgmt/node/impl/app_state.go
+++ b/services/mgmt/node/impl/app_state.go
@@ -6,7 +6,7 @@
"os"
"path/filepath"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// installationState describes the states that an installation can be in at any
diff --git a/services/mgmt/node/impl/callback.go b/services/mgmt/node/impl/callback.go
index 6d190ae..92ddf6f 100644
--- a/services/mgmt/node/impl/callback.go
+++ b/services/mgmt/node/impl/callback.go
@@ -3,12 +3,12 @@
import (
"time"
- "veyron/services/mgmt/lib/exec"
- "veyron/services/mgmt/node"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/services/mgmt/node"
- "veyron2/mgmt"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
// InvokeCallback provides the parent node manager with the given name (which is
diff --git a/services/mgmt/node/impl/config_invoker.go b/services/mgmt/node/impl/config_invoker.go
index 5c4e4bf..7e191ac 100644
--- a/services/mgmt/node/impl/config_invoker.go
+++ b/services/mgmt/node/impl/config_invoker.go
@@ -10,9 +10,9 @@
"sync"
"time"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
type callbackState struct {
diff --git a/services/mgmt/node/impl/dispatcher.go b/services/mgmt/node/impl/dispatcher.go
index 82c6707..333161b 100644
--- a/services/mgmt/node/impl/dispatcher.go
+++ b/services/mgmt/node/impl/dispatcher.go
@@ -11,19 +11,19 @@
"strings"
"sync"
- vsecurity "veyron/security"
- vflag "veyron/security/flag"
- "veyron/security/serialization"
- inode "veyron/services/mgmt/node"
- "veyron/services/mgmt/node/config"
+ vsecurity "veyron.io/veyron/veyron/security"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/security/serialization"
+ inode "veyron.io/veyron/veyron/services/mgmt/node"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/node"
- "veyron2/services/security/access"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/services/security/access"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// internalState wraps state shared between different node manager
diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index 195d8f9..496c938 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -16,23 +16,23 @@
"testing"
"time"
- "veyron/lib/signals"
- "veyron/lib/testutil/blackbox"
- tsecurity "veyron/lib/testutil/security"
- vsecurity "veyron/security"
- "veyron/services/mgmt/lib/exec"
- "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/node/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ tsecurity "veyron.io/veyron/veyron/lib/testutil/security"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/node"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// TestHelperProcess is blackbox boilerplate.
diff --git a/services/mgmt/node/impl/mock_repo_test.go b/services/mgmt/node/impl/mock_repo_test.go
index 36db640..acda3a0 100644
--- a/services/mgmt/node/impl/mock_repo_test.go
+++ b/services/mgmt/node/impl/mock_repo_test.go
@@ -8,11 +8,11 @@
"io/ioutil"
"os"
- "veyron2/ipc"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/vlog"
)
// arInvoker holds the state of an application repository invocation mock. The
diff --git a/services/mgmt/node/impl/node_invoker.go b/services/mgmt/node/impl/node_invoker.go
index 81afc1c..60cf488 100644
--- a/services/mgmt/node/impl/node_invoker.go
+++ b/services/mgmt/node/impl/node_invoker.go
@@ -34,21 +34,21 @@
"sync"
"time"
- "veyron/lib/config"
- vexec "veyron/services/mgmt/lib/exec"
- iconfig "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/lib/config"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ iconfig "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/node"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/vlog"
)
type updatingState struct {
diff --git a/services/mgmt/node/impl/profile.go b/services/mgmt/node/impl/profile.go
index d522784..507908d 100644
--- a/services/mgmt/node/impl/profile.go
+++ b/services/mgmt/node/impl/profile.go
@@ -7,10 +7,10 @@
"runtime"
"strings"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/services/mgmt/build"
- "veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
)
// computeNodeProfile generates a description of the runtime
diff --git a/services/mgmt/node/impl/util.go b/services/mgmt/node/impl/util.go
index 44a2c8e..c7962d7 100644
--- a/services/mgmt/node/impl/util.go
+++ b/services/mgmt/node/impl/util.go
@@ -6,12 +6,12 @@
"path/filepath"
"time"
- "veyron/services/mgmt/lib/binary"
+ "veyron.io/veyron/veyron/services/mgmt/lib/binary"
- "veyron2/context"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/repository"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/vlog"
)
func downloadBinary(workspace, fileName, name string) error {
diff --git a/services/mgmt/node/impl/util_test.go b/services/mgmt/node/impl/util_test.go
index ecb6f79..ed138f3 100644
--- a/services/mgmt/node/impl/util_test.go
+++ b/services/mgmt/node/impl/util_test.go
@@ -5,19 +5,19 @@
"os"
"testing"
- mtlib "veyron/services/mounttable/lib"
+ mtlib "veyron.io/veyron/veyron/services/mounttable/lib"
- "veyron/lib/testutil/blackbox"
- "veyron/lib/testutil/security"
- "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/node"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// TODO(caprita): I've had to write one too many of these, let's move it to some
diff --git a/services/mgmt/node/noded/main.go b/services/mgmt/node/noded/main.go
index 4e2175e..6e33c20 100644
--- a/services/mgmt/node/noded/main.go
+++ b/services/mgmt/node/noded/main.go
@@ -3,13 +3,13 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/node/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/impl"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/profile/impl/dispatcher.go b/services/mgmt/profile/impl/dispatcher.go
index c593614..9169da1 100644
--- a/services/mgmt/profile/impl/dispatcher.go
+++ b/services/mgmt/profile/impl/dispatcher.go
@@ -1,11 +1,11 @@
package impl
import (
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the profile repository dispatcher.
diff --git a/services/mgmt/profile/impl/impl_test.go b/services/mgmt/profile/impl/impl_test.go
index 0343d7a..469dffc 100644
--- a/services/mgmt/profile/impl/impl_test.go
+++ b/services/mgmt/profile/impl/impl_test.go
@@ -5,12 +5,12 @@
"reflect"
"testing"
- "veyron/services/mgmt/profile"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
var (
diff --git a/services/mgmt/profile/impl/invoker.go b/services/mgmt/profile/impl/invoker.go
index 2beeb43..2b49703 100644
--- a/services/mgmt/profile/impl/invoker.go
+++ b/services/mgmt/profile/impl/invoker.go
@@ -3,12 +3,12 @@
import (
"errors"
- "veyron/services/mgmt/lib/fs"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker holds the profile repository invocation.
diff --git a/services/mgmt/profile/profile.vdl b/services/mgmt/profile/profile.vdl
index 0f6338b..0675af1 100644
--- a/services/mgmt/profile/profile.vdl
+++ b/services/mgmt/profile/profile.vdl
@@ -2,7 +2,7 @@
// types used by the implementation of Veyron profiles.
package profile
-import "veyron2/services/mgmt/build"
+import "veyron.io/veyron/veyron2/services/mgmt/build"
// Library describes a shared library that applications may use.
type Library struct {
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index 8ece520..97c0689 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -6,7 +6,7 @@
package profile
import (
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
// Library describes a shared library that applications may use.
diff --git a/services/mgmt/profile/profiled/main.go b/services/mgmt/profile/profiled/main.go
index 7b36c36..9278d56 100644
--- a/services/mgmt/profile/profiled/main.go
+++ b/services/mgmt/profile/profiled/main.go
@@ -3,12 +3,12 @@
import (
"flag"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/profile/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/profile/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index bbdb35d..3b553b8 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -3,10 +3,10 @@
package repository
import (
- "veyron/services/mgmt/profile"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- public "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ public "veyron.io/veyron/veyron2/services/mgmt/repository"
)
// Application describes an application repository internally. Besides
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index d2c2d25..2ec59c2 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -6,21 +6,21 @@
package repository
import (
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
- "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -251,7 +251,7 @@
_gen_wiretype.FieldType{Type: 0x3, Name: "Binary"},
_gen_wiretype.FieldType{Type: 0x3d, Name: "Env"},
},
- "veyron2/services/mgmt/application.Envelope", []string(nil)},
+ "veyron.io/veyron/veyron2/services/mgmt/application.Envelope", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss _gen_ipc.ServiceSignature
var firstAdded int
@@ -555,14 +555,14 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.Format", Tags: []string(nil)}, _gen_wiretype.StructType{
+ _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.Format", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x3, Name: "Name"},
_gen_wiretype.FieldType{Type: 0x3, Name: "MajorVersion"},
_gen_wiretype.FieldType{Type: 0x3, Name: "MinorVersion"},
},
- "veyron/services/mgmt/profile.Library", []string(nil)},
- _gen_wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, _gen_wiretype.StructType{
+ "veyron.io/veyron/veyron/services/mgmt/profile.Library", []string(nil)},
+ _gen_wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x41, Name: "Arch"},
_gen_wiretype.FieldType{Type: 0x3, Name: "Description"},
@@ -571,7 +571,7 @@
_gen_wiretype.FieldType{Type: 0x3, Name: "Label"},
_gen_wiretype.FieldType{Type: 0x45, Name: "OS"},
},
- "veyron/services/mgmt/profile.Specification", []string(nil)},
+ "veyron.io/veyron/veyron/services/mgmt/profile.Specification", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss _gen_ipc.ServiceSignature
var firstAdded int
diff --git a/services/mgmt/root/impl/dispatcher.go b/services/mgmt/root/impl/dispatcher.go
index 4a56fb1..67e002a 100644
--- a/services/mgmt/root/impl/dispatcher.go
+++ b/services/mgmt/root/impl/dispatcher.go
@@ -1,9 +1,9 @@
package impl
import (
- "veyron/services/mgmt/root"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/root"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the root process.
diff --git a/services/mgmt/root/impl/root.go b/services/mgmt/root/impl/root.go
index 7c6cb62..4905a2a 100644
--- a/services/mgmt/root/impl/root.go
+++ b/services/mgmt/root/impl/root.go
@@ -6,8 +6,8 @@
"runtime"
"time"
- "veyron2/ipc"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker is the object that implements the Root interface
diff --git a/services/mgmt/root/root.vdl.go b/services/mgmt/root/root.vdl.go
index e041a07..09c1f3a 100644
--- a/services/mgmt/root/root.vdl.go
+++ b/services/mgmt/root/root.vdl.go
@@ -7,12 +7,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/root/rootd/main.go b/services/mgmt/root/rootd/main.go
index b0adae2..0e20aaa 100644
--- a/services/mgmt/root/rootd/main.go
+++ b/services/mgmt/root/rootd/main.go
@@ -3,11 +3,11 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/mgmt/root/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/mgmt/root/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/stats/impl/stats_invoker.go b/services/mgmt/stats/impl/stats_invoker.go
index f1f9dac..4804db3 100644
--- a/services/mgmt/stats/impl/stats_invoker.go
+++ b/services/mgmt/stats/impl/stats_invoker.go
@@ -5,15 +5,15 @@
import (
"time"
- "veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats"
- "veyron2/ipc"
- "veyron2/services/mgmt/stats/types"
- mttypes "veyron2/services/mounttable/types"
- watchtypes "veyron2/services/watch/types"
- "veyron2/vdl/vdlutil"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/stats/types"
+ mttypes "veyron.io/veyron/veyron2/services/mounttable/types"
+ watchtypes "veyron.io/veyron/veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
type statsInvoker struct {
diff --git a/services/mgmt/stats/impl/stats_invoker_test.go b/services/mgmt/stats/impl/stats_invoker_test.go
index 46e751e..f408fbc 100644
--- a/services/mgmt/stats/impl/stats_invoker_test.go
+++ b/services/mgmt/stats/impl/stats_invoker_test.go
@@ -6,17 +6,17 @@
"testing"
"time"
- libstats "veyron/lib/stats"
- "veyron/lib/stats/histogram"
- istats "veyron/services/mgmt/stats"
- "veyron/services/mgmt/stats/impl"
+ libstats "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats/histogram"
+ istats "veyron.io/veyron/veyron/services/mgmt/stats"
+ "veyron.io/veyron/veyron/services/mgmt/stats/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/stats"
- "veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/watch/types"
)
type statsDispatcher struct {
diff --git a/services/mounttable/lib/collection_test.vdl.go b/services/mounttable/lib/collection_test.vdl.go
index e051c53..77b9710 100644
--- a/services/mounttable/lib/collection_test.vdl.go
+++ b/services/mounttable/lib/collection_test.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mounttable/lib/collectionserver_test.go b/services/mounttable/lib/collectionserver_test.go
index e6cce88..55fa7e6 100644
--- a/services/mounttable/lib/collectionserver_test.go
+++ b/services/mounttable/lib/collectionserver_test.go
@@ -3,9 +3,9 @@
import (
"sync"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
// collectionServer is a very simple collection server implementation for testing, with sufficient debugging to help
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index f87605f..922f4c7 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -9,17 +9,17 @@
"sync"
"time"
- "veyron/lib/glob"
- vsecurity "veyron/security"
+ "veyron.io/veyron/veyron/lib/glob"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index dc9894c..32bba94 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -9,17 +9,17 @@
"testing"
"time"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// stupidNS is a version of naming.Namespace that we can control. This exists so that we have some
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 1fc8089..ad66bfb 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -6,16 +6,16 @@
"strconv"
"strings"
- "veyron/lib/glob"
- "veyron/lib/netconfig"
+ "veyron.io/veyron/veyron/lib/glob"
+ "veyron.io/veyron/veyron/lib/netconfig"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
"code.google.com/p/mdns"
)
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 725b41c..4b2b610 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -7,13 +7,13 @@
"testing"
"time"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mounttable"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/vlog"
)
func protocolAndAddress(e naming.Endpoint) (string, string, error) {
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/lib/serverlist.go
index 2ba49f2..cde1ea6 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/lib/serverlist.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
)
type serverListClock interface {
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 98df218..bb450a8 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -7,14 +7,14 @@
"net"
"os"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
- "veyron/lib/signals"
+ "veyron.io/veyron/veyron/lib/signals"
- "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/services/mounttable/lib"
)
var (
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index 2a669a0..ce9859b 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -8,11 +8,11 @@
_ "net/http/pprof"
"time"
- "veyron/runtimes/google/ipc/stream/proxy"
- "veyron/runtimes/google/lib/publisher"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ "veyron.io/veyron/veyron/runtimes/google/lib/publisher"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/security/discharger.vdl b/services/security/discharger.vdl
index 07139fd..037c6b4 100644
--- a/services/security/discharger.vdl
+++ b/services/security/discharger.vdl
@@ -1,6 +1,6 @@
package security
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.
type Discharger interface {
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index a63aaf1..67dddaf 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -4,15 +4,15 @@
package security
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -177,13 +177,13 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/security.BlessingPattern", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.StructType{
+ _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/security.BlessingPattern", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x43, Name: "Server"},
_gen_wiretype.FieldType{Type: 0x3, Name: "Method"},
_gen_wiretype.FieldType{Type: 0x44, Name: "Arguments"},
},
- "veyron2/security.DischargeImpetus", []string(nil)},
+ "veyron.io/veyron/veyron2/security.DischargeImpetus", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
diff --git a/services/security/discharger/discharger.go b/services/security/discharger/discharger.go
index d9a0c5b..5e701d1 100644
--- a/services/security/discharger/discharger.go
+++ b/services/security/discharger/discharger.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- services "veyron/services/security"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
)
// dischargerd issues discharges for all caveats present in the current
diff --git a/services/security/discharger/revoker.go b/services/security/discharger/revoker.go
index 0f49f44..e7c23a1 100644
--- a/services/security/discharger/revoker.go
+++ b/services/security/discharger/revoker.go
@@ -9,11 +9,11 @@
"os"
"path/filepath"
"sync"
- "veyron/security/caveat"
- ssecurity "veyron/services/security"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/caveat"
+ ssecurity "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// The revocation caveats will be stored in a directory with a file for each.
diff --git a/services/security/discharger/revoker_test.go b/services/security/discharger/revoker_test.go
index 44b46de..fc247e2 100644
--- a/services/security/discharger/revoker_test.go
+++ b/services/security/discharger/revoker_test.go
@@ -4,12 +4,12 @@
"os"
"path/filepath"
"testing"
- services "veyron/services/security"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func revokerSetup(t *testing.T) (dischargerID security.PublicID, dischargerEndpoint, revokerEndpoint string, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/security/revoker.vdl b/services/security/revoker.vdl
index da13597..00f86dd 100644
--- a/services/security/revoker.vdl
+++ b/services/security/revoker.vdl
@@ -1,6 +1,6 @@
package security
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
// RevocationToken can be presented to a revocation service to revoke a caveat
type RevocationToken [16]byte
diff --git a/services/security/revoker.vdl.go b/services/security/revoker.vdl.go
index 2e94949..69164c4 100644
--- a/services/security/revoker.vdl.go
+++ b/services/security/revoker.vdl.go
@@ -4,15 +4,15 @@
package security
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// RevocationToken can be presented to a revocation service to revoke a caveat
@@ -180,7 +180,7 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.ArrayType{Elem: 0x41, Len: 0x10, Name: "veyron/services/security.RevocationToken", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
+ _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.ArrayType{Elem: 0x41, Len: 0x10, Name: "veyron.io/veyron/veyron/services/security.RevocationToken", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
}
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index f13f608..5b871fc 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -11,22 +11,22 @@
"sync"
"time"
- "veyron/services/wsprd/identity"
- "veyron/services/wsprd/ipc/client"
- "veyron/services/wsprd/ipc/server"
- "veyron/services/wsprd/ipc/stream"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
- vom_wiretype "veyron2/vom/wiretype"
- wiretype_build "veyron2/wiretype/build"
+ "veyron.io/veyron/veyron/services/wsprd/identity"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/client"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/server"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/stream"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
+ vom_wiretype "veyron.io/veyron/veyron2/vom/wiretype"
+ wiretype_build "veyron.io/veyron/veyron2/wiretype/build"
)
// TODO(bjornick,nlacasse): Remove the retryTimeout flag once we able
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index abc8ad1..043c150 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -9,23 +9,23 @@
"sync"
"testing"
"time"
- "veyron/services/wsprd/ipc/client"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
- vom_wiretype "veyron2/vom/wiretype"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/client"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
+ vom_wiretype "veyron.io/veyron/veyron2/vom/wiretype"
+ "veyron.io/veyron/veyron2/wiretype"
- "veyron/runtimes/google/ipc/stream/proxy"
- mounttable "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
)
var (
@@ -699,8 +699,8 @@
expectedValue: C(security.MethodCaveat("Get", "MultiGet")),
},
{
- json: `{"_type":"PeerBlessingsCaveat","service":"...","data":["veyron/batman","veyron/brucewayne"]}`,
- expectedValue: C(security.PeerBlessingsCaveat("veyron/batman", "veyron/brucewayne")),
+ json: `{"_type":"PeerBlessingsCaveat","service":"...","data":["veyron.io/veyron/veyron/batman","veyron.io/veyron/veyron/brucewayne"]}`,
+ expectedValue: C(security.PeerBlessingsCaveat("veyron.io/veyron/veyron/batman", "veyron.io/veyron/veyron/brucewayne")),
},
}
diff --git a/services/wsprd/identity/identity.go b/services/wsprd/identity/identity.go
index d78cfe9..288fa9d 100644
--- a/services/wsprd/identity/identity.go
+++ b/services/wsprd/identity/identity.go
@@ -18,12 +18,12 @@
"sync"
"time"
- "veyron/security/serialization"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vom"
)
// permissions is a set of a permissions given to an app, containing the account
diff --git a/services/wsprd/identity/identity_test.go b/services/wsprd/identity/identity_test.go
index f1205a7..447faed 100644
--- a/services/wsprd/identity/identity_test.go
+++ b/services/wsprd/identity/identity_test.go
@@ -8,9 +8,9 @@
"testing"
"time"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func createChain(r veyron2.Runtime, name string) security.PrivateID {
diff --git a/services/wsprd/identity/js_identity_store.go b/services/wsprd/identity/js_identity_store.go
index 358228b..520b0ef 100644
--- a/services/wsprd/identity/js_identity_store.go
+++ b/services/wsprd/identity/js_identity_store.go
@@ -1,6 +1,6 @@
package identity
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
import "sync"
// JSPublicIDHandles is a store for PublicIDs in use by JS code.
diff --git a/services/wsprd/ipc/client/stream.go b/services/wsprd/ipc/client/stream.go
index 4237f8f..0db5bda 100644
--- a/services/wsprd/ipc/client/stream.go
+++ b/services/wsprd/ipc/client/stream.go
@@ -3,8 +3,8 @@
package client
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
)
// A message that will be passed to the writeLoop function that will
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index ea58748..c03c941 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the invoker and the authorizer to be used for lookup.
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index aabafe8..4fa0eb8 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -1,9 +1,9 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
)
var typedNil []int
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 5ee1d99..35b6e85 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -8,16 +8,16 @@
"fmt"
"sync"
- vsecurity "veyron/security"
- "veyron/services/wsprd/ipc/stream"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/stream"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
type Flow struct {
diff --git a/services/wsprd/ipc/server/signature_invoker.go b/services/wsprd/ipc/server/signature_invoker.go
index 6384510..55c9962 100644
--- a/services/wsprd/ipc/server/signature_invoker.go
+++ b/services/wsprd/ipc/server/signature_invoker.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// signatureInvoker acts as the signature() method and is used to handle calls
diff --git a/services/wsprd/ipc/server/stream.go b/services/wsprd/ipc/server/stream.go
index 03b39e2..3ac5fc8 100644
--- a/services/wsprd/ipc/server/stream.go
+++ b/services/wsprd/ipc/server/stream.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
)
// A simple struct that wraps a stream with the sender api. It
diff --git a/services/wsprd/ipc/stream/stream.go b/services/wsprd/ipc/stream/stream.go
index 5f90e90..ad9e371 100644
--- a/services/wsprd/ipc/stream/stream.go
+++ b/services/wsprd/ipc/stream/stream.go
@@ -3,7 +3,7 @@
package stream
import (
- "veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
)
// An interface for an asynchronous sender.
diff --git a/services/wsprd/lib/remove_this.go b/services/wsprd/lib/remove_this.go
index 8d9183e..427476d 100644
--- a/services/wsprd/lib/remove_this.go
+++ b/services/wsprd/lib/remove_this.go
@@ -5,9 +5,9 @@
"veyron.io/store/veyron2/services/store"
roadmap_watchtypes "veyron.io/store/veyron2/services/watch/types"
"veyron.io/store/veyron2/storage"
- mttypes "veyron2/services/mounttable/types"
- watchtypes "veyron2/services/watch/types"
- "veyron2/vom"
+ mttypes "veyron.io/veyron/veyron2/services/mounttable/types"
+ watchtypes "veyron.io/veyron/veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/vom"
)
func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index b31d4df..1d38641 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -4,8 +4,8 @@
"sync"
"time"
- "veyron2/context"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
)
type SignatureManager interface {
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index f0caf01..81460de 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- mocks_ipc "veyron/runtimes/google/testing/mocks/ipc"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ mocks_ipc "veyron.io/veyron/veyron/runtimes/google/testing/mocks/ipc"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
const (
@@ -24,7 +24,7 @@
Methods: make(map[string]ipc.MethodSignature),
TypeDefs: []vdlutil.Any{
wiretype.NamedPrimitiveType{
- Name: "veyron2/vdlutil.AnyData",
+ Name: "veyron.io/veyron/veyron2/vdlutil.AnyData",
Type: wiretype.TypeIDInterface,
},
},
diff --git a/services/wsprd/signature/signature.go b/services/wsprd/signature/signature.go
index 0185658..4acbf74 100644
--- a/services/wsprd/signature/signature.go
+++ b/services/wsprd/signature/signature.go
@@ -1,15 +1,15 @@
package signature
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
var (
anydataType = wiretype.NamedPrimitiveType{
- Name: "veyron2/vdlutil.AnyData",
+ Name: "veyron.io/veyron/veyron2/vdlutil.AnyData",
Type: wiretype.TypeIDInterface,
}
errType = wiretype.NamedPrimitiveType{
diff --git a/services/wsprd/signature/signature_test.go b/services/wsprd/signature/signature_test.go
index 250acf5..dd9e85a 100644
--- a/services/wsprd/signature/signature_test.go
+++ b/services/wsprd/signature/signature_test.go
@@ -4,9 +4,9 @@
"reflect"
"testing"
- "veyron2/ipc"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
func TestNewJSONServiceSignature(t *testing.T) {
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index 76efed0..7bab7ce 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -3,9 +3,9 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/wsprd/wspr"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/wsprd/wspr"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index 120d675..da1dc4e 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -11,12 +11,12 @@
"strings"
"time"
- "veyron/services/wsprd/app"
- "veyron/services/wsprd/lib"
- "veyron2"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/services/wsprd/app"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index c7ca1b8..f336c9d 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -6,11 +6,11 @@
"path/filepath"
"runtime"
- "veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/wspr.go b/services/wsprd/wspr/wspr.go
index a93477a..727807d 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -26,12 +26,12 @@
"sync"
"time"
- veyron_identity "veyron/services/identity"
- "veyron/services/wsprd/identity"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vlog"
+ veyron_identity "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/wsprd/identity"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/wsprd/wspr/wspr_test.go b/services/wsprd/wspr/wspr_test.go
index e84b1f6..83ab796 100644
--- a/services/wsprd/wspr/wspr_test.go
+++ b/services/wsprd/wspr/wspr_test.go
@@ -9,10 +9,10 @@
"testing"
"time"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
)
// BEGIN MOCK BLESSER SERVICE
diff --git a/tools/application/impl/impl.go b/tools/application/impl/impl.go
index 4a804f6..fccb840 100644
--- a/tools/application/impl/impl.go
+++ b/tools/application/impl/impl.go
@@ -11,12 +11,12 @@
"strings"
"time"
- "veyron/lib/cmdline"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/context"
- "veyron2/rt"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
func getEnvelopeJSON(ctx context.T, app repository.Application, profiles string) ([]byte, error) {
diff --git a/tools/application/impl/impl_test.go b/tools/application/impl/impl_test.go
index b19e926..0dd191b 100644
--- a/tools/application/impl/impl_test.go
+++ b/tools/application/impl/impl_test.go
@@ -7,16 +7,16 @@
"strings"
"testing"
- "veyron/services/mgmt/repository"
- "veyron/tools/application/impl"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/tools/application/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/tools/application/main.go b/tools/application/main.go
index a510dcc..a9ec584 100644
--- a/tools/application/main.go
+++ b/tools/application/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/application/impl"
+ "veyron.io/veyron/veyron/tools/application/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/binary/impl/impl.go b/tools/binary/impl/impl.go
index 29b26b1..f690e54 100644
--- a/tools/binary/impl/impl.go
+++ b/tools/binary/impl/impl.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "veyron/lib/cmdline"
- "veyron/services/mgmt/lib/binary"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/services/mgmt/lib/binary"
)
var cmdDelete = &cmdline.Command{
diff --git a/tools/binary/impl/impl_test.go b/tools/binary/impl/impl_test.go
index fdad6d2..78b7b5e 100644
--- a/tools/binary/impl/impl_test.go
+++ b/tools/binary/impl/impl_test.go
@@ -11,16 +11,16 @@
"strings"
"testing"
- "veyron/tools/binary/impl"
+ "veyron.io/veyron/veyron/tools/binary/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/vlog"
)
type server struct {
diff --git a/tools/binary/main.go b/tools/binary/main.go
index e03d21c..b512f32 100644
--- a/tools/binary/main.go
+++ b/tools/binary/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/binary/impl"
+ "veyron.io/veyron/veyron/tools/binary/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/build/impl/impl.go b/tools/build/impl/impl.go
index eb76237..e9e0714 100644
--- a/tools/build/impl/impl.go
+++ b/tools/build/impl/impl.go
@@ -10,11 +10,11 @@
"strings"
"time"
- "veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/lib/cmdline"
- "veyron2/context"
- "veyron2/rt"
- vbuild "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ vbuild "veyron.io/veyron/veyron2/services/mgmt/build"
)
var (
diff --git a/tools/build/impl/impl_test.go b/tools/build/impl/impl_test.go
index 77dfabf..0cdd5f3 100644
--- a/tools/build/impl/impl_test.go
+++ b/tools/build/impl/impl_test.go
@@ -5,15 +5,15 @@
"strings"
"testing"
- "veyron/tools/build/impl"
+ "veyron.io/veyron/veyron/tools/build/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/build"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var errInternalError = verror.Internalf("internal error")
@@ -72,7 +72,7 @@
cmd.Init(nil, &stdout, &stderr)
// Test the 'Build' command.
- if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "veyron/tools/build"}); err != nil {
+ if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "veyron.io/veyron/veyron/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 4e872f5..5da2faf 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/build/impl"
+ "veyron.io/veyron/veyron/tools/build/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/findunusedport/main.go b/tools/findunusedport/main.go
index 9d11884..7d4bda2 100644
--- a/tools/findunusedport/main.go
+++ b/tools/findunusedport/main.go
@@ -8,7 +8,7 @@
"os"
"syscall"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
func main() {
diff --git a/tools/identity/googleoauth.go b/tools/identity/googleoauth.go
index d556e10..df07829 100644
--- a/tools/identity/googleoauth.go
+++ b/tools/identity/googleoauth.go
@@ -10,8 +10,8 @@
"os"
"os/exec"
- "veyron/services/identity/googleoauth"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron2/vlog"
)
func getOAuthAuthorizationCodeFromGoogle(clientID string, blessing <-chan string) (<-chan string, error) {
diff --git a/tools/identity/main.go b/tools/identity/main.go
index 13310f5..ca26c74 100644
--- a/tools/identity/main.go
+++ b/tools/identity/main.go
@@ -8,15 +8,15 @@
"os/user"
"time"
- "veyron/lib/cmdline"
- "veyron/services/identity"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/identity/util"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
@@ -92,7 +92,7 @@
}
id, err := r.NewIdentity(name)
if err != nil {
- return fmt.Errorf("veyron2.Runtime.NewIdentity(%q) failed: %v", name, err)
+ return fmt.Errorf("NewIdentity(%q) failed: %v", name, err)
}
output, err := util.Base64VomEncode(id)
if err != nil {
diff --git a/tools/mounttable/impl/impl.go b/tools/mounttable/impl/impl.go
index 1a75ef6..9d9a96d 100644
--- a/tools/mounttable/impl/impl.go
+++ b/tools/mounttable/impl/impl.go
@@ -4,11 +4,11 @@
"fmt"
"time"
- "veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/lib/cmdline"
- "veyron2/context"
- "veyron2/rt"
- "veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mounttable"
)
func bindMT(ctx context.T, name string) (mounttable.MountTable, error) {
diff --git a/tools/mounttable/impl/impl_test.go b/tools/mounttable/impl/impl_test.go
index 2f2ec09..5ce9b0f 100644
--- a/tools/mounttable/impl/impl_test.go
+++ b/tools/mounttable/impl/impl_test.go
@@ -5,16 +5,16 @@
"strings"
"testing"
- "veyron/tools/mounttable/impl"
+ "veyron.io/veyron/veyron/tools/mounttable/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
type server struct {
diff --git a/tools/mounttable/main.go b/tools/mounttable/main.go
index 61a93d6..7f2c385 100644
--- a/tools/mounttable/main.go
+++ b/tools/mounttable/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/mounttable/impl"
+ "veyron.io/veyron/veyron/tools/mounttable/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/namespace/impl/impl.go b/tools/namespace/impl/impl.go
index 7fe764b..2c87e49 100644
--- a/tools/namespace/impl/impl.go
+++ b/tools/namespace/impl/impl.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- "veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/lib/cmdline"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var cmdGlob = &cmdline.Command{
diff --git a/tools/namespace/main.go b/tools/namespace/main.go
index 64f046e..9fcf1cf 100644
--- a/tools/namespace/main.go
+++ b/tools/namespace/main.go
@@ -2,8 +2,8 @@
package main
import (
- "veyron/tools/namespace/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/tools/namespace/impl"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/naming/simulator/commands.go b/tools/naming/simulator/commands.go
index 937990c..712e2e6 100644
--- a/tools/naming/simulator/commands.go
+++ b/tools/naming/simulator/commands.go
@@ -4,9 +4,9 @@
"fmt"
"time"
- "veyron/lib/testutil/modules"
+ "veyron.io/veyron/veyron/lib/testutil/modules"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
type tag int
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index 4206289..207c626 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -14,9 +14,9 @@
"strings"
"unicode"
- "veyron/lib/testutil/modules"
+ "veyron.io/veyron/veyron/lib/testutil/modules"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
type commandFunc func() modules.T
diff --git a/tools/playground/builder/vbuild.go b/tools/playground/builder/vbuild.go
index 2ef28c4..d0f64b4 100644
--- a/tools/playground/builder/vbuild.go
+++ b/tools/playground/builder/vbuild.go
@@ -23,7 +23,7 @@
"syscall"
"time"
- "veyron/tools/playground/event"
+ "veyron.io/veyron/veyron/tools/playground/event"
)
const runTimeout = 3 * time.Second
diff --git a/tools/playground/compilerd/main.go b/tools/playground/compilerd/main.go
index 983cc33..672169f 100644
--- a/tools/playground/compilerd/main.go
+++ b/tools/playground/compilerd/main.go
@@ -17,7 +17,7 @@
"github.com/golang/groupcache/lru"
- "veyron/tools/playground/event"
+ "veyron.io/veyron/veyron/tools/playground/event"
)
type ResponseBody struct {
diff --git a/tools/playground/testdata/ping/ping.go b/tools/playground/testdata/ping/ping.go
index 2372abe..0ac3a4f 100644
--- a/tools/playground/testdata/ping/ping.go
+++ b/tools/playground/testdata/ping/ping.go
@@ -4,7 +4,7 @@
import (
"fmt"
"pingpong"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/playground/testdata/pingpong/wire.vdl b/tools/playground/testdata/pingpong/wire.vdl
index 011afde..539231e 100644
--- a/tools/playground/testdata/pingpong/wire.vdl
+++ b/tools/playground/testdata/pingpong/wire.vdl
@@ -1,6 +1,6 @@
package pingpong
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
type PingPong interface {
Ping(message string) (string, error) {security.ReadLabel}
diff --git a/tools/playground/testdata/pingpong/wire.vdl.go b/tools/playground/testdata/pingpong/wire.vdl.go
index d6a9e33..e1aa5db 100644
--- a/tools/playground/testdata/pingpong/wire.vdl.go
+++ b/tools/playground/testdata/pingpong/wire.vdl.go
@@ -4,15 +4,15 @@
package pingpong
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/tools/playground/testdata/pong/pong.go b/tools/playground/testdata/pong/pong.go
index d6c5a42..8bd86b7 100644
--- a/tools/playground/testdata/pong/pong.go
+++ b/tools/playground/testdata/pong/pong.go
@@ -4,10 +4,10 @@
import (
"fmt"
"pingpong"
- "veyron/lib/signals"
- sflag "veyron/security/flag"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/lib/signals"
+ sflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
)
type pongd struct{}
diff --git a/tools/profile/impl/impl.go b/tools/profile/impl/impl.go
index 41d19eb..1a69555 100644
--- a/tools/profile/impl/impl.go
+++ b/tools/profile/impl/impl.go
@@ -4,12 +4,12 @@
"fmt"
"time"
- "veyron/lib/cmdline"
- "veyron/services/mgmt/profile"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
var cmdLabel = &cmdline.Command{
diff --git a/tools/profile/impl/impl_test.go b/tools/profile/impl/impl_test.go
index caf9248..c2c2506 100644
--- a/tools/profile/impl/impl_test.go
+++ b/tools/profile/impl/impl_test.go
@@ -6,17 +6,17 @@
"strings"
"testing"
- "veyron/services/mgmt/profile"
- "veyron/services/mgmt/repository"
- "veyron/tools/profile/impl"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/tools/profile/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/build"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/tools/profile/main.go b/tools/profile/main.go
index da5821b..bd2531a 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/profile/impl"
+ "veyron.io/veyron/veyron/tools/profile/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/vrpc/impl/impl.go b/tools/vrpc/impl/impl.go
index ffd6dd9..3851bac 100644
--- a/tools/vrpc/impl/impl.go
+++ b/tools/vrpc/impl/impl.go
@@ -6,20 +6,20 @@
"io"
"time"
- "veyron/lib/cmdline"
- idl_test_base "veyron/tools/vrpc/test_base"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ idl_test_base "veyron.io/veyron/veyron/tools/vrpc/test_base"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/vdl/vdlutil"
- "veyron2/vom"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vom"
+ "veyron.io/veyron/veyron2/wiretype"
- idl_binary "veyron2/services/mgmt/binary"
- idl_node "veyron2/services/mgmt/node"
- idl_mounttable_types "veyron2/services/mounttable/types"
+ idl_binary "veyron.io/veyron/veyron2/services/mgmt/binary"
+ idl_node "veyron.io/veyron/veyron2/services/mgmt/node"
+ idl_mounttable_types "veyron.io/veyron/veyron2/services/mounttable/types"
)
const serverDesc = `
diff --git a/tools/vrpc/impl/impl_test.go b/tools/vrpc/impl/impl_test.go
index 091e606..0dd2811 100644
--- a/tools/vrpc/impl/impl_test.go
+++ b/tools/vrpc/impl/impl_test.go
@@ -6,15 +6,15 @@
"strings"
"testing"
- "veyron/lib/cmdline"
- "veyron/tools/vrpc/impl"
- "veyron/tools/vrpc/test_base"
+ "veyron.io/veyron/veyron/lib/cmdline"
+ "veyron.io/veyron/veyron/tools/vrpc/impl"
+ "veyron.io/veyron/veyron/tools/vrpc/test_base"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
type server struct{}
@@ -256,7 +256,7 @@
//
// []string{"InputSlice", "InputSlice([1 2]) = []", "[\"[]uint\",[1,2]]"},
[]string{"InputStruct", "InputStruct({1 2}) = [<nil>]",
- "[\"type\",\"veyron2/vrpc/test_base.Struct struct{X int32;Y int32}\"] [\"Struct\",{\"X\":1,\"Y\":2}]"},
+ "[\"type\",\"veyron.io/veyron/veyron2/vrpc/test_base.Struct struct{X int32;Y int32}\"] [\"Struct\",{\"X\":1,\"Y\":2}]"},
// TODO(jsimsa): The OutputArray currently triggers an error in the
// vom decoder. Benj is looking into this.
//
diff --git a/tools/vrpc/main.go b/tools/vrpc/main.go
index 1cf6021..be42ae3 100644
--- a/tools/vrpc/main.go
+++ b/tools/vrpc/main.go
@@ -1,9 +1,9 @@
package main
import (
- "veyron/tools/vrpc/impl"
+ "veyron.io/veyron/veyron/tools/vrpc/impl"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index d4bf808..bac146f 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -6,12 +6,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_io "io"
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
type Struct struct {
@@ -739,7 +739,7 @@
_gen_wiretype.FieldType{Type: 0x24, Name: "X"},
_gen_wiretype.FieldType{Type: 0x24, Name: "Y"},
},
- "veyron/tools/vrpc/test_base.Struct", []string(nil)},
+ "veyron.io/veyron/veyron/tools/vrpc/test_base.Struct", []string(nil)},
}
return result, nil
