Reorganization of VANADIUM_ROOT relative paths.
diff --git a/runtimes/google/ipc/benchmarks/bm/main.go b/runtimes/google/ipc/benchmarks/bm/main.go
index 31bb123..4a12cc0 100644
--- a/runtimes/google/ipc/benchmarks/bm/main.go
+++ b/runtimes/google/ipc/benchmarks/bm/main.go
@@ -10,12 +10,12 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/benchmarks"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/benchmarks"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/rt"
)
var (
diff --git a/runtimes/google/ipc/benchmarks/bmclient/main.go b/runtimes/google/ipc/benchmarks/bmclient/main.go
index 0a88340..091421b 100644
--- a/runtimes/google/ipc/benchmarks/bmclient/main.go
+++ b/runtimes/google/ipc/benchmarks/bmclient/main.go
@@ -8,12 +8,12 @@
"testing"
"time"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/benchmarks"
+ "v.io/core/veyron/lib/testutil"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/benchmarks"
)
var (
diff --git a/runtimes/google/ipc/benchmarks/bmserver/main.go b/runtimes/google/ipc/benchmarks/bmserver/main.go
index fd94c0f..f621c7b 100644
--- a/runtimes/google/ipc/benchmarks/bmserver/main.go
+++ b/runtimes/google/ipc/benchmarks/bmserver/main.go
@@ -2,12 +2,12 @@
package main
import (
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles/roaming"
- "v.io/veyron/veyron/runtimes/google/ipc/benchmarks"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles/roaming"
+ "v.io/core/veyron/runtimes/google/ipc/benchmarks"
)
func main() {
diff --git a/runtimes/google/ipc/benchmarks/client.go b/runtimes/google/ipc/benchmarks/client.go
index 8d7cead..f6558ea 100644
--- a/runtimes/google/ipc/benchmarks/client.go
+++ b/runtimes/google/ipc/benchmarks/client.go
@@ -6,10 +6,10 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/vlog"
)
// CallEcho calls 'Echo' method 'iterations' times with the given payload
diff --git a/runtimes/google/ipc/benchmarks/glob/glob_test.go b/runtimes/google/ipc/benchmarks/glob/glob_test.go
index 7e06a02..1cd67d2 100644
--- a/runtimes/google/ipc/benchmarks/glob/glob_test.go
+++ b/runtimes/google/ipc/benchmarks/glob/glob_test.go
@@ -4,13 +4,13 @@
"fmt"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/profiles"
)
func TestNothing(t *testing.T) {
diff --git a/runtimes/google/ipc/benchmarks/ipc_test.go b/runtimes/google/ipc/benchmarks/ipc_test.go
index 8e05556..b4455b3 100644
--- a/runtimes/google/ipc/benchmarks/ipc_test.go
+++ b/runtimes/google/ipc/benchmarks/ipc_test.go
@@ -3,11 +3,11 @@
import (
"testing"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/benchmarks"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/benchmarks"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/rt"
)
var vrt veyron2.Runtime
diff --git a/runtimes/google/ipc/benchmarks/server.go b/runtimes/google/ipc/benchmarks/server.go
index 25cc42f..5e4ebdb 100644
--- a/runtimes/google/ipc/benchmarks/server.go
+++ b/runtimes/google/ipc/benchmarks/server.go
@@ -1,12 +1,12 @@
package benchmarks
import (
- sflag "v.io/veyron/veyron/security/flag"
+ sflag "v.io/core/veyron/security/flag"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/vlog"
)
type impl struct {
diff --git a/runtimes/google/ipc/benchmarks/service.vdl b/runtimes/google/ipc/benchmarks/service.vdl
index 25dcc46..d6ac0e8 100644
--- a/runtimes/google/ipc/benchmarks/service.vdl
+++ b/runtimes/google/ipc/benchmarks/service.vdl
@@ -3,7 +3,7 @@
package benchmarks
import (
- "v.io/veyron/veyron2/services/security/access"
+ "v.io/core/veyron2/services/security/access"
)
type Benchmark interface {
diff --git a/runtimes/google/ipc/benchmarks/service.vdl.go b/runtimes/google/ipc/benchmarks/service.vdl.go
index 2888b81..301bd4e 100644
--- a/runtimes/google/ipc/benchmarks/service.vdl.go
+++ b/runtimes/google/ipc/benchmarks/service.vdl.go
@@ -6,15 +6,15 @@
package benchmarks
import (
- "v.io/veyron/veyron2/services/security/access"
+ "v.io/core/veyron2/services/security/access"
// The non-user imports are prefixed with "__" to prevent collisions.
__io "io"
- __veyron2 "v.io/veyron/veyron2"
- __context "v.io/veyron/veyron2/context"
- __ipc "v.io/veyron/veyron2/ipc"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
- __wiretype "v.io/veyron/veyron2/wiretype"
+ __veyron2 "v.io/core/veyron2"
+ __context "v.io/core/veyron2/context"
+ __ipc "v.io/core/veyron2/ipc"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
+ __wiretype "v.io/core/veyron2/wiretype"
)
// TODO(toddw): Remove this line once the new signature support is done.
@@ -268,7 +268,7 @@
// descBenchmark hides the desc to keep godoc clean.
var descBenchmark = __ipc.InterfaceDesc{
Name: "Benchmark",
- PkgPath: "v.io/veyron/veyron/runtimes/google/ipc/benchmarks",
+ PkgPath: "v.io/core/veyron/runtimes/google/ipc/benchmarks",
Methods: []__ipc.MethodDesc{
{
Name: "Echo",
diff --git a/runtimes/google/ipc/blessings_cache.go b/runtimes/google/ipc/blessings_cache.go
index c7f81fc..effa8e8 100644
--- a/runtimes/google/ipc/blessings_cache.go
+++ b/runtimes/google/ipc/blessings_cache.go
@@ -5,9 +5,9 @@
"reflect"
"sync"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/security"
)
// clientEncodeBlessings gets or inserts the blessings into the cache.
diff --git a/runtimes/google/ipc/cancel_test.go b/runtimes/google/ipc/cancel_test.go
index 835a4f4..0dcf6d8 100644
--- a/runtimes/google/ipc/cancel_test.go
+++ b/runtimes/google/ipc/cancel_test.go
@@ -3,14 +3,14 @@
import (
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
)
type fakeAuthorizer int
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index 05438cd..83b2de3 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -10,28 +10,28 @@
"sync"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/i18n"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlutil"
- old_verror "v.io/veyron/veyron2/verror"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom"
- "v.io/veyron/veyron2/vom2"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/i18n"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlutil"
+ old_verror "v.io/core/veyron2/verror"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom"
+ "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vtrace"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
)
-const pkgPath = "v.io/veyron/veyron/runtimes/google/ipc"
+const pkgPath = "v.io/core/veyron/runtimes/google/ipc"
// TODO(cnicolaou): for local errors, automatically assign a new 'id',
// don't use pkgPath etc. Can then move them into being defined on each line
diff --git a/runtimes/google/ipc/client_test.go b/runtimes/google/ipc/client_test.go
index 3d3066a..137acad 100644
--- a/runtimes/google/ipc/client_test.go
+++ b/runtimes/google/ipc/client_test.go
@@ -9,17 +9,17 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/flags/consts"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/modules/core"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/flags/consts"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/modules/core"
+ "v.io/core/veyron/profiles"
)
var r veyron2.Runtime
@@ -413,7 +413,7 @@
if verr != nil {
t.Fatalf("unexpected error: %s", verr)
}
- if !verror.Is(err, verror.Unknown.ID) || err.Error() != `v.io/veyron/veyron2/verror.Unknown: EOF` {
+ if !verror.Is(err, verror.Unknown.ID) || err.Error() != `v.io/core/veyron2/verror.Unknown: EOF` {
t.Errorf("wrong error: %#v", err)
}
/* TODO(cnicolaou): use this when verror2/vom transition is done.
diff --git a/runtimes/google/ipc/context.go b/runtimes/google/ipc/context.go
index be2f9a5..a2e916d 100644
--- a/runtimes/google/ipc/context.go
+++ b/runtimes/google/ipc/context.go
@@ -4,8 +4,8 @@
"sync"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
)
const nilRuntimeMessage = "attempting to create a context with a nil runtime"
diff --git a/runtimes/google/ipc/context_test.go b/runtimes/google/ipc/context_test.go
index a988148..469e954 100644
--- a/runtimes/google/ipc/context_test.go
+++ b/runtimes/google/ipc/context_test.go
@@ -5,10 +5,10 @@
"testing"
"time"
- "v.io/veyron/veyron/runtimes/google/testing/mocks/runtime"
- "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/runtimes/google/testing/mocks/runtime"
+ "v.io/core/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron2/context"
+ "v.io/core/veyron2/context"
)
// We need a special way to create contexts for tests. We
diff --git a/runtimes/google/ipc/debug_test.go b/runtimes/google/ipc/debug_test.go
index 1e41cf1..449b0fd 100644
--- a/runtimes/google/ipc/debug_test.go
+++ b/runtimes/google/ipc/debug_test.go
@@ -6,18 +6,18 @@
"sort"
"testing"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/stats"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
- "v.io/veyron/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron/services/mgmt/debug"
+ "v.io/core/veyron/lib/stats"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/services/mgmt/debug"
)
func TestDebugServer(t *testing.T) {
diff --git a/runtimes/google/ipc/default_authorizer.go b/runtimes/google/ipc/default_authorizer.go
index b2613f3..98315fc 100644
--- a/runtimes/google/ipc/default_authorizer.go
+++ b/runtimes/google/ipc/default_authorizer.go
@@ -3,7 +3,7 @@
import (
"fmt"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
)
// defaultAuthorizer implements a security.Authorizer with an authorization
diff --git a/runtimes/google/ipc/default_authorizer_test.go b/runtimes/google/ipc/default_authorizer_test.go
index 87bebe1..ff992b7 100644
--- a/runtimes/google/ipc/default_authorizer_test.go
+++ b/runtimes/google/ipc/default_authorizer_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron2/security"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron2/security"
)
func TestDefaultAuthorizer(t *testing.T) {
diff --git a/runtimes/google/ipc/discharges.go b/runtimes/google/ipc/discharges.go
index d956c0b..3e1b3dd 100644
--- a/runtimes/google/ipc/discharges.go
+++ b/runtimes/google/ipc/discharges.go
@@ -4,17 +4,17 @@
"fmt"
"sync"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlutil"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
)
// discharger implements vc.DischargeClient.
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index 033995b..d5612b0 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -15,29 +15,29 @@
"testing"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vdl/vdlutil"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vdl/vdlutil"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/netstate"
- "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/runtimes/google/ipc/protocols/tcp"
- imanager "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/lib/publisher"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/lib/netstate"
+ "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
+ imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/lib/publisher"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
)
var (
diff --git a/runtimes/google/ipc/glob.go b/runtimes/google/ipc/glob.go
index 6ca5bec..b626f49 100644
--- a/runtimes/google/ipc/glob.go
+++ b/runtimes/google/ipc/glob.go
@@ -4,16 +4,16 @@
"strings"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/glob"
+ "v.io/core/veyron/lib/glob"
)
// TODO(toddw): Rename this file to "reserved.go".
diff --git a/runtimes/google/ipc/glob_test.go b/runtimes/google/ipc/glob_test.go
index 93d2214..f7ea507 100644
--- a/runtimes/google/ipc/glob_test.go
+++ b/runtimes/google/ipc/glob_test.go
@@ -6,15 +6,15 @@
"strings"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
- "v.io/veyron/veyron/lib/glob"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/glob"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
func startServer(rt veyron2.Runtime, tree *node) (string, func(), error) {
diff --git a/runtimes/google/ipc/protocols/tcp/init.go b/runtimes/google/ipc/protocols/tcp/init.go
index e7a4ad9..8007578 100644
--- a/runtimes/google/ipc/protocols/tcp/init.go
+++ b/runtimes/google/ipc/protocols/tcp/init.go
@@ -3,7 +3,7 @@
import (
"net"
- "v.io/veyron/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/stream"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/ws/init.go b/runtimes/google/ipc/protocols/ws/init.go
index 91aef19..583da58 100644
--- a/runtimes/google/ipc/protocols/ws/init.go
+++ b/runtimes/google/ipc/protocols/ws/init.go
@@ -1,9 +1,9 @@
package websocket
import (
- "v.io/veyron/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/stream"
- "v.io/veyron/veyron/lib/websocket"
+ "v.io/core/veyron/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/protocols/wsh/init.go b/runtimes/google/ipc/protocols/wsh/init.go
index 42abbc2..30893b1 100644
--- a/runtimes/google/ipc/protocols/wsh/init.go
+++ b/runtimes/google/ipc/protocols/wsh/init.go
@@ -3,9 +3,9 @@
package wsh
import (
- "v.io/veyron/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/stream"
- "v.io/veyron/veyron/lib/websocket"
+ "v.io/core/veyron/lib/websocket"
)
func init() {
diff --git a/runtimes/google/ipc/resolve_internal_test.go b/runtimes/google/ipc/resolve_internal_test.go
index c871730..0d3268d 100644
--- a/runtimes/google/ipc/resolve_internal_test.go
+++ b/runtimes/google/ipc/resolve_internal_test.go
@@ -1,7 +1,7 @@
package ipc
import (
- "v.io/veyron/veyron2/ipc"
+ "v.io/core/veyron2/ipc"
)
func InternalServerResolveToEndpoint(s ipc.Server, name string) (string, error) {
diff --git a/runtimes/google/ipc/resolve_test.go b/runtimes/google/ipc/resolve_test.go
index b37a0a2..962b9b5 100644
--- a/runtimes/google/ipc/resolve_test.go
+++ b/runtimes/google/ipc/resolve_test.go
@@ -5,14 +5,14 @@
"testing"
"time"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/modules/core"
- iipc "v.io/veyron/veyron/runtimes/google/ipc"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/modules/core"
+ iipc "v.io/core/veyron/runtimes/google/ipc"
+ inaming "v.io/core/veyron/runtimes/google/naming"
)
func startMT(t *testing.T, sh *modules.Shell) string {
diff --git a/runtimes/google/ipc/results_store_test.go b/runtimes/google/ipc/results_store_test.go
index 6ea1802..5c31331 100644
--- a/runtimes/google/ipc/results_store_test.go
+++ b/runtimes/google/ipc/results_store_test.go
@@ -5,7 +5,7 @@
"sync"
"testing"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 02cb375..12fb6cf 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -9,28 +9,28 @@
"sync"
"time"
- "v.io/veyron/veyron2/config"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/services/security/access"
- "v.io/veyron/veyron2/vdl"
- old_verror "v.io/veyron/veyron2/verror"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom"
- "v.io/veyron/veyron2/vom2"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/config"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/services/security/access"
+ "v.io/core/veyron2/vdl"
+ old_verror "v.io/core/veyron2/verror"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom"
+ "v.io/core/veyron2/vom2"
+ "v.io/core/veyron2/vtrace"
- "v.io/veyron/veyron/lib/netstate"
- "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/lib/publisher"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/lib/netstate"
+ "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/lib/publisher"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
// TODO(cnicolaou): finish verror -> verror2 transition, in particular
// for communicating from server to client.
diff --git a/runtimes/google/ipc/server_test.go b/runtimes/google/ipc/server_test.go
index bedf068..bb949f7 100644
--- a/runtimes/google/ipc/server_test.go
+++ b/runtimes/google/ipc/server_test.go
@@ -9,17 +9,17 @@
"testing"
"time"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/modules/core"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- imanager "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/modules/core"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
)
// TestReconnect verifies that the client transparently re-establishes the
diff --git a/runtimes/google/ipc/signature_test.go b/runtimes/google/ipc/signature_test.go
index c5cf233..9f9b0b0 100644
--- a/runtimes/google/ipc/signature_test.go
+++ b/runtimes/google/ipc/signature_test.go
@@ -5,16 +5,16 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/reserved"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/reserved"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/simple_test.go b/runtimes/google/ipc/simple_test.go
index d1b89ec..5f71703 100644
--- a/runtimes/google/ipc/simple_test.go
+++ b/runtimes/google/ipc/simple_test.go
@@ -5,8 +5,8 @@
"testing"
"time"
- "v.io/veyron/veyron2/ipc"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/ipc"
+ verror "v.io/core/veyron2/verror2"
)
type simple struct {
@@ -116,7 +116,7 @@
t.Fatalf("unexpected error: %s", verr)
}
- if !verror.Is(err, verror.Unknown.ID) || err.Error() != `v.io/veyron/veyron2/verror.Unknown: EOF` {
+ if !verror.Is(err, verror.Unknown.ID) || err.Error() != `v.io/core/veyron2/verror.Unknown: EOF` {
t.Errorf("wrong error: %#v", err)
}
/* TODO(cnicolaou): use this when verror2/vom transition is done.
diff --git a/runtimes/google/ipc/sort_endpoints.go b/runtimes/google/ipc/sort_endpoints.go
index c713c81..4036825 100644
--- a/runtimes/google/ipc/sort_endpoints.go
+++ b/runtimes/google/ipc/sort_endpoints.go
@@ -5,12 +5,12 @@
"net"
"strings"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/netstate"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ "v.io/core/veyron/lib/netstate"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ inaming "v.io/core/veyron/runtimes/google/naming"
)
type errorAccumulator struct {
diff --git a/runtimes/google/ipc/sort_internal_test.go b/runtimes/google/ipc/sort_internal_test.go
index c216960..20b9663 100644
--- a/runtimes/google/ipc/sort_internal_test.go
+++ b/runtimes/google/ipc/sort_internal_test.go
@@ -5,9 +5,9 @@
"strings"
"testing"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/vlog"
)
func TestIncompatible(t *testing.T) {
diff --git a/runtimes/google/ipc/stats.go b/runtimes/google/ipc/stats.go
index 9733dab..dbcdda4 100644
--- a/runtimes/google/ipc/stats.go
+++ b/runtimes/google/ipc/stats.go
@@ -4,11 +4,11 @@
"sync"
"time"
- "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/lib/stats/counter"
- "v.io/veyron/veyron/lib/stats/histogram"
+ "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/lib/stats/counter"
+ "v.io/core/veyron/lib/stats/histogram"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/naming"
)
type ipcStats struct {
diff --git a/runtimes/google/ipc/stream/benchmark/RESULTS.txt b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
index d7ec92f..826e4de 100644
--- a/runtimes/google/ipc/stream/benchmark/RESULTS.txt
+++ b/runtimes/google/ipc/stream/benchmark/RESULTS.txt
@@ -2,7 +2,7 @@
Platform: Intel(R) Xeon(R) CPU E5-2689 0 @ 2.60GHz, 66114888KB Memory
$ veyron go test -test.bench=. -test.cpu=1 -test.benchtime=5s \
- v.io/veyron/veyron/runtimes/google/ipc/stream/benchmark
+ v.io/core/veyron/runtimes/google/ipc/stream/benchmark
Benchmark_throughput_TCP_1Conn 1000000 9874 ns/op 5184.85 MB/s
Benchmark_throughput_TCP_2Conns 1000000 9815 ns/op 5216.01 MB/s
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vc.go b/runtimes/google/ipc/stream/benchmark/dial_vc.go
index df2ce28..3bdcb32 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vc.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vc.go
@@ -5,12 +5,12 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
- _ "v.io/veyron/veyron/profiles/static"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/lib/testutil"
+ _ "v.io/core/veyron/profiles/static"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
)
// benchmarkVCDial measures VC creation time over the underlying VIF.
diff --git a/runtimes/google/ipc/stream/benchmark/dial_vif.go b/runtimes/google/ipc/stream/benchmark/dial_vif.go
index 11e41c7..4fce465 100644
--- a/runtimes/google/ipc/stream/benchmark/dial_vif.go
+++ b/runtimes/google/ipc/stream/benchmark/dial_vif.go
@@ -6,11 +6,11 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
)
// benchmarkVIFDial measures VIF creation time over the underlying net connection.
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_flow.go b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
index cce6602..3ce3a36 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_flow.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_flow.go
@@ -4,11 +4,11 @@
"io"
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
)
const (
diff --git a/runtimes/google/ipc/stream/benchmark/throughput_tls.go b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
index 5509336..e727fe3 100644
--- a/runtimes/google/ipc/stream/benchmark/throughput_tls.go
+++ b/runtimes/google/ipc/stream/benchmark/throughput_tls.go
@@ -6,7 +6,7 @@
"net"
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
)
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 b2118e2..852e7ab 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -10,7 +10,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
)
type boxcrypter struct {
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher_test.go b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
index 4a6b45a..3e77663 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher_test.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
@@ -7,7 +7,7 @@
"golang.org/x/crypto/nacl/box"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
)
// Add space for a MAC.
diff --git a/runtimes/google/ipc/stream/crypto/crypto.go b/runtimes/google/ipc/stream/crypto/crypto.go
index ee79f63..2000798 100644
--- a/runtimes/google/ipc/stream/crypto/crypto.go
+++ b/runtimes/google/ipc/stream/crypto/crypto.go
@@ -2,7 +2,7 @@
// securing communication over VCs.
package crypto
-import "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+import "v.io/core/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 7091ebf..b81c117 100644
--- a/runtimes/google/ipc/stream/crypto/crypto_test.go
+++ b/runtimes/google/ipc/stream/crypto/crypto_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/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 01fb84c..b8b376f 100644
--- a/runtimes/google/ipc/stream/crypto/null.go
+++ b/runtimes/google/ipc/stream/crypto/null.go
@@ -1,6 +1,6 @@
package crypto
-import "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+import "v.io/core/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 83f0662..da35acc 100644
--- a/runtimes/google/ipc/stream/crypto/tls.go
+++ b/runtimes/google/ipc/stream/crypto/tls.go
@@ -12,7 +12,7 @@
"sync"
"time"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
)
var errDeadlinesNotSupported = errors.New("deadlines not supported")
diff --git a/runtimes/google/ipc/stream/manager/listener.go b/runtimes/google/ipc/stream/manager/listener.go
index 21d0f13..b6ed7ad 100644
--- a/runtimes/google/ipc/stream/manager/listener.go
+++ b/runtimes/google/ipc/stream/manager/listener.go
@@ -8,16 +8,16 @@
"sync"
"time"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
- "v.io/veyron/veyron/runtimes/google/lib/upcqueue"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom2"
)
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 0569c31..f76a522 100644
--- a/runtimes/google/ipc/stream/manager/manager.go
+++ b/runtimes/google/ipc/stream/manager/manager.go
@@ -9,16 +9,16 @@
"sync"
"time"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/stats"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ "v.io/core/veyron/lib/stats"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ inaming "v.io/core/veyron/runtimes/google/naming"
)
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 43d62c7..ada68cf 100644
--- a/runtimes/google/ipc/stream/manager/manager_test.go
+++ b/runtimes/google/ipc/stream/manager/manager_test.go
@@ -12,20 +12,20 @@
"testing"
"time"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/runtimes/google/ipc/protocols/tcp"
- _ "v.io/veyron/veyron/runtimes/google/ipc/protocols/ws"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/runtimes/google/ipc/protocols/tcp"
+ _ "v.io/core/veyron/runtimes/google/ipc/protocols/ws"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ inaming "v.io/core/veyron/runtimes/google/naming"
)
func newPrincipal(defaultBlessing string) vc.LocalPrincipal {
diff --git a/runtimes/google/ipc/stream/message/coding.go b/runtimes/google/ipc/stream/message/coding.go
index 42c58e9..6e71d72 100644
--- a/runtimes/google/ipc/stream/message/coding.go
+++ b/runtimes/google/ipc/stream/message/coding.go
@@ -6,7 +6,7 @@
"fmt"
"io"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/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 4a2ae62..e7f3f1a 100644
--- a/runtimes/google/ipc/stream/message/control.go
+++ b/runtimes/google/ipc/stream/message/control.go
@@ -5,10 +5,10 @@
"fmt"
"io"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/core/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 114a27c..0060413 100644
--- a/runtimes/google/ipc/stream/message/counters.go
+++ b/runtimes/google/ipc/stream/message/counters.go
@@ -3,7 +3,7 @@
import (
"fmt"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/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 e3fc25f..af82141 100644
--- a/runtimes/google/ipc/stream/message/counters_test.go
+++ b/runtimes/google/ipc/stream/message/counters_test.go
@@ -4,7 +4,7 @@
"testing"
"testing/quick"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/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 dff3aeb..88a6566 100644
--- a/runtimes/google/ipc/stream/message/data.go
+++ b/runtimes/google/ipc/stream/message/data.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/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 5e16595..88c8617 100644
--- a/runtimes/google/ipc/stream/message/message.go
+++ b/runtimes/google/ipc/stream/message/message.go
@@ -64,10 +64,10 @@
"fmt"
"io"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron2/vlog"
)
const (
diff --git a/runtimes/google/ipc/stream/message/message_test.go b/runtimes/google/ipc/stream/message/message_test.go
index 8323f40..d4433eb 100644
--- a/runtimes/google/ipc/stream/message/message_test.go
+++ b/runtimes/google/ipc/stream/message/message_test.go
@@ -6,9 +6,9 @@
"reflect"
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron2/naming"
)
// testControlCipher is a super-simple cipher that xor's each byte of the
diff --git a/runtimes/google/ipc/stream/proxy/protocol.vdl.go b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
index 9364c85..6b24382 100644
--- a/runtimes/google/ipc/stream/proxy/protocol.vdl.go
+++ b/runtimes/google/ipc/stream/proxy/protocol.vdl.go
@@ -5,7 +5,7 @@
import (
// The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/veyron/veyron2/vdl"
+ __vdl "v.io/core/veyron2/vdl"
)
// Request is the message sent by a server to request that the proxy route
@@ -15,7 +15,7 @@
}
func (Request) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy.Request"
+ Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Request"
}) {
}
@@ -30,7 +30,7 @@
}
func (Response) __VDLReflect(struct {
- Name string "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy.Response"
+ Name string "v.io/core/veyron/runtimes/google/ipc/stream/proxy.Response"
}) {
}
diff --git a/runtimes/google/ipc/stream/proxy/proxy.go b/runtimes/google/ipc/stream/proxy/proxy.go
index 8887d03..9ca6b5c 100644
--- a/runtimes/google/ipc/stream/proxy/proxy.go
+++ b/runtimes/google/ipc/stream/proxy/proxy.go
@@ -6,23 +6,23 @@
"net"
"sync"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom2"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/message"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron/runtimes/google/lib/upcqueue"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/ipc/stream/message"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/upcqueue"
)
var (
diff --git a/runtimes/google/ipc/stream/proxy/proxy_test.go b/runtimes/google/ipc/stream/proxy/proxy_test.go
index ac136d2..8fd3b8c 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"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/stream/vc/auth.go b/runtimes/google/ipc/stream/vc/auth.go
index e9f6d23..f7cb796 100644
--- a/runtimes/google/ipc/stream/vc/auth.go
+++ b/runtimes/google/ipc/stream/vc/auth.go
@@ -6,13 +6,13 @@
"fmt"
"io"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vom2"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/flow.go b/runtimes/google/ipc/stream/vc/flow.go
index 4f80ae4..e13fd21 100644
--- a/runtimes/google/ipc/stream/vc/flow.go
+++ b/runtimes/google/ipc/stream/vc/flow.go
@@ -1,9 +1,9 @@
package vc
import (
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
)
type flow struct {
diff --git a/runtimes/google/ipc/stream/vc/init.go b/runtimes/google/ipc/stream/vc/init.go
index 541f2bb..2655b9b 100644
--- a/runtimes/google/ipc/stream/vc/init.go
+++ b/runtimes/google/ipc/stream/vc/init.go
@@ -6,8 +6,8 @@
"crypto/rand"
"fmt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
)
var AnonymousPrincipal security.Principal
diff --git a/runtimes/google/ipc/stream/vc/listener.go b/runtimes/google/ipc/stream/vc/listener.go
index ab6b6a3..bd04847 100644
--- a/runtimes/google/ipc/stream/vc/listener.go
+++ b/runtimes/google/ipc/stream/vc/listener.go
@@ -3,8 +3,8 @@
import (
"errors"
- "v.io/veyron/veyron/runtimes/google/lib/upcqueue"
- "v.io/veyron/veyron2/ipc/stream"
+ "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/core/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 8e1b3a0..2e21acc 100644
--- a/runtimes/google/ipc/stream/vc/listener_test.go
+++ b/runtimes/google/ipc/stream/vc/listener_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
)
type noopFlow struct{}
diff --git a/runtimes/google/ipc/stream/vc/reader.go b/runtimes/google/ipc/stream/vc/reader.go
index 3954577..bb2f046 100644
--- a/runtimes/google/ipc/stream/vc/reader.go
+++ b/runtimes/google/ipc/stream/vc/reader.go
@@ -6,9 +6,9 @@
"sync"
"sync/atomic"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
- "v.io/veyron/veyron/runtimes/google/lib/upcqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron/runtimes/google/lib/upcqueue"
)
// 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 e785da9..a2100ba 100644
--- a/runtimes/google/ipc/stream/vc/reader_test.go
+++ b/runtimes/google/ipc/stream/vc/reader_test.go
@@ -7,7 +7,7 @@
"testing"
"testing/quick"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/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 236fee8..e34344b 100644
--- a/runtimes/google/ipc/stream/vc/vc.go
+++ b/runtimes/google/ipc/stream/vc/vc.go
@@ -11,21 +11,21 @@
"strings"
"sync"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
)
var (
diff --git a/runtimes/google/ipc/stream/vc/vc_test.go b/runtimes/google/ipc/stream/vc/vc_test.go
index 8bbd80d..3728eb4 100644
--- a/runtimes/google/ipc/stream/vc/vc_test.go
+++ b/runtimes/google/ipc/stream/vc/vc_test.go
@@ -13,20 +13,20 @@
"sync"
"testing"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/stream/vc/writer.go b/runtimes/google/ipc/stream/vc/writer.go
index 9a13a23..3dae782 100644
--- a/runtimes/google/ipc/stream/vc/writer.go
+++ b/runtimes/google/ipc/stream/vc/writer.go
@@ -7,9 +7,9 @@
"sync"
"sync/atomic"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ vsync "v.io/core/veyron/runtimes/google/lib/sync"
)
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 8f82e83..02a6484 100644
--- a/runtimes/google/ipc/stream/vc/writer_test.go
+++ b/runtimes/google/ipc/stream/vc/writer_test.go
@@ -7,10 +7,10 @@
"reflect"
"testing"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/sync"
)
// TestWrite is a very basic, easy to follow, but not very thorough test of the
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index 610da8a..681e91c 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -9,16 +9,16 @@
"golang.org/x/crypto/nacl/box"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/message"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc/stream"
- ipcversion "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/message"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc/stream"
+ ipcversion "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
)
var (
diff --git a/runtimes/google/ipc/stream/vif/set_test.go b/runtimes/google/ipc/stream/vif/set_test.go
index 43b8a3c..307b070 100644
--- a/runtimes/google/ipc/stream/vif/set_test.go
+++ b/runtimes/google/ipc/stream/vif/set_test.go
@@ -8,8 +8,8 @@
"path"
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ "v.io/core/veyron2/naming"
)
func TestSetWithPipes(t *testing.T) {
diff --git a/runtimes/google/ipc/stream/vif/setup_conn.go b/runtimes/google/ipc/stream/vif/setup_conn.go
index c5f581c..a983a37 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn.go
@@ -3,9 +3,9 @@
import (
"io"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/message"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/message"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
)
// setupConn writes the data to the net.Conn using HopSetupStream messages.
diff --git a/runtimes/google/ipc/stream/vif/setup_conn_test.go b/runtimes/google/ipc/stream/vif/setup_conn_test.go
index 2852b39..562386e 100644
--- a/runtimes/google/ipc/stream/vif/setup_conn_test.go
+++ b/runtimes/google/ipc/stream/vif/setup_conn_test.go
@@ -8,7 +8,7 @@
"sync"
"testing"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
)
const (
diff --git a/runtimes/google/ipc/stream/vif/vcmap.go b/runtimes/google/ipc/stream/vif/vcmap.go
index 6bd6e10..5669304 100644
--- a/runtimes/google/ipc/stream/vif/vcmap.go
+++ b/runtimes/google/ipc/stream/vif/vcmap.go
@@ -4,9 +4,9 @@
"sort"
"sync"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/lib/pcqueue"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/lib/pcqueue"
)
// 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 f4f049b..abf8056 100644
--- a/runtimes/google/ipc/stream/vif/vcmap_test.go
+++ b/runtimes/google/ipc/stream/vif/vcmap_test.go
@@ -4,7 +4,7 @@
"reflect"
"testing"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/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 c4888ca..0d68a45 100644
--- a/runtimes/google/ipc/stream/vif/vif.go
+++ b/runtimes/google/ipc/stream/vif/vif.go
@@ -14,23 +14,23 @@
"sync"
"time"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/id"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/message"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/version"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue/drrqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
- "v.io/veyron/veyron/runtimes/google/lib/pcqueue"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
- "v.io/veyron/veyron/runtimes/google/lib/upcqueue"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron/runtimes/google/ipc/stream/crypto"
+ "v.io/core/veyron/runtimes/google/ipc/stream/id"
+ "v.io/core/veyron/runtimes/google/ipc/stream/message"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/version"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/veyron/runtimes/google/lib/bqueue/drrqueue"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/pcqueue"
+ vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
)
// 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 bd0f323..edffeba 100644
--- a/runtimes/google/ipc/stream/vif/vif_test.go
+++ b/runtimes/google/ipc/stream/vif/vif_test.go
@@ -16,15 +16,15 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vif"
- iversion "v.io/veyron/veyron/runtimes/google/ipc/version"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vif"
+ iversion "v.io/core/veyron/runtimes/google/ipc/version"
- "v.io/veyron/veyron2/ipc/stream"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/stream"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/testutil_test.go b/runtimes/google/ipc/testutil_test.go
index 98e9954..1011dd6 100644
--- a/runtimes/google/ipc/testutil_test.go
+++ b/runtimes/google/ipc/testutil_test.go
@@ -4,10 +4,10 @@
"reflect"
"testing"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/verror2"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/ipc/version/version.go b/runtimes/google/ipc/version/version.go
index 56fd7dd..d5f879c 100644
--- a/runtimes/google/ipc/version/version.go
+++ b/runtimes/google/ipc/version/version.go
@@ -3,10 +3,10 @@
import (
"fmt"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/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 7016b69..dcc388a 100644
--- a/runtimes/google/ipc/version/version_test.go
+++ b/runtimes/google/ipc/version/version_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
)
func TestCommonVersion(t *testing.T) {
