updating the veyron import paths
Change-Id: I5ecfec3cb57cb3825d1b53c0cbb3a672190d0923
diff --git a/services/config/lib/config.go b/services/config/lib/config.go
index 2e11c38..5712d36 100644
--- a/services/config/lib/config.go
+++ b/services/config/lib/config.go
@@ -17,8 +17,8 @@
"strings"
"sync"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
"code.google.com/p/mdns"
"code.google.com/p/mdns/go_dns"
diff --git a/services/identity/auditor/file.go b/services/identity/auditor/file.go
index f5639e4..5850370 100644
--- a/services/identity/auditor/file.go
+++ b/services/identity/auditor/file.go
@@ -8,10 +8,10 @@
"sync"
"time"
- "veyron/security/audit"
- "veyron2/security/wire"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/security/wire"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
)
type fileAuditor struct {
diff --git a/services/identity/auditor/file_test.go b/services/identity/auditor/file_test.go
index 3b70537..8a98f86 100644
--- a/services/identity/auditor/file_test.go
+++ b/services/identity/auditor/file_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestFileAuditor(t *testing.T) {
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index fb35bb0..bc7e346 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -7,15 +7,15 @@
"strings"
"time"
- "veyron/services/identity"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/revocation"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/vlog"
)
type googleOAuth struct {
diff --git a/services/identity/googleoauth/handler.go b/services/identity/googleoauth/handler.go
index 596f96a..0c878ad 100644
--- a/services/identity/googleoauth/handler.go
+++ b/services/identity/googleoauth/handler.go
@@ -22,11 +22,11 @@
"code.google.com/p/goauth2/oauth"
- "veyron/services/identity/auditor"
- "veyron/services/identity/revocation"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
type HandlerArgs struct {
diff --git a/services/identity/handlers/bless.go b/services/identity/handlers/bless.go
index 10fbd77..70d43b7 100644
--- a/services/identity/handlers/bless.go
+++ b/services/identity/handlers/bless.go
@@ -5,8 +5,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
)
// Bless is an http.HandlerFunc that renders/processes a form that takes as
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/handlers/handlers_test.go
index 4793c73..3f8d6ad 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -10,10 +10,10 @@
"testing"
"time"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func TestObject(t *testing.T) {
diff --git a/services/identity/handlers/object.go b/services/identity/handlers/object.go
index 32289a7..9fd1aa0 100644
--- a/services/identity/handlers/object.go
+++ b/services/identity/handlers/object.go
@@ -3,7 +3,7 @@
import (
"net/http"
- "veyron/services/identity/util"
+ "veyron.io/veyron/veyron/services/identity/util"
)
// Object implements an http.Handler that writes out the provided object in the
diff --git a/services/identity/handlers/random.go b/services/identity/handlers/random.go
index ec84788..5a19bfd 100644
--- a/services/identity/handlers/random.go
+++ b/services/identity/handlers/random.go
@@ -6,8 +6,8 @@
"net/http"
"time"
- "veyron/services/identity/util"
- "veyron2"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2"
)
// Random is an http.Handler implementation that mints a new Veyron PrivateID
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index 1733c27..5dd2891 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -21,7 +21,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
type OAuthBlesser interface {
// BlessUsingAuthorizationCode exchanges the provided authorization code
// for an access token and then uses that access token to obtain an
@@ -34,4 +34,4 @@
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing.
BlessUsingAccessToken(token string) (blessing any, err error)
-}
\ No newline at end of file
+}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 0b4694a..93ed657 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -6,12 +6,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -37,7 +37,7 @@
// then the "any" should be replaced by:
// OneOf<wire.ChainPublicID, []wire.ChainPublicID>
// where wire is from:
-// import "veyron2/security/wire"
+// import "veyron.io/veyron/veyron2/security/wire"
// OAuthBlesser is the interface the client binds and uses.
// OAuthBlesser_ExcludingUniversal is the interface without internal framework-added methods
// to enable embedding without method collisions. Not to be used directly by clients.
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 84b752b..ea61737 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -12,23 +12,23 @@
"strings"
"time"
- "veyron/lib/signals"
- vsecurity "veyron/security"
- "veyron/security/audit"
- "veyron/services/identity/auditor"
- "veyron/services/identity/blesser"
- "veyron/services/identity/googleoauth"
- "veyron/services/identity/handlers"
- "veyron/services/identity/revocation"
- services "veyron/services/security"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/lib/signals"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/identity/auditor"
+ "veyron.io/veyron/veyron/services/identity/blesser"
+ "veyron.io/veyron/veyron/services/identity/googleoauth"
+ "veyron.io/veyron/veyron/services/identity/handlers"
+ "veyron.io/veyron/veyron/services/identity/revocation"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/identity/revocation/bless.go b/services/identity/revocation/bless.go
index d2720e6..57dcb71 100644
--- a/services/identity/revocation/bless.go
+++ b/services/identity/revocation/bless.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- vsecurity "veyron/security"
- "veyron/security/audit"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/security/audit"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
)
// Bless creates a blessing on behalf of the identity server.
diff --git a/services/identity/revocation/bless_test.go b/services/identity/revocation/bless_test.go
index 63dc2bc..6e20ad4 100644
--- a/services/identity/revocation/bless_test.go
+++ b/services/identity/revocation/bless_test.go
@@ -7,11 +7,11 @@
"testing"
"time"
- "veyron/security/audit"
- "veyron/services/security/discharger"
+ "veyron.io/veyron/veyron/security/audit"
+ "veyron.io/veyron/veyron/services/security/discharger"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
type auditor struct {
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index c9cdada..c05bd5e 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -10,10 +10,10 @@
"sync"
"time"
- "veyron/security/caveat"
- "veyron/services/identity/util"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/caveat"
+ "veyron.io/veyron/veyron/services/identity/util"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
diff --git a/services/identity/revocation/revoker_test.go b/services/identity/revocation/revoker_test.go
index 036bd37..6e440e4 100644
--- a/services/identity/revocation/revoker_test.go
+++ b/services/identity/revocation/revoker_test.go
@@ -4,13 +4,13 @@
"os"
"path/filepath"
"testing"
- services "veyron/services/security"
- "veyron/services/security/discharger"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron/services/security/discharger"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func revokerSetup(t *testing.T) (dischargerID security.PublicID, dischargerEndpoint string, revoker *RevocationManager, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/identity/util/b64vom.go b/services/identity/util/b64vom.go
index 6ed8b4a..1485cca 100644
--- a/services/identity/util/b64vom.go
+++ b/services/identity/util/b64vom.go
@@ -4,7 +4,7 @@
"bytes"
"encoding/base64"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/vom"
)
// Bas64VomEncode returns the base64 encoding of the serialization of i with
diff --git a/services/identity/util/csrf.go b/services/identity/util/csrf.go
index 516cf84..f71253d 100644
--- a/services/identity/util/csrf.go
+++ b/services/identity/util/csrf.go
@@ -10,7 +10,7 @@
"net/http"
"time"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
const cookieLen = 16
diff --git a/services/identity/util/write.go b/services/identity/util/write.go
index 07480d3..0572454 100644
--- a/services/identity/util/write.go
+++ b/services/identity/util/write.go
@@ -4,7 +4,7 @@
"html/template"
"net/http"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// HTTPSend encodes obj using VOM and writes it out to the response in base64
diff --git a/services/mgmt/application/applicationd/main.go b/services/mgmt/application/applicationd/main.go
index ed7c519..0928668 100644
--- a/services/mgmt/application/applicationd/main.go
+++ b/services/mgmt/application/applicationd/main.go
@@ -3,12 +3,12 @@
import (
"flag"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/application/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/application/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index dbf6b42..5a08493 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -1,11 +1,11 @@
package impl
import (
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the application repository dispatcher.
diff --git a/services/mgmt/application/impl/impl_test.go b/services/mgmt/application/impl/impl_test.go
index 9f1adcd..5a9f331 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -5,11 +5,11 @@
"reflect"
"testing"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// TestInterface tests that the implementation correctly implements
diff --git a/services/mgmt/application/impl/invoker.go b/services/mgmt/application/impl/invoker.go
index f3f1ec6..33296b0 100644
--- a/services/mgmt/application/impl/invoker.go
+++ b/services/mgmt/application/impl/invoker.go
@@ -4,11 +4,11 @@
"errors"
"strings"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/services/mgmt/application"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker holds the state of an application repository invocation.
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index cfa6001..c5e5f51 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -6,13 +6,13 @@
"os"
"path/filepath"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
- "veyron/services/mgmt/binary/impl"
+ "veyron.io/veyron/veyron/services/mgmt/binary/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index b0a0989..dc6ddcb 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -8,9 +8,9 @@
"path/filepath"
"strings"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
)
const (
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 553639c..5fc06cb 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -9,13 +9,13 @@
"path/filepath"
"testing"
- "veyron/lib/testutil"
+ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/invoker.go b/services/mgmt/binary/impl/invoker.go
index 64a222c..d5821fd 100644
--- a/services/mgmt/binary/impl/invoker.go
+++ b/services/mgmt/binary/impl/invoker.go
@@ -31,11 +31,11 @@
"strconv"
"syscall"
- "veyron2/ipc"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// state holds the state shared across different binary repository
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index 26d8b14..f2e1937 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -4,14 +4,14 @@
"flag"
"os"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/build/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/build/impl"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index cb92f4d..76d7f07 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -8,11 +8,11 @@
"strings"
"testing"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
func init() {
diff --git a/services/mgmt/build/impl/invoker.go b/services/mgmt/build/impl/invoker.go
index f55cee5..051099c 100644
--- a/services/mgmt/build/impl/invoker.go
+++ b/services/mgmt/build/impl/invoker.go
@@ -9,11 +9,11 @@
"path/filepath"
"runtime"
- "veyron2/ipc"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/build"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/build/impl/util.go b/services/mgmt/build/impl/util.go
index 967a1b0..b94528d 100644
--- a/services/mgmt/build/impl/util.go
+++ b/services/mgmt/build/impl/util.go
@@ -3,7 +3,7 @@
import (
"runtime"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
func getArch() build.Architecture {
diff --git a/services/mgmt/debug/debug.vdl b/services/mgmt/debug/debug.vdl
index fe70a6d..c9b075a 100644
--- a/services/mgmt/debug/debug.vdl
+++ b/services/mgmt/debug/debug.vdl
@@ -1,8 +1,8 @@
package debug
import (
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
)
// This interface exists only for the purpose of generating a valid Signature
diff --git a/services/mgmt/debug/debug.vdl.go b/services/mgmt/debug/debug.vdl.go
index a2cb249..f0ed42c 100644
--- a/services/mgmt/debug/debug.vdl.go
+++ b/services/mgmt/debug/debug.vdl.go
@@ -4,17 +4,17 @@
package debug
import (
- "veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/debug/dispatcher.go b/services/mgmt/debug/dispatcher.go
index b7de39e..a0c86cc 100644
--- a/services/mgmt/debug/dispatcher.go
+++ b/services/mgmt/debug/dispatcher.go
@@ -4,15 +4,15 @@
"strings"
"time"
- "veyron/lib/glob"
- logreaderimpl "veyron/services/mgmt/logreader/impl"
- statsimpl "veyron/services/mgmt/stats/impl"
+ "veyron.io/veyron/veyron/lib/glob"
+ logreaderimpl "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
+ statsimpl "veyron.io/veyron/veyron/services/mgmt/stats/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
- "veyron2/services/mounttable/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/verror"
)
// dispatcher holds the state of the debug dispatcher.
diff --git a/services/mgmt/debug/server.go b/services/mgmt/debug/server.go
index 2781358..7feb173 100644
--- a/services/mgmt/debug/server.go
+++ b/services/mgmt/debug/server.go
@@ -5,9 +5,9 @@
import (
"fmt"
- "veyron2"
- "veyron2/security"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
// StartDebugServer starts a debug server.
diff --git a/services/mgmt/debug/server_test.go b/services/mgmt/debug/server_test.go
index 207b3d9..de3ec35 100644
--- a/services/mgmt/debug/server_test.go
+++ b/services/mgmt/debug/server_test.go
@@ -10,15 +10,15 @@
"testing"
"time"
- libstats "veyron/lib/stats"
- "veyron/services/mgmt/debug"
+ libstats "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/services/mgmt/debug"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/stats"
- "veyron2/services/mounttable"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/verror"
)
func TestDebugServer(t *testing.T) {
diff --git a/services/mgmt/debug/signature.go b/services/mgmt/debug/signature.go
index 9f3b33b..68c5fd1 100644
--- a/services/mgmt/debug/signature.go
+++ b/services/mgmt/debug/signature.go
@@ -3,7 +3,7 @@
import (
"strings"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc"
)
type signatureInvoker struct {
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 0535c22..7c87c04 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -13,12 +13,12 @@
"os"
"time"
- "veyron2/context"
- "veyron2/rt"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index 11487cc..b68132d 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -7,12 +7,12 @@
"path/filepath"
"testing"
- "veyron/lib/testutil"
- "veyron/services/mgmt/binary/impl"
+ "veyron.io/veyron/veyron/lib/testutil"
+ "veyron.io/veyron/veyron/services/mgmt/binary/impl"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/mgmt/lib/exec/child.go b/services/mgmt/lib/exec/child.go
index 287e521..909c6e9 100644
--- a/services/mgmt/lib/exec/child.go
+++ b/services/mgmt/lib/exec/child.go
@@ -7,7 +7,7 @@
"os"
"sync"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
)
var (
diff --git a/services/mgmt/lib/exec/exec_test.go b/services/mgmt/lib/exec/exec_test.go
index 6f9082d..399f00a 100644
--- a/services/mgmt/lib/exec/exec_test.go
+++ b/services/mgmt/lib/exec/exec_test.go
@@ -10,10 +10,10 @@
"testing"
"time"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
// Use mock timekeeper to avoid actually sleeping during the test.
- "veyron/runtimes/google/testing/timekeeper"
- vexec "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/runtimes/google/testing/timekeeper"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
)
// We always expect there to be exactly three open file descriptors
diff --git a/services/mgmt/lib/exec/parent.go b/services/mgmt/lib/exec/parent.go
index 7822104..91a6147 100644
--- a/services/mgmt/lib/exec/parent.go
+++ b/services/mgmt/lib/exec/parent.go
@@ -9,11 +9,11 @@
"syscall"
"time"
- "veyron/lib/config"
+ "veyron.io/veyron/veyron/lib/config"
// TODO(cnicolaou): move timekeeper out of runtimes
- "veyron/runtimes/google/lib/timekeeper"
+ "veyron.io/veyron/veyron/runtimes/google/lib/timekeeper"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index 318529d..f477f1d 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -9,9 +9,9 @@
"strings"
"sync"
- "veyron/services/mgmt/profile"
- "veyron2/services/mgmt/application"
- "veyron2/verror"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/verror"
)
// TODO(rjkroege@google.com) Switch Memstore to the mid-August 2014
diff --git a/services/mgmt/lib/fs/simplestore_test.go b/services/mgmt/lib/fs/simplestore_test.go
index 9aee72d..b967ff8 100644
--- a/services/mgmt/lib/fs/simplestore_test.go
+++ b/services/mgmt/lib/fs/simplestore_test.go
@@ -7,10 +7,10 @@
"reflect"
"testing"
- _ "veyron/services/mgmt/profile"
- "veyron2/naming"
- "veyron2/services/mgmt/application"
- "veyron2/verror"
+ _ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/verror"
)
func TestNewMemstore(t *testing.T) {
diff --git a/services/mgmt/logreader/impl/common.go b/services/mgmt/logreader/impl/common.go
index d80d738..5dd31c7 100644
--- a/services/mgmt/logreader/impl/common.go
+++ b/services/mgmt/logreader/impl/common.go
@@ -8,8 +8,8 @@
"path/filepath"
"strings"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/verror"
)
var (
diff --git a/services/mgmt/logreader/impl/common_test.go b/services/mgmt/logreader/impl/common_test.go
index 991d833..00e2f73 100644
--- a/services/mgmt/logreader/impl/common_test.go
+++ b/services/mgmt/logreader/impl/common_test.go
@@ -2,8 +2,8 @@
import (
"testing"
- "veyron2/ipc"
- "veyron2/rt"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
)
func startServer(t *testing.T, disp ipc.Dispatcher) (ipc.Server, string, error) {
diff --git a/services/mgmt/logreader/impl/logdir_invoker.go b/services/mgmt/logreader/impl/logdir_invoker.go
index 30d86f5..5beb139 100644
--- a/services/mgmt/logreader/impl/logdir_invoker.go
+++ b/services/mgmt/logreader/impl/logdir_invoker.go
@@ -5,11 +5,11 @@
"path"
"path/filepath"
- "veyron/lib/glob"
+ "veyron.io/veyron/veyron/lib/glob"
- "veyron2/ipc"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// logDirectoryInvoker holds the state of an invocation.
diff --git a/services/mgmt/logreader/impl/logdir_invoker_test.go b/services/mgmt/logreader/impl/logdir_invoker_test.go
index 1cdda4e..0af9a2b 100644
--- a/services/mgmt/logreader/impl/logdir_invoker_test.go
+++ b/services/mgmt/logreader/impl/logdir_invoker_test.go
@@ -8,14 +8,14 @@
"sort"
"testing"
- "veyron/services/mgmt/logreader/impl"
+ "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/verror"
)
type logDirectoryDispatcher struct {
diff --git a/services/mgmt/logreader/impl/logfile_invoker.go b/services/mgmt/logreader/impl/logfile_invoker.go
index 2763aef..00a1b3e 100644
--- a/services/mgmt/logreader/impl/logfile_invoker.go
+++ b/services/mgmt/logreader/impl/logfile_invoker.go
@@ -6,9 +6,9 @@
"os"
"path/filepath"
- "veyron2/ipc"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// logFileInvoker holds the state of a logfile invocation.
diff --git a/services/mgmt/logreader/impl/logfile_invoker_test.go b/services/mgmt/logreader/impl/logfile_invoker_test.go
index a2c3399..9bc0a0e 100644
--- a/services/mgmt/logreader/impl/logfile_invoker_test.go
+++ b/services/mgmt/logreader/impl/logfile_invoker_test.go
@@ -6,15 +6,15 @@
"path"
"testing"
- "veyron/services/mgmt/logreader/impl"
+ "veyron.io/veyron/veyron/services/mgmt/logreader/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/logreader"
- "veyron2/services/mgmt/logreader/types"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader"
+ "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
+ "veyron.io/veyron/veyron2/verror"
)
type logFileDispatcher struct {
diff --git a/services/mgmt/logreader/impl/reader.go b/services/mgmt/logreader/impl/reader.go
index 29c8698..0a063b1 100644
--- a/services/mgmt/logreader/impl/reader.go
+++ b/services/mgmt/logreader/impl/reader.go
@@ -6,7 +6,7 @@
"strings"
"time"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/ipc"
)
// followReader implements the functionality of io.Reader, plus:
diff --git a/services/mgmt/node/config.vdl.go b/services/mgmt/node/config.vdl.go
index 94110ec..32965b5 100644
--- a/services/mgmt/node/config.vdl.go
+++ b/services/mgmt/node/config.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/node/config/config.go b/services/mgmt/node/config/config.go
index dc1fb78..52eaae9 100644
--- a/services/mgmt/node/config/config.go
+++ b/services/mgmt/node/config/config.go
@@ -23,7 +23,7 @@
"path/filepath"
"strings"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// State specifies how the node manager is configured. This should encapsulate
diff --git a/services/mgmt/node/config/config_test.go b/services/mgmt/node/config/config_test.go
index b7c83d4..ccaa875 100644
--- a/services/mgmt/node/config/config_test.go
+++ b/services/mgmt/node/config/config_test.go
@@ -7,9 +7,9 @@
"strings"
"testing"
- "veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
)
// TestState checks that encoding/decoding State to child/from parent works
diff --git a/services/mgmt/node/impl/app_invoker.go b/services/mgmt/node/impl/app_invoker.go
index 6d5d29b..5fce914 100644
--- a/services/mgmt/node/impl/app_invoker.go
+++ b/services/mgmt/node/impl/app_invoker.go
@@ -94,18 +94,18 @@
"strings"
"time"
- "veyron/lib/config"
- vexec "veyron/services/mgmt/lib/exec"
- iconfig "veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/lib/config"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ iconfig "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/appcycle"
- "veyron2/services/mgmt/application"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/appcycle"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/vlog"
)
// instanceInfo holds state about a running instance.
diff --git a/services/mgmt/node/impl/app_state.go b/services/mgmt/node/impl/app_state.go
index 744dcb5..df5049f 100644
--- a/services/mgmt/node/impl/app_state.go
+++ b/services/mgmt/node/impl/app_state.go
@@ -6,7 +6,7 @@
"os"
"path/filepath"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/vlog"
)
// installationState describes the states that an installation can be in at any
diff --git a/services/mgmt/node/impl/callback.go b/services/mgmt/node/impl/callback.go
index 6d190ae..92ddf6f 100644
--- a/services/mgmt/node/impl/callback.go
+++ b/services/mgmt/node/impl/callback.go
@@ -3,12 +3,12 @@
import (
"time"
- "veyron/services/mgmt/lib/exec"
- "veyron/services/mgmt/node"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/services/mgmt/node"
- "veyron2/mgmt"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
// InvokeCallback provides the parent node manager with the given name (which is
diff --git a/services/mgmt/node/impl/config_invoker.go b/services/mgmt/node/impl/config_invoker.go
index 5c4e4bf..7e191ac 100644
--- a/services/mgmt/node/impl/config_invoker.go
+++ b/services/mgmt/node/impl/config_invoker.go
@@ -10,9 +10,9 @@
"sync"
"time"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
type callbackState struct {
diff --git a/services/mgmt/node/impl/dispatcher.go b/services/mgmt/node/impl/dispatcher.go
index 82c6707..333161b 100644
--- a/services/mgmt/node/impl/dispatcher.go
+++ b/services/mgmt/node/impl/dispatcher.go
@@ -11,19 +11,19 @@
"strings"
"sync"
- vsecurity "veyron/security"
- vflag "veyron/security/flag"
- "veyron/security/serialization"
- inode "veyron/services/mgmt/node"
- "veyron/services/mgmt/node/config"
+ vsecurity "veyron.io/veyron/veyron/security"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/security/serialization"
+ inode "veyron.io/veyron/veyron/services/mgmt/node"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/node"
- "veyron2/services/security/access"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/services/security/access"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// internalState wraps state shared between different node manager
diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index 195d8f9..496c938 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -16,23 +16,23 @@
"testing"
"time"
- "veyron/lib/signals"
- "veyron/lib/testutil/blackbox"
- tsecurity "veyron/lib/testutil/security"
- vsecurity "veyron/security"
- "veyron/services/mgmt/lib/exec"
- "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/node/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ tsecurity "veyron.io/veyron/veyron/lib/testutil/security"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/impl"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/node"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// TestHelperProcess is blackbox boilerplate.
diff --git a/services/mgmt/node/impl/mock_repo_test.go b/services/mgmt/node/impl/mock_repo_test.go
index 36db640..acda3a0 100644
--- a/services/mgmt/node/impl/mock_repo_test.go
+++ b/services/mgmt/node/impl/mock_repo_test.go
@@ -8,11 +8,11 @@
"io/ioutil"
"os"
- "veyron2/ipc"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/repository"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/vlog"
)
// arInvoker holds the state of an application repository invocation mock. The
diff --git a/services/mgmt/node/impl/node_invoker.go b/services/mgmt/node/impl/node_invoker.go
index 81afc1c..60cf488 100644
--- a/services/mgmt/node/impl/node_invoker.go
+++ b/services/mgmt/node/impl/node_invoker.go
@@ -34,21 +34,21 @@
"sync"
"time"
- "veyron/lib/config"
- vexec "veyron/services/mgmt/lib/exec"
- iconfig "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/lib/config"
+ vexec "veyron.io/veyron/veyron/services/mgmt/lib/exec"
+ iconfig "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/mgmt"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/binary"
- "veyron2/services/mgmt/node"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/mgmt"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/binary"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/vlog"
)
type updatingState struct {
diff --git a/services/mgmt/node/impl/profile.go b/services/mgmt/node/impl/profile.go
index d522784..507908d 100644
--- a/services/mgmt/node/impl/profile.go
+++ b/services/mgmt/node/impl/profile.go
@@ -7,10 +7,10 @@
"runtime"
"strings"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/services/mgmt/build"
- "veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
)
// computeNodeProfile generates a description of the runtime
diff --git a/services/mgmt/node/impl/util.go b/services/mgmt/node/impl/util.go
index 44a2c8e..c7962d7 100644
--- a/services/mgmt/node/impl/util.go
+++ b/services/mgmt/node/impl/util.go
@@ -6,12 +6,12 @@
"path/filepath"
"time"
- "veyron/services/mgmt/lib/binary"
+ "veyron.io/veyron/veyron/services/mgmt/lib/binary"
- "veyron2/context"
- "veyron2/services/mgmt/application"
- "veyron2/services/mgmt/repository"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/vlog"
)
func downloadBinary(workspace, fileName, name string) error {
diff --git a/services/mgmt/node/impl/util_test.go b/services/mgmt/node/impl/util_test.go
index ecb6f79..ed138f3 100644
--- a/services/mgmt/node/impl/util_test.go
+++ b/services/mgmt/node/impl/util_test.go
@@ -5,19 +5,19 @@
"os"
"testing"
- mtlib "veyron/services/mounttable/lib"
+ mtlib "veyron.io/veyron/veyron/services/mounttable/lib"
- "veyron/lib/testutil/blackbox"
- "veyron/lib/testutil/security"
- "veyron/services/mgmt/lib/exec"
+ "veyron.io/veyron/veyron/lib/testutil/blackbox"
+ "veyron.io/veyron/veyron/lib/testutil/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/exec"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/node"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/node"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
// TODO(caprita): I've had to write one too many of these, let's move it to some
diff --git a/services/mgmt/node/noded/main.go b/services/mgmt/node/noded/main.go
index 4e2175e..6e33c20 100644
--- a/services/mgmt/node/noded/main.go
+++ b/services/mgmt/node/noded/main.go
@@ -3,13 +3,13 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/mgmt/node/config"
- "veyron/services/mgmt/node/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/mgmt/node/config"
+ "veyron.io/veyron/veyron/services/mgmt/node/impl"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/profile/impl/dispatcher.go b/services/mgmt/profile/impl/dispatcher.go
index c593614..9169da1 100644
--- a/services/mgmt/profile/impl/dispatcher.go
+++ b/services/mgmt/profile/impl/dispatcher.go
@@ -1,11 +1,11 @@
package impl
import (
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron/services/mgmt/lib/fs"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the profile repository dispatcher.
diff --git a/services/mgmt/profile/impl/impl_test.go b/services/mgmt/profile/impl/impl_test.go
index 0343d7a..469dffc 100644
--- a/services/mgmt/profile/impl/impl_test.go
+++ b/services/mgmt/profile/impl/impl_test.go
@@ -5,12 +5,12 @@
"reflect"
"testing"
- "veyron/services/mgmt/profile"
- "veyron/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/repository"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
var (
diff --git a/services/mgmt/profile/impl/invoker.go b/services/mgmt/profile/impl/invoker.go
index 2beeb43..2b49703 100644
--- a/services/mgmt/profile/impl/invoker.go
+++ b/services/mgmt/profile/impl/invoker.go
@@ -3,12 +3,12 @@
import (
"errors"
- "veyron/services/mgmt/lib/fs"
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/lib/fs"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker holds the profile repository invocation.
diff --git a/services/mgmt/profile/profile.vdl b/services/mgmt/profile/profile.vdl
index 0f6338b..0675af1 100644
--- a/services/mgmt/profile/profile.vdl
+++ b/services/mgmt/profile/profile.vdl
@@ -2,7 +2,7 @@
// types used by the implementation of Veyron profiles.
package profile
-import "veyron2/services/mgmt/build"
+import "veyron.io/veyron/veyron2/services/mgmt/build"
// Library describes a shared library that applications may use.
type Library struct {
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index 8ece520..97c0689 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -6,7 +6,7 @@
package profile
import (
- "veyron2/services/mgmt/build"
+ "veyron.io/veyron/veyron2/services/mgmt/build"
)
// Library describes a shared library that applications may use.
diff --git a/services/mgmt/profile/profiled/main.go b/services/mgmt/profile/profiled/main.go
index 7b36c36..9278d56 100644
--- a/services/mgmt/profile/profiled/main.go
+++ b/services/mgmt/profile/profiled/main.go
@@ -3,12 +3,12 @@
import (
"flag"
- "veyron/lib/signals"
- vflag "veyron/security/flag"
- "veyron/services/mgmt/profile/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ vflag "veyron.io/veyron/veyron/security/flag"
+ "veyron.io/veyron/veyron/services/mgmt/profile/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index bbdb35d..3b553b8 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -3,10 +3,10 @@
package repository
import (
- "veyron/services/mgmt/profile"
- "veyron2/security"
- "veyron2/services/mgmt/application"
- public "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
+ public "veyron.io/veyron/veyron2/services/mgmt/repository"
)
// Application describes an application repository internally. Besides
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index d2c2d25..2ec59c2 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -6,21 +6,21 @@
package repository
import (
- "veyron/services/mgmt/profile"
+ "veyron.io/veyron/veyron/services/mgmt/profile"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
- "veyron2/services/mgmt/application"
+ "veyron.io/veyron/veyron2/services/mgmt/application"
- "veyron2/services/mgmt/repository"
+ "veyron.io/veyron/veyron2/services/mgmt/repository"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -251,7 +251,7 @@
_gen_wiretype.FieldType{Type: 0x3, Name: "Binary"},
_gen_wiretype.FieldType{Type: 0x3d, Name: "Env"},
},
- "veyron2/services/mgmt/application.Envelope", []string(nil)},
+ "veyron.io/veyron/veyron2/services/mgmt/application.Envelope", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss _gen_ipc.ServiceSignature
var firstAdded int
@@ -555,14 +555,14 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.Format", Tags: []string(nil)}, _gen_wiretype.StructType{
+ _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.Architecture", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.Format", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x3, Name: "Name"},
_gen_wiretype.FieldType{Type: 0x3, Name: "MajorVersion"},
_gen_wiretype.FieldType{Type: 0x3, Name: "MinorVersion"},
},
- "veyron/services/mgmt/profile.Library", []string(nil)},
- _gen_wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, _gen_wiretype.StructType{
+ "veyron.io/veyron/veyron/services/mgmt/profile.Library", []string(nil)},
+ _gen_wiretype.MapType{Key: 0x43, Elem: 0x2, Name: "", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/services/mgmt/build.OperatingSystem", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x41, Name: "Arch"},
_gen_wiretype.FieldType{Type: 0x3, Name: "Description"},
@@ -571,7 +571,7 @@
_gen_wiretype.FieldType{Type: 0x3, Name: "Label"},
_gen_wiretype.FieldType{Type: 0x45, Name: "OS"},
},
- "veyron/services/mgmt/profile.Specification", []string(nil)},
+ "veyron.io/veyron/veyron/services/mgmt/profile.Specification", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
var ss _gen_ipc.ServiceSignature
var firstAdded int
diff --git a/services/mgmt/root/impl/dispatcher.go b/services/mgmt/root/impl/dispatcher.go
index 4a56fb1..67e002a 100644
--- a/services/mgmt/root/impl/dispatcher.go
+++ b/services/mgmt/root/impl/dispatcher.go
@@ -1,9 +1,9 @@
package impl
import (
- "veyron/services/mgmt/root"
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron/services/mgmt/root"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the state of the root process.
diff --git a/services/mgmt/root/impl/root.go b/services/mgmt/root/impl/root.go
index 7c6cb62..4905a2a 100644
--- a/services/mgmt/root/impl/root.go
+++ b/services/mgmt/root/impl/root.go
@@ -6,8 +6,8 @@
"runtime"
"time"
- "veyron2/ipc"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vlog"
)
// invoker is the object that implements the Root interface
diff --git a/services/mgmt/root/root.vdl.go b/services/mgmt/root/root.vdl.go
index e041a07..09c1f3a 100644
--- a/services/mgmt/root/root.vdl.go
+++ b/services/mgmt/root/root.vdl.go
@@ -7,12 +7,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mgmt/root/rootd/main.go b/services/mgmt/root/rootd/main.go
index b0adae2..0e20aaa 100644
--- a/services/mgmt/root/rootd/main.go
+++ b/services/mgmt/root/rootd/main.go
@@ -3,11 +3,11 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/mgmt/root/impl"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/mgmt/root/impl"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mgmt/stats/impl/stats_invoker.go b/services/mgmt/stats/impl/stats_invoker.go
index f1f9dac..4804db3 100644
--- a/services/mgmt/stats/impl/stats_invoker.go
+++ b/services/mgmt/stats/impl/stats_invoker.go
@@ -5,15 +5,15 @@
import (
"time"
- "veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats"
- "veyron2/ipc"
- "veyron2/services/mgmt/stats/types"
- mttypes "veyron2/services/mounttable/types"
- watchtypes "veyron2/services/watch/types"
- "veyron2/vdl/vdlutil"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/services/mgmt/stats/types"
+ mttypes "veyron.io/veyron/veyron2/services/mounttable/types"
+ watchtypes "veyron.io/veyron/veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
type statsInvoker struct {
diff --git a/services/mgmt/stats/impl/stats_invoker_test.go b/services/mgmt/stats/impl/stats_invoker_test.go
index 46e751e..f408fbc 100644
--- a/services/mgmt/stats/impl/stats_invoker_test.go
+++ b/services/mgmt/stats/impl/stats_invoker_test.go
@@ -6,17 +6,17 @@
"testing"
"time"
- libstats "veyron/lib/stats"
- "veyron/lib/stats/histogram"
- istats "veyron/services/mgmt/stats"
- "veyron/services/mgmt/stats/impl"
+ libstats "veyron.io/veyron/veyron/lib/stats"
+ "veyron.io/veyron/veyron/lib/stats/histogram"
+ istats "veyron.io/veyron/veyron/services/mgmt/stats"
+ "veyron.io/veyron/veyron/services/mgmt/stats/impl"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mgmt/stats"
- "veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mgmt/stats"
+ "veyron.io/veyron/veyron2/services/watch/types"
)
type statsDispatcher struct {
diff --git a/services/mounttable/lib/collection_test.vdl.go b/services/mounttable/lib/collection_test.vdl.go
index e051c53..77b9710 100644
--- a/services/mounttable/lib/collection_test.vdl.go
+++ b/services/mounttable/lib/collection_test.vdl.go
@@ -5,12 +5,12 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/services/mounttable/lib/collectionserver_test.go b/services/mounttable/lib/collectionserver_test.go
index e6cce88..55fa7e6 100644
--- a/services/mounttable/lib/collectionserver_test.go
+++ b/services/mounttable/lib/collectionserver_test.go
@@ -3,9 +3,9 @@
import (
"sync"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/security"
)
// collectionServer is a very simple collection server implementation for testing, with sufficient debugging to help
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index f87605f..922f4c7 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -9,17 +9,17 @@
"sync"
"time"
- "veyron/lib/glob"
- vsecurity "veyron/security"
+ "veyron.io/veyron/veyron/lib/glob"
+ vsecurity "veyron.io/veyron/veyron/security"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index dc9894c..32bba94 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -9,17 +9,17 @@
"testing"
"time"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
)
// stupidNS is a version of naming.Namespace that we can control. This exists so that we have some
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 1fc8089..ad66bfb 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -6,16 +6,16 @@
"strconv"
"strings"
- "veyron/lib/glob"
- "veyron/lib/netconfig"
+ "veyron.io/veyron/veyron/lib/glob"
+ "veyron.io/veyron/veyron/lib/netconfig"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/services/mounttable"
- "veyron2/services/mounttable/types"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/vlog"
"code.google.com/p/mdns"
)
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 725b41c..4b2b610 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -7,13 +7,13 @@
"testing"
"time"
- _ "veyron/lib/testutil"
+ _ "veyron.io/veyron/veyron/lib/testutil"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/services/mounttable"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/services/mounttable"
+ "veyron.io/veyron/veyron2/vlog"
)
func protocolAndAddress(e naming.Endpoint) (string, string, error) {
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/lib/serverlist.go
index 2ba49f2..cde1ea6 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/lib/serverlist.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "veyron2/services/mounttable/types"
+ "veyron.io/veyron/veyron2/services/mounttable/types"
)
type serverListClock interface {
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 98df218..bb450a8 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -7,14 +7,14 @@
"net"
"os"
- "veyron2"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
- "veyron/lib/signals"
+ "veyron.io/veyron/veyron/lib/signals"
- "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/services/mounttable/lib"
)
var (
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index 2a669a0..ce9859b 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -8,11 +8,11 @@
_ "net/http/pprof"
"time"
- "veyron/runtimes/google/ipc/stream/proxy"
- "veyron/runtimes/google/lib/publisher"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ "veyron.io/veyron/veyron/runtimes/google/lib/publisher"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vlog"
)
var (
diff --git a/services/security/discharger.vdl b/services/security/discharger.vdl
index 07139fd..037c6b4 100644
--- a/services/security/discharger.vdl
+++ b/services/security/discharger.vdl
@@ -1,6 +1,6 @@
package security
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.
type Discharger interface {
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index a63aaf1..67dddaf 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -4,15 +4,15 @@
package security
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
@@ -177,13 +177,13 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron2/security.BlessingPattern", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.StructType{
+ _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "anydata", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x3, Name: "veyron.io/veyron/veyron2/security.BlessingPattern", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x42, Name: "", Tags: []string(nil)}, _gen_wiretype.SliceType{Elem: 0x41, Name: "", Tags: []string(nil)}, _gen_wiretype.StructType{
[]_gen_wiretype.FieldType{
_gen_wiretype.FieldType{Type: 0x43, Name: "Server"},
_gen_wiretype.FieldType{Type: 0x3, Name: "Method"},
_gen_wiretype.FieldType{Type: 0x44, Name: "Arguments"},
},
- "veyron2/security.DischargeImpetus", []string(nil)},
+ "veyron.io/veyron/veyron2/security.DischargeImpetus", []string(nil)},
_gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
diff --git a/services/security/discharger/discharger.go b/services/security/discharger/discharger.go
index d9a0c5b..5e701d1 100644
--- a/services/security/discharger/discharger.go
+++ b/services/security/discharger/discharger.go
@@ -4,10 +4,10 @@
"fmt"
"time"
- services "veyron/services/security"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
)
// dischargerd issues discharges for all caveats present in the current
diff --git a/services/security/discharger/revoker.go b/services/security/discharger/revoker.go
index 0f49f44..e7c23a1 100644
--- a/services/security/discharger/revoker.go
+++ b/services/security/discharger/revoker.go
@@ -9,11 +9,11 @@
"os"
"path/filepath"
"sync"
- "veyron/security/caveat"
- ssecurity "veyron/services/security"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/security/caveat"
+ ssecurity "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vom"
)
// The revocation caveats will be stored in a directory with a file for each.
diff --git a/services/security/discharger/revoker_test.go b/services/security/discharger/revoker_test.go
index 44b46de..fc247e2 100644
--- a/services/security/discharger/revoker_test.go
+++ b/services/security/discharger/revoker_test.go
@@ -4,12 +4,12 @@
"os"
"path/filepath"
"testing"
- services "veyron/services/security"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
+ services "veyron.io/veyron/veyron/services/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func revokerSetup(t *testing.T) (dischargerID security.PublicID, dischargerEndpoint, revokerEndpoint string, closeFunc func(), runtime veyron2.Runtime) {
diff --git a/services/security/revoker.vdl b/services/security/revoker.vdl
index da13597..00f86dd 100644
--- a/services/security/revoker.vdl
+++ b/services/security/revoker.vdl
@@ -1,6 +1,6 @@
package security
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
// RevocationToken can be presented to a revocation service to revoke a caveat
type RevocationToken [16]byte
diff --git a/services/security/revoker.vdl.go b/services/security/revoker.vdl.go
index 2e94949..69164c4 100644
--- a/services/security/revoker.vdl.go
+++ b/services/security/revoker.vdl.go
@@ -4,15 +4,15 @@
package security
import (
- "veyron2/security"
+ "veyron.io/veyron/veyron2/security"
// The non-user imports are prefixed with "_gen_" to prevent collisions.
- _gen_veyron2 "veyron2"
- _gen_context "veyron2/context"
- _gen_ipc "veyron2/ipc"
- _gen_naming "veyron2/naming"
- _gen_vdlutil "veyron2/vdl/vdlutil"
- _gen_wiretype "veyron2/wiretype"
+ _gen_veyron2 "veyron.io/veyron/veyron2"
+ _gen_context "veyron.io/veyron/veyron2/context"
+ _gen_ipc "veyron.io/veyron/veyron2/ipc"
+ _gen_naming "veyron.io/veyron/veyron2/naming"
+ _gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+ _gen_wiretype "veyron.io/veyron/veyron2/wiretype"
)
// RevocationToken can be presented to a revocation service to revoke a caveat
@@ -180,7 +180,7 @@
}
result.TypeDefs = []_gen_vdlutil.Any{
- _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.ArrayType{Elem: 0x41, Len: 0x10, Name: "veyron/services/security.RevocationToken", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
+ _gen_wiretype.NamedPrimitiveType{Type: 0x32, Name: "byte", Tags: []string(nil)}, _gen_wiretype.ArrayType{Elem: 0x41, Len: 0x10, Name: "veyron.io/veyron/veyron/services/security.RevocationToken", Tags: []string(nil)}, _gen_wiretype.NamedPrimitiveType{Type: 0x1, Name: "error", Tags: []string(nil)}}
return result, nil
}
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index f13f608..5b871fc 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -11,22 +11,22 @@
"sync"
"time"
- "veyron/services/wsprd/identity"
- "veyron/services/wsprd/ipc/client"
- "veyron/services/wsprd/ipc/server"
- "veyron/services/wsprd/ipc/stream"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
- vom_wiretype "veyron2/vom/wiretype"
- wiretype_build "veyron2/wiretype/build"
+ "veyron.io/veyron/veyron/services/wsprd/identity"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/client"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/server"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/stream"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
+ vom_wiretype "veyron.io/veyron/veyron2/vom/wiretype"
+ wiretype_build "veyron.io/veyron/veyron2/wiretype/build"
)
// TODO(bjornick,nlacasse): Remove the retryTimeout flag once we able
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index abc8ad1..043c150 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -9,23 +9,23 @@
"sync"
"testing"
"time"
- "veyron/services/wsprd/ipc/client"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/ipc"
- "veyron2/naming"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
- vom_wiretype "veyron2/vom/wiretype"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/client"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/naming"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
+ vom_wiretype "veyron.io/veyron/veyron2/vom/wiretype"
+ "veyron.io/veyron/veyron2/wiretype"
- "veyron/runtimes/google/ipc/stream/proxy"
- mounttable "veyron/services/mounttable/lib"
+ "veyron.io/veyron/veyron/runtimes/google/ipc/stream/proxy"
+ mounttable "veyron.io/veyron/veyron/services/mounttable/lib"
)
var (
@@ -699,8 +699,8 @@
expectedValue: C(security.MethodCaveat("Get", "MultiGet")),
},
{
- json: `{"_type":"PeerBlessingsCaveat","service":"...","data":["veyron/batman","veyron/brucewayne"]}`,
- expectedValue: C(security.PeerBlessingsCaveat("veyron/batman", "veyron/brucewayne")),
+ json: `{"_type":"PeerBlessingsCaveat","service":"...","data":["veyron.io/veyron/veyron/batman","veyron.io/veyron/veyron/brucewayne"]}`,
+ expectedValue: C(security.PeerBlessingsCaveat("veyron.io/veyron/veyron/batman", "veyron.io/veyron/veyron/brucewayne")),
},
}
diff --git a/services/wsprd/identity/identity.go b/services/wsprd/identity/identity.go
index d78cfe9..288fa9d 100644
--- a/services/wsprd/identity/identity.go
+++ b/services/wsprd/identity/identity.go
@@ -18,12 +18,12 @@
"sync"
"time"
- "veyron/security/serialization"
+ "veyron.io/veyron/veyron/security/serialization"
- "veyron2"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vom"
)
// permissions is a set of a permissions given to an app, containing the account
diff --git a/services/wsprd/identity/identity_test.go b/services/wsprd/identity/identity_test.go
index f1205a7..447faed 100644
--- a/services/wsprd/identity/identity_test.go
+++ b/services/wsprd/identity/identity_test.go
@@ -8,9 +8,9 @@
"testing"
"time"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
)
func createChain(r veyron2.Runtime, name string) security.PrivateID {
diff --git a/services/wsprd/identity/js_identity_store.go b/services/wsprd/identity/js_identity_store.go
index 358228b..520b0ef 100644
--- a/services/wsprd/identity/js_identity_store.go
+++ b/services/wsprd/identity/js_identity_store.go
@@ -1,6 +1,6 @@
package identity
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
import "sync"
// JSPublicIDHandles is a store for PublicIDs in use by JS code.
diff --git a/services/wsprd/ipc/client/stream.go b/services/wsprd/ipc/client/stream.go
index 4237f8f..0db5bda 100644
--- a/services/wsprd/ipc/client/stream.go
+++ b/services/wsprd/ipc/client/stream.go
@@ -3,8 +3,8 @@
package client
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
)
// A message that will be passed to the writeLoop function that will
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index ea58748..c03c941 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// dispatcher holds the invoker and the authorizer to be used for lookup.
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index aabafe8..4fa0eb8 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -1,9 +1,9 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/verror"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
)
var typedNil []int
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 5ee1d99..35b6e85 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -8,16 +8,16 @@
"fmt"
"sync"
- vsecurity "veyron/security"
- "veyron/services/wsprd/ipc/stream"
- "veyron/services/wsprd/lib"
- "veyron/services/wsprd/signature"
+ vsecurity "veyron.io/veyron/veyron/security"
+ "veyron.io/veyron/veyron/services/wsprd/ipc/stream"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/signature"
- "veyron2"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/verror"
- "veyron2/vlog"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
)
type Flow struct {
diff --git a/services/wsprd/ipc/server/signature_invoker.go b/services/wsprd/ipc/server/signature_invoker.go
index 6384510..55c9962 100644
--- a/services/wsprd/ipc/server/signature_invoker.go
+++ b/services/wsprd/ipc/server/signature_invoker.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron2/ipc"
- "veyron2/security"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
)
// signatureInvoker acts as the signature() method and is used to handle calls
diff --git a/services/wsprd/ipc/server/stream.go b/services/wsprd/ipc/server/stream.go
index 03b39e2..3ac5fc8 100644
--- a/services/wsprd/ipc/server/stream.go
+++ b/services/wsprd/ipc/server/stream.go
@@ -1,8 +1,8 @@
package server
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
)
// A simple struct that wraps a stream with the sender api. It
diff --git a/services/wsprd/ipc/stream/stream.go b/services/wsprd/ipc/stream/stream.go
index 5f90e90..ad9e371 100644
--- a/services/wsprd/ipc/stream/stream.go
+++ b/services/wsprd/ipc/stream/stream.go
@@ -3,7 +3,7 @@
package stream
import (
- "veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
)
// An interface for an asynchronous sender.
diff --git a/services/wsprd/lib/remove_this.go b/services/wsprd/lib/remove_this.go
index 8d9183e..427476d 100644
--- a/services/wsprd/lib/remove_this.go
+++ b/services/wsprd/lib/remove_this.go
@@ -5,9 +5,9 @@
"veyron.io/store/veyron2/services/store"
roadmap_watchtypes "veyron.io/store/veyron2/services/watch/types"
"veyron.io/store/veyron2/storage"
- mttypes "veyron2/services/mounttable/types"
- watchtypes "veyron2/services/watch/types"
- "veyron2/vom"
+ mttypes "veyron.io/veyron/veyron2/services/mounttable/types"
+ watchtypes "veyron.io/veyron/veyron2/services/watch/types"
+ "veyron.io/veyron/veyron2/vom"
)
func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index b31d4df..1d38641 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -4,8 +4,8 @@
"sync"
"time"
- "veyron2/context"
- "veyron2/ipc"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
)
type SignatureManager interface {
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index f0caf01..81460de 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- mocks_ipc "veyron/runtimes/google/testing/mocks/ipc"
- "veyron2/ipc"
- "veyron2/rt"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ mocks_ipc "veyron.io/veyron/veyron/runtimes/google/testing/mocks/ipc"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
const (
@@ -24,7 +24,7 @@
Methods: make(map[string]ipc.MethodSignature),
TypeDefs: []vdlutil.Any{
wiretype.NamedPrimitiveType{
- Name: "veyron2/vdlutil.AnyData",
+ Name: "veyron.io/veyron/veyron2/vdlutil.AnyData",
Type: wiretype.TypeIDInterface,
},
},
diff --git a/services/wsprd/signature/signature.go b/services/wsprd/signature/signature.go
index 0185658..4acbf74 100644
--- a/services/wsprd/signature/signature.go
+++ b/services/wsprd/signature/signature.go
@@ -1,15 +1,15 @@
package signature
import (
- "veyron/services/wsprd/lib"
- "veyron2/ipc"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
var (
anydataType = wiretype.NamedPrimitiveType{
- Name: "veyron2/vdlutil.AnyData",
+ Name: "veyron.io/veyron/veyron2/vdlutil.AnyData",
Type: wiretype.TypeIDInterface,
}
errType = wiretype.NamedPrimitiveType{
diff --git a/services/wsprd/signature/signature_test.go b/services/wsprd/signature/signature_test.go
index 250acf5..dd9e85a 100644
--- a/services/wsprd/signature/signature_test.go
+++ b/services/wsprd/signature/signature_test.go
@@ -4,9 +4,9 @@
"reflect"
"testing"
- "veyron2/ipc"
- "veyron2/vdl/vdlutil"
- "veyron2/wiretype"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/wiretype"
)
func TestNewJSONServiceSignature(t *testing.T) {
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index 76efed0..7bab7ce 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -3,9 +3,9 @@
import (
"flag"
- "veyron/lib/signals"
- "veyron/services/wsprd/wspr"
- "veyron2/rt"
+ "veyron.io/veyron/veyron/lib/signals"
+ "veyron.io/veyron/veyron/services/wsprd/wspr"
+ "veyron.io/veyron/veyron2/rt"
)
func main() {
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index 120d675..da1dc4e 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -11,12 +11,12 @@
"strings"
"time"
- "veyron/services/wsprd/app"
- "veyron/services/wsprd/lib"
- "veyron2"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron/services/wsprd/app"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index c7ca1b8..f336c9d 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -6,11 +6,11 @@
"path/filepath"
"runtime"
- "veyron/services/wsprd/lib"
+ "veyron.io/veyron/veyron/services/wsprd/lib"
- "veyron2/verror"
- "veyron2/vlog"
- "veyron2/vom"
+ "veyron.io/veyron/veyron2/verror"
+ "veyron.io/veyron/veyron2/vlog"
+ "veyron.io/veyron/veyron2/vom"
"github.com/gorilla/websocket"
)
diff --git a/services/wsprd/wspr/wspr.go b/services/wsprd/wspr/wspr.go
index a93477a..727807d 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -26,12 +26,12 @@
"sync"
"time"
- veyron_identity "veyron/services/identity"
- "veyron/services/wsprd/identity"
- "veyron2"
- "veyron2/rt"
- "veyron2/security"
- "veyron2/vlog"
+ veyron_identity "veyron.io/veyron/veyron/services/identity"
+ "veyron.io/veyron/veyron/services/wsprd/identity"
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vlog"
)
const (
diff --git a/services/wsprd/wspr/wspr_test.go b/services/wsprd/wspr/wspr_test.go
index e84b1f6..83ab796 100644
--- a/services/wsprd/wspr/wspr_test.go
+++ b/services/wsprd/wspr/wspr_test.go
@@ -9,10 +9,10 @@
"testing"
"time"
- "veyron2/context"
- "veyron2/ipc"
- "veyron2/security"
- "veyron2/vdl/vdlutil"
+ "veyron.io/veyron/veyron2/context"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/security"
+ "veyron.io/veyron/veyron2/vdl/vdlutil"
)
// BEGIN MOCK BLESSER SERVICE
