Replacing veyron.io with v.io.
diff --git a/services/wsprd/account/account.go b/services/wsprd/account/account.go
index 6c09071..358c49e 100644
--- a/services/wsprd/account/account.go
+++ b/services/wsprd/account/account.go
@@ -6,11 +6,11 @@
"strings"
"time"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/context"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/veyron2/context"
+ "v.io/veyron/veyron2/ipc"
+ "v.io/veyron/veyron2/security"
+ "v.io/wspr/veyron/services/wsprd/principal"
)
type BlesserService interface {
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index 6c984ee..9eef5ef 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -10,24 +10,24 @@
"sync"
"time"
- vsecurity "veyron.io/veyron/veyron/security"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/context"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/ipc/server"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/namespace"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ 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"
+ "v.io/wspr/veyron/services/wsprd/ipc/server"
+ "v.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/namespace"
+ "v.io/wspr/veyron/services/wsprd/principal"
)
// pkgPath is the prefix os errors in this package.
-const pkgPath = "veyron.io/veyron/veyron/services/wsprd/app"
+const pkgPath = "v.io/veyron/veyron/services/wsprd/app"
// Errors
var (
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 7e5ba70..38f79c5 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -6,23 +6,23 @@
"reflect"
"testing"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/naming"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/lib/testwriter"
+ "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/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/lib/testwriter"
- tsecurity "veyron.io/veyron/veyron/lib/testutil/security"
- "veyron.io/veyron/veyron/profiles"
- "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- vsecurity "veyron.io/veyron/veyron/security"
- mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
+ 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"
)
var (
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index cf2e23e..996e66e 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -6,14 +6,14 @@
"path/filepath"
"runtime"
- verror "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/veyron/veyron2/vom2"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ verror "v.io/veyron/veyron2/verror2"
+ "v.io/veyron/veyron2/vlog"
+ "v.io/veyron/veyron2/vom2"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
const (
- verrorPkgPath = "veyron.io/wspr/veyron/services/wsprd/app"
+ verrorPkgPath = "v.io/wspr/veyron/services/wsprd/app"
)
var (
diff --git a/services/wsprd/app/mock_jsServer_test.go b/services/wsprd/app/mock_jsServer_test.go
index 02c54f9..ef70c5f 100644
--- a/services/wsprd/app/mock_jsServer_test.go
+++ b/services/wsprd/app/mock_jsServer_test.go
@@ -8,10 +8,10 @@
"sync"
"testing"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/wspr/veyron/services/wsprd/ipc/server"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ "v.io/veyron/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"
)
type mockJSServer struct {
@@ -57,7 +57,7 @@
func internalErrJSON(args interface{}) string {
return fmt.Sprintf(`{"err": {
"idAction": {
- "id": "veyron.io/veyron/veyron2/verror.Internal",
+ "id": "v.io/veyron/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 f1fa4ff..268635a 100644
--- a/services/wsprd/app/stream.go
+++ b/services/wsprd/app/stream.go
@@ -3,9 +3,9 @@
import (
"fmt"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/veyron/veyron2/ipc"
+ "v.io/veyron/veyron2/vdl"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
type initConfig struct {
diff --git a/services/wsprd/browspr/browspr.go b/services/wsprd/browspr/browspr.go
index 4dfbf6a..e0226c1 100644
--- a/services/wsprd/browspr/browspr.go
+++ b/services/wsprd/browspr/browspr.go
@@ -5,15 +5,15 @@
"fmt"
"sync"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/valconv"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/account"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/namespace"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ "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/wspr/veyron/services/wsprd/account"
+ "v.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/namespace"
+ "v.io/wspr/veyron/services/wsprd/principal"
)
func init() {
diff --git a/services/wsprd/browspr/browspr_account_test.go b/services/wsprd/browspr/browspr_account_test.go
index 7eefaf1..d43a651 100644
--- a/services/wsprd/browspr/browspr_account_test.go
+++ b/services/wsprd/browspr/browspr_account_test.go
@@ -4,14 +4,14 @@
"fmt"
"testing"
- "veyron.io/veyron/veyron2/context"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/valconv"
+ "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"
- "veyron.io/veyron/veyron/profiles"
+ "v.io/veyron/veyron/profiles"
)
const topLevelName = "mock-blesser"
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index da16e1a..c01e8d3 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -6,17 +6,17 @@
"strings"
"testing"
- "veyron.io/veyron/veyron/profiles"
- "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
- mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/naming"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/app"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "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/wspr/veyron/services/wsprd/app"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
var r veyron2.Runtime
diff --git a/services/wsprd/browspr/main/main_nacl.go b/services/wsprd/browspr/main/main_nacl.go
index 4f8e955..629e7fc 100644
--- a/services/wsprd/browspr/main/main_nacl.go
+++ b/services/wsprd/browspr/main/main_nacl.go
@@ -7,19 +7,19 @@
"fmt"
"runtime/ppapi"
- "veyron.io/veyron/veyron/lib/websocket"
- "veyron.io/veyron/veyron/profiles/chrome"
- vsecurity "veyron.io/veyron/veyron/security"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/valconv"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/browspr"
- "veyron.io/wspr/veyron/services/wsprd/channel/channel_nacl"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "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/wspr/veyron/services/wsprd/browspr"
+ "v.io/wspr/veyron/services/wsprd/channel/channel_nacl"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
func main() {
@@ -142,7 +142,7 @@
}
// Copied from
-// veyron.io/veyron/veyron/services/identity/handlers/blessing_root.go, since
+// v.io/veyron/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 ab42047..323af6f 100644
--- a/services/wsprd/browspr/pipe.go
+++ b/services/wsprd/browspr/pipe.go
@@ -4,10 +4,10 @@
"encoding/json"
"fmt"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/wspr/veyron/services/wsprd/app"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/veyron2/options"
+ "v.io/wspr/veyron/services/wsprd/app"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
// pipe controls the flow of messages for a specific instance (corresponding to a specific tab).
diff --git a/services/wsprd/browspr/writer.go b/services/wsprd/browspr/writer.go
index 6e464d2..a037f16 100644
--- a/services/wsprd/browspr/writer.go
+++ b/services/wsprd/browspr/writer.go
@@ -1,8 +1,8 @@
package browspr
import (
- "veyron.io/wspr/veyron/services/wsprd/app"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/app"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
// postMessageWriter is a lib.ClientWriter that handles sending messages over postMessage to the extension.
diff --git a/services/wsprd/channel/channel.vdl.go b/services/wsprd/channel/channel.vdl.go
index 461c694..cfa3990 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 "veyron.io/veyron/veyron2/vdl"
- __vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ __vdl "v.io/veyron/veyron2/vdl"
+ __vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
)
type Request struct {
@@ -16,7 +16,7 @@
}
func (Request) __VDLReflect(struct {
- Name string "veyron.io/wspr/veyron/services/wsprd/channel.Request"
+ Name string "v.io/wspr/veyron/services/wsprd/channel.Request"
}) {
}
@@ -27,7 +27,7 @@
}
func (Response) __VDLReflect(struct {
- Name string "veyron.io/wspr/veyron/services/wsprd/channel.Response"
+ Name string "v.io/wspr/veyron/services/wsprd/channel.Response"
}) {
}
@@ -49,7 +49,7 @@
MessageResponse struct{ Value Response }
// __MessageReflect describes the Message union type.
__MessageReflect struct {
- Name string "veyron.io/wspr/veyron/services/wsprd/channel.Message"
+ Name string "v.io/wspr/veyron/services/wsprd/channel.Message"
Type Message
Union struct {
Request MessageRequest
diff --git a/services/wsprd/channel/channel_nacl/channel_nacl.go b/services/wsprd/channel/channel_nacl/channel_nacl.go
index 4c7c830..186e1ca 100644
--- a/services/wsprd/channel/channel_nacl/channel_nacl.go
+++ b/services/wsprd/channel/channel_nacl/channel_nacl.go
@@ -5,10 +5,10 @@
"fmt"
"runtime/ppapi"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/valconv"
- "veyron.io/veyron/veyron2/vom2"
- "veyron.io/wspr/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
+ "v.io/veyron/veyron2/vdl"
+ "v.io/veyron/veyron2/vdl/valconv"
+ "v.io/veyron/veyron2/vom2"
+ "v.io/wspr/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
)
type Channel struct {
diff --git a/services/wsprd/channel/channel_test.go b/services/wsprd/channel/channel_test.go
index 1d0eb26..8139f65 100644
--- a/services/wsprd/channel/channel_test.go
+++ b/services/wsprd/channel/channel_test.go
@@ -4,7 +4,7 @@
"fmt"
"sync"
"testing"
- "veyron.io/wspr/veyron/services/wsprd/channel"
+ "v.io/wspr/veyron/services/wsprd/channel"
)
func TestChannelRpcs(t *testing.T) {
diff --git a/services/wsprd/ipc/server/authorizer.go b/services/wsprd/ipc/server/authorizer.go
index 52046ee..5809e50 100644
--- a/services/wsprd/ipc/server/authorizer.go
+++ b/services/wsprd/ipc/server/authorizer.go
@@ -1,7 +1,7 @@
package server
import (
- "veyron.io/veyron/veyron2/security"
+ "v.io/veyron/veyron2/security"
)
type authorizer struct {
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index 2628338..94a0e18 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -5,13 +5,13 @@
"encoding/json"
"sync"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vlog"
+ "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"
)
type flowFactory interface {
diff --git a/services/wsprd/ipc/server/dispatcher_test.go b/services/wsprd/ipc/server/dispatcher_test.go
index 8b8e521..c99b28b 100644
--- a/services/wsprd/ipc/server/dispatcher_test.go
+++ b/services/wsprd/ipc/server/dispatcher_test.go
@@ -5,13 +5,13 @@
"reflect"
"testing"
- _ "veyron.io/veyron/veyron/profiles"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/lib/testwriter"
+ _ "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/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/lib/testwriter"
)
type mockFlowFactory struct {
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index 8932d1e..8be9db9 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -1,15 +1,15 @@
package server
import (
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- verror "veyron.io/veyron/veyron2/verror2"
+ "v.io/veyron/veyron2/ipc"
+ "v.io/veyron/veyron2/vdl"
+ "v.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ verror "v.io/veyron/veyron2/verror2"
)
var typedNil []int
-const pkgPath = "veyron.io/wspr/veyron/services/wsprd/ipc/server"
+const pkgPath = "v.io/wspr/veyron/services/wsprd/ipc/server"
// Errors.
var (
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 527af12..28b2f2e 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -7,15 +7,15 @@
"sync"
"time"
- "veyron.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ "v.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/principal"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vlog"
+ "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"
)
type Flow struct {
diff --git a/services/wsprd/lib/remove_this.go b/services/wsprd/lib/remove_this.go
index a9dd31f..3e415d9 100644
--- a/services/wsprd/lib/remove_this.go
+++ b/services/wsprd/lib/remove_this.go
@@ -3,14 +3,14 @@
import (
// Any non-release package imports are not allowed to make
// sure the repository can be downloaded using "go get".
- // rps "veyron.io/examples/rockpaperscissors"
- // "veyron.io/store/veyron2/services/store"
- // roadmap_watchtypes "veyron.io/store/veyron2/services/watch/types"
- // "veyron.io/store/veyron2/storage"
+ // rps "v.io/examples/rockpaperscissors"
+ // "v.io/store/veyron2/services/store"
+ // roadmap_watchtypes "v.io/store/veyron2/services/watch/types"
+ // "v.io/store/veyron2/storage"
- "veyron.io/veyron/veyron2/naming"
- watchtypes "veyron.io/veyron/veyron2/services/watch/types"
- "veyron.io/veyron/veyron2/vom"
+ "v.io/veyron/veyron2/naming"
+ watchtypes "v.io/veyron/veyron2/services/watch/types"
+ "v.io/veyron/veyron2/vom"
)
func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index 9a2856d..70d6915 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -4,11 +4,11 @@
"sync"
"time"
- "veyron.io/veyron/veyron2/context"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/ipc/reserved"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
- "veyron.io/veyron/veyron2/verror2"
+ "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"
)
type SignatureManager interface {
@@ -47,7 +47,7 @@
return time.Now().Sub(c.lastAccessed) > ttl
}
-const pkgPath = "veyron.io/wspr/veyron/services/wsprd/lib"
+const pkgPath = "v.io/wspr/veyron/services/wsprd/lib"
// Signature uses the given client to fetch the signature for the given service
// name. It either returns the signature from the cache, or blocks until it
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index a6874ea..e6bd68e 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- _ "veyron.io/veyron/veyron/profiles"
- mocks_ipc "veyron.io/veyron/veyron/runtimes/google/testing/mocks/ipc"
- "veyron.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron2/vdl"
- "veyron.io/veyron/veyron2/vdl/vdlroot/src/signature"
+ _ "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"
)
const (
diff --git a/services/wsprd/lib/testwriter/writer.go b/services/wsprd/lib/testwriter/writer.go
index f0766cc..7f27a3f 100644
--- a/services/wsprd/lib/testwriter/writer.go
+++ b/services/wsprd/lib/testwriter/writer.go
@@ -8,8 +8,8 @@
"sync"
"time"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/veyron/veyron2/verror2"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
type TestHarness interface {
diff --git a/services/wsprd/lib/time.go b/services/wsprd/lib/time.go
index c9f89d3..1937912 100644
--- a/services/wsprd/lib/time.go
+++ b/services/wsprd/lib/time.go
@@ -3,7 +3,7 @@
import (
"time"
- "veyron.io/veyron/veyron2/ipc"
+ "v.io/veyron/veyron2/ipc"
)
const nanosecondsPerMillisecond = 1000000
diff --git a/services/wsprd/lib/vom.go b/services/wsprd/lib/vom.go
index 493376d..b73892c 100644
--- a/services/wsprd/lib/vom.go
+++ b/services/wsprd/lib/vom.go
@@ -4,7 +4,7 @@
"bytes"
"encoding/hex"
- "veyron.io/veyron/veyron2/vom2"
+ "v.io/veyron/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 d839948..9f5db9b 100644
--- a/services/wsprd/lib/ws_endpoint.go
+++ b/services/wsprd/lib/ws_endpoint.go
@@ -4,8 +4,8 @@
"fmt"
"regexp"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/naming"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/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 ccab819..0f0a5d1 100644
--- a/services/wsprd/lib/ws_endpoint_test.go
+++ b/services/wsprd/lib/ws_endpoint_test.go
@@ -2,7 +2,7 @@
import (
"testing"
- "veyron.io/veyron/veyron2/rt"
+ "v.io/veyron/veyron2/rt"
)
func TestWsNames(t *testing.T) {
diff --git a/services/wsprd/namespace/request_handler.go b/services/wsprd/namespace/request_handler.go
index 4a31b43..83506d9 100644
--- a/services/wsprd/namespace/request_handler.go
+++ b/services/wsprd/namespace/request_handler.go
@@ -4,12 +4,12 @@
"encoding/json"
"time"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/context"
- "veyron.io/veyron/veyron2/naming"
- "veyron.io/veyron/veyron2/verror2"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/veyron2/context"
+ "v.io/veyron/veyron2/naming"
+ "v.io/veyron/veyron2/verror2"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/lib"
)
// Function to format endpoints. Used by browspr to swap 'tcp' for 'ws'.
diff --git a/services/wsprd/principal/blessings.go b/services/wsprd/principal/blessings.go
index 020ea57..27862c7 100644
--- a/services/wsprd/principal/blessings.go
+++ b/services/wsprd/principal/blessings.go
@@ -2,7 +2,7 @@
import (
"encoding/base64"
- "veyron.io/veyron/veyron2/security"
+ "v.io/veyron/veyron2/security"
)
type BlessingsHandle struct {
diff --git a/services/wsprd/principal/js_blessings_store.go b/services/wsprd/principal/js_blessings_store.go
index 917432e..b357d22 100644
--- a/services/wsprd/principal/js_blessings_store.go
+++ b/services/wsprd/principal/js_blessings_store.go
@@ -3,7 +3,7 @@
import (
"sync"
- "veyron.io/veyron/veyron2/security"
+ "v.io/veyron/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 4c0b0de..6428216 100644
--- a/services/wsprd/principal/principal.go
+++ b/services/wsprd/principal/principal.go
@@ -33,12 +33,12 @@
"net/url"
"sync"
- vsecurity "veyron.io/veyron/veyron/security"
- "veyron.io/veyron/veyron/security/serialization"
+ vsecurity "v.io/veyron/veyron/security"
+ "v.io/veyron/veyron/security/serialization"
- "veyron.io/veyron/veyron2/security"
- verror "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vom2"
+ "v.io/veyron/veyron2/security"
+ verror "v.io/veyron/veyron2/verror2"
+ "v.io/veyron/veyron2/vom2"
)
// permissions is a set of a permissions given to an app, containing the account
@@ -62,7 +62,7 @@
Accounts map[string]security.WireBlessings
}
-const pkgPath = "veyron.io/wspr/veyron/services/wsprd/principal"
+const pkgPath = "v.io/wspr/veyron/services/wsprd/principal"
// Errors.
var (
diff --git a/services/wsprd/principal/principal_test.go b/services/wsprd/principal/principal_test.go
index f27157e..e8f36ea 100644
--- a/services/wsprd/principal/principal_test.go
+++ b/services/wsprd/principal/principal_test.go
@@ -7,9 +7,9 @@
"reflect"
"testing"
- "veyron.io/veyron/veyron2/security"
- verror "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vom2"
+ "v.io/veyron/veyron2/security"
+ verror "v.io/veyron/veyron2/verror2"
+ "v.io/veyron/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 c8c989e..52a3130 100644
--- a/services/wsprd/principal/util_test.go
+++ b/services/wsprd/principal/util_test.go
@@ -4,11 +4,11 @@
"fmt"
"strings"
- vsecurity "veyron.io/veyron/veyron/security"
+ vsecurity "v.io/veyron/veyron/security"
- "veyron.io/veyron/veyron2/security"
- "veyron.io/veyron/veyron2/verror"
- "veyron.io/veyron/veyron2/verror2"
+ "v.io/veyron/veyron2/security"
+ "v.io/veyron/veyron2/verror"
+ "v.io/veyron/veyron2/verror2"
)
func newPrincipal() security.Principal {
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index df661e8..da227fa 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -3,12 +3,12 @@
import (
"flag"
- "veyron.io/veyron/veyron2/rt"
+ "v.io/veyron/veyron2/rt"
- "veyron.io/veyron/veyron/lib/signals"
+ "v.io/veyron/veyron/lib/signals"
// TODO(cnicolaou,benj): figure out how to support roaming as a chrome plugin
- "veyron.io/veyron/veyron/profiles/roaming"
- "veyron.io/wspr/veyron/services/wsprd/wspr"
+ "v.io/veyron/veyron/profiles/roaming"
+ "v.io/wspr/veyron/services/wsprd/wspr"
)
func main() {
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index faa8670..0ce3812 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -8,11 +8,11 @@
_ "net/http/pprof"
"time"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/options"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/app"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/veyron2/options"
+ "v.io/veyron/veyron2/vlog"
+ "v.io/wspr/veyron/services/wsprd/app"
+ "v.io/wspr/veyron/services/wsprd/lib"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index ebbc27b..f93975e 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -5,11 +5,11 @@
"path/filepath"
"runtime"
- "veyron.io/wspr/veyron/services/wsprd/lib"
+ "v.io/wspr/veyron/services/wsprd/lib"
- "veyron.io/veyron/veyron2/verror2"
- "veyron.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/app"
+ "v.io/veyron/veyron2/verror2"
+ "v.io/veyron/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 8a29f46..614bb72 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -25,12 +25,12 @@
"sync"
"time"
- "veyron.io/veyron/veyron2"
- "veyron.io/veyron/veyron2/ipc"
- "veyron.io/veyron/veyron2/vlog"
+ "v.io/veyron/veyron2"
+ "v.io/veyron/veyron2/ipc"
+ "v.io/veyron/veyron2/vlog"
- "veyron.io/wspr/veyron/services/wsprd/account"
- "veyron.io/wspr/veyron/services/wsprd/principal"
+ "v.io/wspr/veyron/services/wsprd/account"
+ "v.io/wspr/veyron/services/wsprd/principal"
)
const (
