Reorganization of VANADIUM_ROOT relative paths.
diff --git a/services/wsprd/account/account.go b/services/wsprd/account/account.go
index 358c49e..a6e71f3 100644
--- a/services/wsprd/account/account.go
+++ b/services/wsprd/account/account.go
@@ -6,10 +6,10 @@
"strings"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
"v.io/wspr/veyron/services/wsprd/principal"
)
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index 9eef5ef..de495a8 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -10,16 +10,16 @@
"sync"
"time"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/ipc/server"
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/namespace"
@@ -27,7 +27,7 @@
)
// pkgPath is the prefix os errors in this package.
-const pkgPath = "v.io/veyron/veyron/services/wsprd/app"
+const pkgPath = "v.io/core/veyron/services/wsprd/app"
// Errors
var (
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 38f79c5..68b12fb 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -6,23 +6,23 @@
"reflect"
"testing"
- "v.io/veyron/veyron2"
- "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"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2"
+ "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"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror2"
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/lib/testwriter"
- tsecurity "v.io/veyron/veyron/lib/testutil/security"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- vsecurity "v.io/veyron/veyron/security"
- mounttable "v.io/veyron/veyron/services/mounttable/lib"
+ tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+ vsecurity "v.io/core/veyron/security"
+ mounttable "v.io/core/veyron/services/mounttable/lib"
)
var (
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index 996e66e..8b6eecd 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -6,9 +6,9 @@
"path/filepath"
"runtime"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
- "v.io/veyron/veyron2/vom2"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
+ "v.io/core/veyron2/vom2"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/app/mock_jsServer_test.go b/services/wsprd/app/mock_jsServer_test.go
index ef70c5f..13a49cc 100644
--- a/services/wsprd/app/mock_jsServer_test.go
+++ b/services/wsprd/app/mock_jsServer_test.go
@@ -8,7 +8,7 @@
"sync"
"testing"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
"v.io/wspr/veyron/services/wsprd/ipc/server"
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/principal"
@@ -57,7 +57,7 @@
func internalErrJSON(args interface{}) string {
return fmt.Sprintf(`{"err": {
"idAction": {
- "id": "v.io/veyron/veyron2/verror.Internal",
+ "id": "v.io/core/veyron2/verror.Internal",
"action": 0
},
"paramList": ["%v"]}, "results":[null]}`, args)
diff --git a/services/wsprd/app/stream.go b/services/wsprd/app/stream.go
index 268635a..02f27e3 100644
--- a/services/wsprd/app/stream.go
+++ b/services/wsprd/app/stream.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/vdl"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/browspr/browspr.go b/services/wsprd/browspr/browspr.go
index e0226c1..7d9f6b3 100644
--- a/services/wsprd/browspr/browspr.go
+++ b/services/wsprd/browspr/browspr.go
@@ -5,11 +5,11 @@
"fmt"
"sync"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/valconv"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/valconv"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/account"
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/namespace"
diff --git a/services/wsprd/browspr/browspr_account_test.go b/services/wsprd/browspr/browspr_account_test.go
index d43a651..d5b47b8 100644
--- a/services/wsprd/browspr/browspr_account_test.go
+++ b/services/wsprd/browspr/browspr_account_test.go
@@ -4,14 +4,14 @@
"fmt"
"testing"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/valconv"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/valconv"
- "v.io/veyron/veyron/profiles"
+ "v.io/core/veyron/profiles"
)
const topLevelName = "mock-blesser"
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index c01e8d3..cb29fd4 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -6,15 +6,15 @@
"strings"
"testing"
- "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- mounttable "v.io/veyron/veyron/services/mounttable/lib"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/profiles"
+ "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
+ mounttable "v.io/core/veyron/services/mounttable/lib"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/app"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/browspr/main/main_nacl.go b/services/wsprd/browspr/main/main_nacl.go
index 629e7fc..c98ff67 100644
--- a/services/wsprd/browspr/main/main_nacl.go
+++ b/services/wsprd/browspr/main/main_nacl.go
@@ -7,16 +7,16 @@
"fmt"
"runtime/ppapi"
- "v.io/veyron/veyron/lib/websocket"
- "v.io/veyron/veyron/profiles/chrome"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/valconv"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron/lib/websocket"
+ "v.io/core/veyron/profiles/chrome"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/valconv"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/browspr"
"v.io/wspr/veyron/services/wsprd/channel/channel_nacl"
"v.io/wspr/veyron/services/wsprd/lib"
@@ -142,7 +142,7 @@
}
// Copied from
-// v.io/veyron/veyron/services/identity/handlers/blessing_root.go, since
+// v.io/core/veyron/services/identity/handlers/blessing_root.go, since
// depcop prohibits importing that package.
type blessingRoot struct {
Names []string `json:"names"`
diff --git a/services/wsprd/browspr/pipe.go b/services/wsprd/browspr/pipe.go
index 323af6f..83e8b90 100644
--- a/services/wsprd/browspr/pipe.go
+++ b/services/wsprd/browspr/pipe.go
@@ -4,8 +4,8 @@
"encoding/json"
"fmt"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/options"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/options"
"v.io/wspr/veyron/services/wsprd/app"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/channel/channel.vdl.go b/services/wsprd/channel/channel.vdl.go
index cfa3990..84f1821 100644
--- a/services/wsprd/channel/channel.vdl.go
+++ b/services/wsprd/channel/channel.vdl.go
@@ -5,8 +5,8 @@
import (
// The non-user imports are prefixed with "__" to prevent collisions.
- __vdl "v.io/veyron/veyron2/vdl"
- __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
+ __vdl "v.io/core/veyron2/vdl"
+ __vdlutil "v.io/core/veyron2/vdl/vdlutil"
)
type Request struct {
diff --git a/services/wsprd/channel/channel_nacl/channel_nacl.go b/services/wsprd/channel/channel_nacl/channel_nacl.go
index 186e1ca..d2cc1d0 100644
--- a/services/wsprd/channel/channel_nacl/channel_nacl.go
+++ b/services/wsprd/channel/channel_nacl/channel_nacl.go
@@ -5,9 +5,9 @@
"fmt"
"runtime/ppapi"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/valconv"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/valconv"
+ "v.io/core/veyron2/vom2"
"v.io/wspr/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
)
diff --git a/services/wsprd/ipc/server/authorizer.go b/services/wsprd/ipc/server/authorizer.go
index 5809e50..e9e0e77 100644
--- a/services/wsprd/ipc/server/authorizer.go
+++ b/services/wsprd/ipc/server/authorizer.go
@@ -1,7 +1,7 @@
package server
import (
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
)
type authorizer struct {
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index 94a0e18..d6017de 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -7,11 +7,11 @@
"v.io/wspr/veyron/services/wsprd/lib"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
type flowFactory interface {
diff --git a/services/wsprd/ipc/server/dispatcher_test.go b/services/wsprd/ipc/server/dispatcher_test.go
index c99b28b..0d5cacd 100644
--- a/services/wsprd/ipc/server/dispatcher_test.go
+++ b/services/wsprd/ipc/server/dispatcher_test.go
@@ -5,11 +5,11 @@
"reflect"
"testing"
- _ "v.io/veyron/veyron/profiles"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ _ "v.io/core/veyron/profiles"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/lib/testwriter"
)
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index 8be9db9..d9abcc6 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -1,10 +1,10 @@
package server
import (
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- verror "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ verror "v.io/core/veyron2/verror2"
)
var typedNil []int
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 28b2f2e..e5fad46 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -10,12 +10,12 @@
"v.io/wspr/veyron/services/wsprd/lib"
"v.io/wspr/veyron/services/wsprd/principal"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
)
type Flow struct {
diff --git a/services/wsprd/lib/remove_this.go b/services/wsprd/lib/remove_this.go
index 3e415d9..fd69142 100644
--- a/services/wsprd/lib/remove_this.go
+++ b/services/wsprd/lib/remove_this.go
@@ -8,9 +8,9 @@
// roadmap_watchtypes "v.io/store/veyron2/services/watch/types"
// "v.io/store/veyron2/storage"
- "v.io/veyron/veyron2/naming"
- watchtypes "v.io/veyron/veyron2/services/watch/types"
- "v.io/veyron/veyron2/vom"
+ "v.io/core/veyron2/naming"
+ watchtypes "v.io/core/veyron2/services/watch/types"
+ "v.io/core/veyron2/vom"
)
func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index 70d6915..9b59293 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -4,11 +4,11 @@
"sync"
"time"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/ipc/reserved"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/ipc/reserved"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/core/veyron2/verror2"
)
type SignatureManager interface {
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index e6bd68e..7dc519c 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- _ "v.io/veyron/veyron/profiles"
- mocks_ipc "v.io/veyron/veyron/runtimes/google/testing/mocks/ipc"
- "v.io/veyron/veyron2/rt"
- "v.io/veyron/veyron2/vdl"
- "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ _ "v.io/core/veyron/profiles"
+ mocks_ipc "v.io/core/veyron/runtimes/google/testing/mocks/ipc"
+ "v.io/core/veyron2/rt"
+ "v.io/core/veyron2/vdl"
+ "v.io/core/veyron2/vdl/vdlroot/src/signature"
)
const (
diff --git a/services/wsprd/lib/testwriter/writer.go b/services/wsprd/lib/testwriter/writer.go
index 7f27a3f..76ea22d 100644
--- a/services/wsprd/lib/testwriter/writer.go
+++ b/services/wsprd/lib/testwriter/writer.go
@@ -8,7 +8,7 @@
"sync"
"time"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/verror2"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/lib/time.go b/services/wsprd/lib/time.go
index 1937912..97da91e 100644
--- a/services/wsprd/lib/time.go
+++ b/services/wsprd/lib/time.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/veyron/veyron2/ipc"
+ "v.io/core/veyron2/ipc"
)
const nanosecondsPerMillisecond = 1000000
diff --git a/services/wsprd/lib/vom.go b/services/wsprd/lib/vom.go
index b73892c..be68df3 100644
--- a/services/wsprd/lib/vom.go
+++ b/services/wsprd/lib/vom.go
@@ -4,7 +4,7 @@
"bytes"
"encoding/hex"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/vom2"
)
func VomEncode(v interface{}) (string, error) {
diff --git a/services/wsprd/lib/ws_endpoint.go b/services/wsprd/lib/ws_endpoint.go
index 9f5db9b..9177c96 100644
--- a/services/wsprd/lib/ws_endpoint.go
+++ b/services/wsprd/lib/ws_endpoint.go
@@ -4,8 +4,8 @@
"fmt"
"regexp"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/naming"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/naming"
)
// Turns a list of names into a list of names that use the "ws" protocol.
diff --git a/services/wsprd/lib/ws_endpoint_test.go b/services/wsprd/lib/ws_endpoint_test.go
index 0f0a5d1..7299f5c 100644
--- a/services/wsprd/lib/ws_endpoint_test.go
+++ b/services/wsprd/lib/ws_endpoint_test.go
@@ -2,7 +2,7 @@
import (
"testing"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2/rt"
)
func TestWsNames(t *testing.T) {
diff --git a/services/wsprd/namespace/request_handler.go b/services/wsprd/namespace/request_handler.go
index 83506d9..0d75a5d 100644
--- a/services/wsprd/namespace/request_handler.go
+++ b/services/wsprd/namespace/request_handler.go
@@ -4,10 +4,10 @@
"encoding/json"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/verror2"
"v.io/wspr/veyron/services/wsprd/lib"
)
diff --git a/services/wsprd/principal/blessings.go b/services/wsprd/principal/blessings.go
index 27862c7..97ea583 100644
--- a/services/wsprd/principal/blessings.go
+++ b/services/wsprd/principal/blessings.go
@@ -2,7 +2,7 @@
import (
"encoding/base64"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
)
type BlessingsHandle struct {
diff --git a/services/wsprd/principal/js_blessings_store.go b/services/wsprd/principal/js_blessings_store.go
index b357d22..d427e7f 100644
--- a/services/wsprd/principal/js_blessings_store.go
+++ b/services/wsprd/principal/js_blessings_store.go
@@ -3,7 +3,7 @@
import (
"sync"
- "v.io/veyron/veyron2/security"
+ "v.io/core/veyron2/security"
)
// JSBlessingsHandles is a store for Blessings in use by JS code.
diff --git a/services/wsprd/principal/principal.go b/services/wsprd/principal/principal.go
index 6428216..e331cdf 100644
--- a/services/wsprd/principal/principal.go
+++ b/services/wsprd/principal/principal.go
@@ -33,12 +33,12 @@
"net/url"
"sync"
- vsecurity "v.io/veyron/veyron/security"
- "v.io/veyron/veyron/security/serialization"
+ vsecurity "v.io/core/veyron/security"
+ "v.io/core/veyron/security/serialization"
- "v.io/veyron/veyron2/security"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/security"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vom2"
)
// permissions is a set of a permissions given to an app, containing the account
diff --git a/services/wsprd/principal/principal_test.go b/services/wsprd/principal/principal_test.go
index e8f36ea..f9b4b80 100644
--- a/services/wsprd/principal/principal_test.go
+++ b/services/wsprd/principal/principal_test.go
@@ -7,9 +7,9 @@
"reflect"
"testing"
- "v.io/veyron/veyron2/security"
- verror "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vom2"
+ "v.io/core/veyron2/security"
+ verror "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vom2"
)
func accountBlessing(p security.Principal, name string) security.Blessings {
diff --git a/services/wsprd/principal/util_test.go b/services/wsprd/principal/util_test.go
index 52a3130..6fd85ec 100644
--- a/services/wsprd/principal/util_test.go
+++ b/services/wsprd/principal/util_test.go
@@ -4,11 +4,11 @@
"fmt"
"strings"
- vsecurity "v.io/veyron/veyron/security"
+ vsecurity "v.io/core/veyron/security"
- "v.io/veyron/veyron2/security"
- "v.io/veyron/veyron2/verror"
- "v.io/veyron/veyron2/verror2"
+ "v.io/core/veyron2/security"
+ "v.io/core/veyron2/verror"
+ "v.io/core/veyron2/verror2"
)
func newPrincipal() security.Principal {
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index da227fa..340489d 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -3,11 +3,11 @@
import (
"flag"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2/rt"
- "v.io/veyron/veyron/lib/signals"
+ "v.io/core/veyron/lib/signals"
// TODO(cnicolaou,benj): figure out how to support roaming as a chrome plugin
- "v.io/veyron/veyron/profiles/roaming"
+ "v.io/core/veyron/profiles/roaming"
"v.io/wspr/veyron/services/wsprd/wspr"
)
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index 0ce3812..b70680f 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -8,9 +8,9 @@
_ "net/http/pprof"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/options"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/options"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/app"
"v.io/wspr/veyron/services/wsprd/lib"
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index f93975e..17377ac 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -7,8 +7,8 @@
"v.io/wspr/veyron/services/wsprd/lib"
- "v.io/veyron/veyron2/verror2"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2/verror2"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/app"
"github.com/gorilla/websocket"
diff --git a/services/wsprd/wspr/wspr.go b/services/wsprd/wspr/wspr.go
index 614bb72..821309d 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -25,9 +25,9 @@
"sync"
"time"
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/ipc"
- "v.io/veyron/veyron2/vlog"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/ipc"
+ "v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/account"
"v.io/wspr/veyron/services/wsprd/principal"
