Reorganization of VANADIUM_ROOT relative paths.
diff --git a/runtimes/GO.PACKAGE b/runtimes/GO.PACKAGE
index a5ea1f1..7b02a22 100644
--- a/runtimes/GO.PACKAGE
+++ b/runtimes/GO.PACKAGE
@@ -1,11 +1,11 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/veyron/veyron/runtimes/..."},
- {"allow": "v.io/veyron/veyron2/rt/..."},
- {"allow": "v.io/veyron/veyron/lib/...", "comment":"temporarily allowing dependency from lib"},
- {"allow": "v.io/veyron/veyron/profiles/...", "comment":"temporarily allowing dependency from profiles"},
- {"allow": "v.io/veyron/veyron/services/...", "comment": "temporarily allowing dependency from services"},
+ {"allow": "v.io/core/veyron/runtimes/..."},
+ {"allow": "v.io/core/veyron2/rt/..."},
+ {"allow": "v.io/core/veyron/lib/...", "comment":"temporarily allowing dependency from lib"},
+ {"allow": "v.io/core/veyron/profiles/...", "comment":"temporarily allowing dependency from profiles"},
+ {"allow": "v.io/core/veyron/services/...", "comment": "temporarily allowing dependency from services"},
{"deny": "..."}
]
}
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) {
diff --git a/runtimes/google/lib/bqueue/bqueue.go b/runtimes/google/lib/bqueue/bqueue.go
index cb3c72c..fc5c9b5 100644
--- a/runtimes/google/lib/bqueue/bqueue.go
+++ b/runtimes/google/lib/bqueue/bqueue.go
@@ -33,7 +33,7 @@
import (
"errors"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/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 308f760..4210556 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue.go
@@ -23,10 +23,10 @@
"io"
"sync"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/deque"
- "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/deque"
+ "v.io/core/veyron/runtimes/google/lib/iobuf"
+ vsync "v.io/core/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 6ea460e..01e5e1e 100644
--- a/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
+++ b/runtimes/google/lib/bqueue/drrqueue/drrqueue_test.go
@@ -5,8 +5,8 @@
"runtime"
"testing"
- "v.io/veyron/veyron/runtimes/google/lib/bqueue"
- "v.io/veyron/veyron/runtimes/google/lib/iobuf"
+ "v.io/core/veyron/runtimes/google/lib/bqueue"
+ "v.io/core/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 65ee51b..2e34c41 100644
--- a/runtimes/google/lib/deque/deque_test.go
+++ b/runtimes/google/lib/deque/deque_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/lib/iobuf/allocator.go b/runtimes/google/lib/iobuf/allocator.go
index ae4ea0c..7c68de1 100644
--- a/runtimes/google/lib/iobuf/allocator.go
+++ b/runtimes/google/lib/iobuf/allocator.go
@@ -1,6 +1,6 @@
package iobuf
-import "v.io/veyron/veyron2/vlog"
+import "v.io/core/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 75a4ae9..2d55835 100644
--- a/runtimes/google/lib/iobuf/iobuf.go
+++ b/runtimes/google/lib/iobuf/iobuf.go
@@ -27,7 +27,7 @@
"sync"
"sync/atomic"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/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 a0d0b6b..cfd60f0 100644
--- a/runtimes/google/lib/pcqueue/pcqueue_test.go
+++ b/runtimes/google/lib/pcqueue/pcqueue_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron2/vlog"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/lib/publisher/publisher.go b/runtimes/google/lib/publisher/publisher.go
index dbe465a..d2a27d5 100644
--- a/runtimes/google/lib/publisher/publisher.go
+++ b/runtimes/google/lib/publisher/publisher.go
@@ -8,9 +8,9 @@
"strings"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/vlog"
)
// TODO(cnicolaou): have the done channel return an error so
diff --git a/runtimes/google/lib/publisher/publisher_test.go b/runtimes/google/lib/publisher/publisher_test.go
index 0d74975..5e15a0f 100644
--- a/runtimes/google/lib/publisher/publisher_test.go
+++ b/runtimes/google/lib/publisher/publisher_test.go
@@ -6,14 +6,14 @@
"testing"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/naming"
- iipc "v.io/veyron/veyron/runtimes/google/ipc"
- "v.io/veyron/veyron/runtimes/google/lib/publisher"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
- "v.io/veyron/veyron/runtimes/google/testing/mocks/runtime"
- "v.io/veyron/veyron/runtimes/google/vtrace"
+ iipc "v.io/core/veyron/runtimes/google/ipc"
+ "v.io/core/veyron/runtimes/google/lib/publisher"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ "v.io/core/veyron/runtimes/google/testing/mocks/runtime"
+ "v.io/core/veyron/runtimes/google/vtrace"
)
func testContext() context.T {
diff --git a/runtimes/google/lib/sync/semaphore_test.go b/runtimes/google/lib/sync/semaphore_test.go
index 9398c37..4660ee1 100644
--- a/runtimes/google/lib/sync/semaphore_test.go
+++ b/runtimes/google/lib/sync/semaphore_test.go
@@ -5,7 +5,7 @@
"sync/atomic"
"testing"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/lib/sync/wait_group_test.go b/runtimes/google/lib/sync/wait_group_test.go
index f138e16..44738a9 100644
--- a/runtimes/google/lib/sync/wait_group_test.go
+++ b/runtimes/google/lib/sync/wait_group_test.go
@@ -2,7 +2,7 @@
import (
"testing"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/lib/upcqueue/upcqueue.go b/runtimes/google/lib/upcqueue/upcqueue.go
index 794a99e..5c64c92 100644
--- a/runtimes/google/lib/upcqueue/upcqueue.go
+++ b/runtimes/google/lib/upcqueue/upcqueue.go
@@ -15,8 +15,8 @@
"errors"
"sync"
- "v.io/veyron/veyron/runtimes/google/lib/deque"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron/runtimes/google/lib/deque"
+ vsync "v.io/core/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 7efc003..2ac6982 100644
--- a/runtimes/google/lib/upcqueue/upcqueue_test.go
+++ b/runtimes/google/lib/upcqueue/upcqueue_test.go
@@ -6,9 +6,9 @@
"testing"
"time"
- "v.io/veyron/veyron/lib/testutil"
- vsync "v.io/veyron/veyron/runtimes/google/lib/sync"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/lib/testutil"
+ vsync "v.io/core/veyron/runtimes/google/lib/sync"
+ "v.io/core/veyron2/vlog"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/naming/endpoint.go b/runtimes/google/naming/endpoint.go
index 973079c..31d4db1 100644
--- a/runtimes/google/naming/endpoint.go
+++ b/runtimes/google/naming/endpoint.go
@@ -7,8 +7,8 @@
"strconv"
"strings"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/veyron2/naming"
)
const (
diff --git a/runtimes/google/naming/endpoint_test.go b/runtimes/google/naming/endpoint_test.go
index bc49a1b..744d344 100644
--- a/runtimes/google/naming/endpoint_test.go
+++ b/runtimes/google/naming/endpoint_test.go
@@ -5,8 +5,8 @@
"reflect"
"testing"
- "v.io/veyron/veyron2/ipc/version"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/ipc/version"
+ "v.io/core/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 fe32f8e..9c76b45 100644
--- a/runtimes/google/naming/namespace/all_test.go
+++ b/runtimes/google/naming/namespace/all_test.go
@@ -7,21 +7,21 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/naming/namespace"
- vsecurity "v.io/veyron/veyron/security"
- service "v.io/veyron/veyron/services/mounttable/lib"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/naming/namespace"
+ vsecurity "v.io/core/veyron/security"
+ service "v.io/core/veyron/services/mounttable/lib"
)
func init() {
diff --git a/runtimes/google/naming/namespace/cache.go b/runtimes/google/naming/namespace/cache.go
index 64dd082..8722ae0 100644
--- a/runtimes/google/naming/namespace/cache.go
+++ b/runtimes/google/naming/namespace/cache.go
@@ -6,9 +6,9 @@
"sync"
"time"
- "v.io/veyron/veyron2/naming"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/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 2e5616a..6516780 100644
--- a/runtimes/google/naming/namespace/cache_test.go
+++ b/runtimes/google/naming/namespace/cache_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/naming"
)
func compatible(server string, servers []naming.MountedServer) bool {
diff --git a/runtimes/google/naming/namespace/glob.go b/runtimes/google/naming/namespace/glob.go
index bf1d4ba..3dc90e9 100644
--- a/runtimes/google/naming/namespace/glob.go
+++ b/runtimes/google/naming/namespace/glob.go
@@ -5,15 +5,15 @@
"io"
"strings"
- "v.io/veyron/veyron/lib/glob"
+ "v.io/core/veyron/lib/glob"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
const mountTableGlobReplyStreamLength = 100
diff --git a/runtimes/google/naming/namespace/mount.go b/runtimes/google/naming/namespace/mount.go
index 3a07d44..1546d45 100644
--- a/runtimes/google/naming/namespace/mount.go
+++ b/runtimes/google/naming/namespace/mount.go
@@ -3,14 +3,14 @@
import (
"time"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/vlog"
)
type status struct {
diff --git a/runtimes/google/naming/namespace/namespace.go b/runtimes/google/naming/namespace/namespace.go
index da6a5ce..6933430 100644
--- a/runtimes/google/naming/namespace/namespace.go
+++ b/runtimes/google/naming/namespace/namespace.go
@@ -5,12 +5,12 @@
"sync"
"time"
- inaming "v.io/veyron/veyron/runtimes/google/naming"
+ inaming "v.io/core/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/vlog"
)
const defaultMaxResolveDepth = 32
diff --git a/runtimes/google/naming/namespace/resolve.go b/runtimes/google/naming/namespace/resolve.go
index bfcbf7c..097359a 100644
--- a/runtimes/google/naming/namespace/resolve.go
+++ b/runtimes/google/naming/namespace/resolve.go
@@ -5,13 +5,13 @@
"fmt"
"runtime"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
func (ns *namespace) resolveAgainstMountTable(ctx context.T, client ipc.Client, e *naming.MountEntry, pattern string, opts ...ipc.CallOpt) (*naming.MountEntry, error) {
diff --git a/runtimes/google/naming/namespace/stub.go b/runtimes/google/naming/namespace/stub.go
index 5bfa3f5..0574e2c 100644
--- a/runtimes/google/naming/namespace/stub.go
+++ b/runtimes/google/naming/namespace/stub.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2/naming"
)
func convertServersToStrings(servers []naming.MountedServer, suffix string) (ret []string) {
diff --git a/runtimes/google/rt/ipc.go b/runtimes/google/rt/ipc.go
index 4e3a9fc..da8b27e 100644
--- a/runtimes/google/rt/ipc.go
+++ b/runtimes/google/rt/ipc.go
@@ -5,19 +5,19 @@
"math/rand"
"time"
- iipc "v.io/veyron/veyron/runtimes/google/ipc"
- imanager "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/vc"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ iipc "v.io/core/veyron/runtimes/google/ipc"
+ imanager "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ "v.io/core/veyron/runtimes/google/ipc/stream/vc"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
- "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/verror2"
- "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/verror2"
+ "v.io/core/veyron2/vtrace"
)
func (rt *vrt) NewClient(opts ...ipc.ClientOpt) (ipc.Client, error) {
diff --git a/runtimes/google/rt/ipc_test.go b/runtimes/google/rt/ipc_test.go
index f0f82eb..b94ad3c 100644
--- a/runtimes/google/rt/ipc_test.go
+++ b/runtimes/google/rt/ipc_test.go
@@ -6,17 +6,17 @@
"testing"
"time"
- "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/testutil"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron2/vdl/vdlutil"
- "v.io/veyron/veyron2/verror"
+ "v.io/core/veyron/lib/testutil"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/verror"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/rt/log.go b/runtimes/google/rt/log.go
index 87d0985..0eb3d11 100644
--- a/runtimes/google/rt/log.go
+++ b/runtimes/google/rt/log.go
@@ -1,7 +1,7 @@
package rt
import (
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
func (*vrt) Logger() vlog.Logger {
diff --git a/runtimes/google/rt/mgmt.go b/runtimes/google/rt/mgmt.go
index cd449de..1b9a4a2 100644
--- a/runtimes/google/rt/mgmt.go
+++ b/runtimes/google/rt/mgmt.go
@@ -4,13 +4,13 @@
"fmt"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
- "v.io/veyron/veyron/lib/exec"
+ "v.io/core/veyron/lib/exec"
)
// TODO(cnicolaou,caprita): move this all out of the runtime when we
diff --git a/runtimes/google/rt/mgmt_test.go b/runtimes/google/rt/mgmt_test.go
index 11910fb..fdd9b29 100644
--- a/runtimes/google/rt/mgmt_test.go
+++ b/runtimes/google/rt/mgmt_test.go
@@ -9,22 +9,22 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/services/mgmt/appcycle"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/services/mgmt/appcycle"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/flags/consts"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil"
- "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/rt"
- vflag "v.io/veyron/veyron/security/flag"
- "v.io/veyron/veyron/services/mgmt/device"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/flags/consts"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/rt"
+ vflag "v.io/core/veyron/security/flag"
+ "v.io/core/veyron/services/mgmt/device"
)
var profileOpt = options.Profile{profiles.New()}
diff --git a/runtimes/google/rt/naming.go b/runtimes/google/rt/naming.go
index f901699..8ac5caa 100644
--- a/runtimes/google/rt/naming.go
+++ b/runtimes/google/rt/naming.go
@@ -1,8 +1,8 @@
package rt
import (
- inaming "v.io/veyron/veyron/runtimes/google/naming"
- "v.io/veyron/veyron2/naming"
+ inaming "v.io/core/veyron/runtimes/google/naming"
+ "v.io/core/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 e6d1a57..78231c9 100644
--- a/runtimes/google/rt/rt.go
+++ b/runtimes/google/rt/rt.go
@@ -8,23 +8,23 @@
"strings"
"sync"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/config"
- "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/rt"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/config"
+ "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/rt"
- "v.io/veyron/veyron/lib/exec"
- "v.io/veyron/veyron/lib/flags"
- _ "v.io/veyron/veyron/lib/stats/sysstats"
- "v.io/veyron/veyron/runtimes/google/naming/namespace"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron/lib/exec"
+ "v.io/core/veyron/lib/flags"
+ _ "v.io/core/veyron/lib/stats/sysstats"
+ "v.io/core/veyron/runtimes/google/naming/namespace"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
)
// TODO(caprita): Verrorize this, and maybe move it in the API.
diff --git a/runtimes/google/rt/rt_test.go b/runtimes/google/rt/rt_test.go
index 01400e8..410364a 100644
--- a/runtimes/google/rt/rt_test.go
+++ b/runtimes/google/rt/rt_test.go
@@ -10,16 +10,16 @@
"testing"
"time"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/flags/consts"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil"
- vsecurity "v.io/veyron/veyron/security"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/flags/consts"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil"
+ vsecurity "v.io/core/veyron/security"
)
func init() {
diff --git a/runtimes/google/rt/security.go b/runtimes/google/rt/security.go
index 85b21d1..702a09c 100644
--- a/runtimes/google/rt/security.go
+++ b/runtimes/google/rt/security.go
@@ -6,14 +6,14 @@
"os/user"
"strconv"
- "v.io/veyron/veyron2/mgmt"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/mgmt"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/security"
- "v.io/veyron/veyron/lib/exec"
- "v.io/veyron/veyron/lib/stats"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/security/agent"
+ "v.io/core/veyron/lib/exec"
+ "v.io/core/veyron/lib/stats"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/security/agent"
)
func (rt *vrt) Principal() security.Principal {
diff --git a/runtimes/google/rt/shutdown_servers_test.go b/runtimes/google/rt/shutdown_servers_test.go
index e76321a..eca766a 100644
--- a/runtimes/google/rt/shutdown_servers_test.go
+++ b/runtimes/google/rt/shutdown_servers_test.go
@@ -9,14 +9,14 @@
"sync"
"syscall"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/profiles"
)
func init() {
diff --git a/runtimes/google/rt/shutdown_test.go b/runtimes/google/rt/shutdown_test.go
index 4504c7b..b29baa6 100644
--- a/runtimes/google/rt/shutdown_test.go
+++ b/runtimes/google/rt/shutdown_test.go
@@ -8,12 +8,12 @@
"testing"
"time"
- "v.io/veyron/veyron2"
+ "v.io/core/veyron2"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/lib/testutil"
)
var cstderr io.Writer
diff --git a/runtimes/google/rt/signal.go b/runtimes/google/rt/signal.go
index 45d9acc..8ca4643 100644
--- a/runtimes/google/rt/signal.go
+++ b/runtimes/google/rt/signal.go
@@ -5,7 +5,7 @@
"os/signal"
"syscall"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/vlog"
)
func (r *vrt) initSignalHandling() {
diff --git a/runtimes/google/rt/signal_test.go b/runtimes/google/rt/signal_test.go
index f905010..aeb249b 100644
--- a/runtimes/google/rt/signal_test.go
+++ b/runtimes/google/rt/signal_test.go
@@ -9,14 +9,14 @@
"testing"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/config"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/config"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
- "v.io/veyron/veyron/lib/appcycle"
- "v.io/veyron/veyron/lib/expect"
- "v.io/veyron/veyron/lib/modules"
+ "v.io/core/veyron/lib/appcycle"
+ "v.io/core/veyron/lib/expect"
+ "v.io/core/veyron/lib/modules"
)
func init() {
diff --git a/runtimes/google/testing/concurrency/clock_test.go b/runtimes/google/testing/concurrency/clock_test.go
index 7e77516..0d6b243 100644
--- a/runtimes/google/testing/concurrency/clock_test.go
+++ b/runtimes/google/testing/concurrency/clock_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/veyron/veyron/lib/testutil"
+ "v.io/core/veyron/lib/testutil"
)
func init() { testutil.Init() }
diff --git a/runtimes/google/testing/concurrency/mutex_test.go b/runtimes/google/testing/concurrency/mutex_test.go
index e14744a..f12af16 100644
--- a/runtimes/google/testing/concurrency/mutex_test.go
+++ b/runtimes/google/testing/concurrency/mutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/veyron/veyron/runtimes/google/testing/concurrency"
- "v.io/veyron/veyron/runtimes/google/testing/concurrency/sync"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/runtimes/google/testing/concurrency"
+ "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
+ "v.io/core/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 cb01d6b..0d6a52d 100644
--- a/runtimes/google/testing/concurrency/rwmutex_test.go
+++ b/runtimes/google/testing/concurrency/rwmutex_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/veyron/veyron/runtimes/google/testing/concurrency"
- "v.io/veyron/veyron/runtimes/google/testing/concurrency/sync"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/runtimes/google/testing/concurrency"
+ "v.io/core/veyron/runtimes/google/testing/concurrency/sync"
+ "v.io/core/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 e7df8c5..d6f20e5 100644
--- a/runtimes/google/testing/concurrency/sync/sync.go
+++ b/runtimes/google/testing/concurrency/sync/sync.go
@@ -3,7 +3,7 @@
import (
"sync"
- "v.io/veyron/veyron/runtimes/google/testing/concurrency"
+ "v.io/core/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 61dc2b0..40bc9de 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client.go
@@ -6,10 +6,10 @@
"reflect"
"sync"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vlog"
)
// 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 1783b07..9dcbc87 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"
- "v.io/veyron/veyron2/context"
+ "v.io/core/veyron2/context"
)
type fakeContext struct{}
diff --git a/runtimes/google/testing/mocks/naming/namespace.go b/runtimes/google/testing/mocks/naming/namespace.go
index 6d08465..6c68c83 100644
--- a/runtimes/google/testing/mocks/naming/namespace.go
+++ b/runtimes/google/testing/mocks/naming/namespace.go
@@ -6,12 +6,12 @@
"sync"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/naming"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/naming"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
- vnamespace "v.io/veyron/veyron/runtimes/google/naming/namespace"
+ vnamespace "v.io/core/veyron/runtimes/google/naming/namespace"
)
// 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 afbdf26..694d3d7 100644
--- a/runtimes/google/testing/mocks/runtime/panic_runtime.go
+++ b/runtimes/google/testing/mocks/runtime/panic_runtime.go
@@ -1,16 +1,16 @@
package runtime
import (
- "v.io/veyron/veyron2"
- "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/security"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2"
+ "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/security"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vtrace"
)
// PanicRuntime is a dummy implementation of veyron2.Runtime that panics on every
diff --git a/runtimes/google/vtrace/collector.go b/runtimes/google/vtrace/collector.go
index 9567963..aed4e01 100644
--- a/runtimes/google/vtrace/collector.go
+++ b/runtimes/google/vtrace/collector.go
@@ -4,9 +4,9 @@
"sync"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vtrace"
)
func copySpanRecord(in *vtrace.SpanRecord) *vtrace.SpanRecord {
diff --git a/runtimes/google/vtrace/store.go b/runtimes/google/vtrace/store.go
index bfc4dda..5d06804 100644
--- a/runtimes/google/vtrace/store.go
+++ b/runtimes/google/vtrace/store.go
@@ -3,8 +3,8 @@
import (
"sync"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vtrace"
)
// Store implements a store for traces. The idea is to keep all the
diff --git a/runtimes/google/vtrace/store_test.go b/runtimes/google/vtrace/store_test.go
index 79ace57..6d76557 100644
--- a/runtimes/google/vtrace/store_test.go
+++ b/runtimes/google/vtrace/store_test.go
@@ -5,8 +5,8 @@
"reflect"
"testing"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vtrace"
)
var nextid = uint64(1)
diff --git a/runtimes/google/vtrace/vtrace.go b/runtimes/google/vtrace/vtrace.go
index 1e58b46..9f4c357 100644
--- a/runtimes/google/vtrace/vtrace.go
+++ b/runtimes/google/vtrace/vtrace.go
@@ -7,10 +7,10 @@
"fmt"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/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 c0a1e01..8fc9cf9 100644
--- a/runtimes/google/vtrace/vtrace_test.go
+++ b/runtimes/google/vtrace/vtrace_test.go
@@ -5,20 +5,20 @@
"strings"
"testing"
- "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/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/vlog"
+ "v.io/core/veyron2/vtrace"
- "v.io/veyron/veyron/profiles"
- iipc "v.io/veyron/veyron/runtimes/google/ipc"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/manager"
- tnaming "v.io/veyron/veyron/runtimes/google/testing/mocks/naming"
- truntime "v.io/veyron/veyron/runtimes/google/testing/mocks/runtime"
- ivtrace "v.io/veyron/veyron/runtimes/google/vtrace"
+ "v.io/core/veyron/profiles"
+ iipc "v.io/core/veyron/runtimes/google/ipc"
+ "v.io/core/veyron/runtimes/google/ipc/stream/manager"
+ tnaming "v.io/core/veyron/runtimes/google/testing/mocks/naming"
+ truntime "v.io/core/veyron/runtimes/google/testing/mocks/runtime"
+ ivtrace "v.io/core/veyron/runtimes/google/vtrace"
)
// We need a special way to create contexts for tests. We
