TBR x/ref: Flatten v.io/v23/services/mgmt/* to v.io/v23/services/*
MultiPart: 2/2
Change-Id: Id094a4b6f98bd4ab53d473be6962e6c4a28d4640
diff --git a/cmd/application/impl.go b/cmd/application/impl.go
index 1f32226..2f1b543 100644
--- a/cmd/application/impl.go
+++ b/cmd/application/impl.go
@@ -16,7 +16,7 @@
"time"
"v.io/v23/context"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/x/lib/cmdline"
"v.io/x/ref/services/mgmt/repository"
)
diff --git a/cmd/application/impl_test.go b/cmd/application/impl_test.go
index 7943205..1cbcac5 100644
--- a/cmd/application/impl_test.go
+++ b/cmd/application/impl_test.go
@@ -17,7 +17,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
diff --git a/cmd/binary/impl_test.go b/cmd/binary/impl_test.go
index 79fafa1..3fe3ca6 100644
--- a/cmd/binary/impl_test.go
+++ b/cmd/binary/impl_test.go
@@ -21,8 +21,8 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/repository"
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
diff --git a/cmd/build/impl.go b/cmd/build/impl.go
index ceae5d0..6bab8c1 100644
--- a/cmd/build/impl.go
+++ b/cmd/build/impl.go
@@ -15,7 +15,7 @@
"time"
"v.io/v23/context"
- vbuild "v.io/v23/services/mgmt/build"
+ vbuild "v.io/v23/services/build"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/build/impl_test.go b/cmd/build/impl_test.go
index 9cc263b..180ac37 100644
--- a/cmd/build/impl_test.go
+++ b/cmd/build/impl_test.go
@@ -13,8 +13,8 @@
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/build"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/cmd/debug/impl.go b/cmd/debug/impl.go
index 0207ab8..fa4e3a1 100644
--- a/cmd/debug/impl.go
+++ b/cmd/debug/impl.go
@@ -17,10 +17,10 @@
"v.io/v23"
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/logreader"
- "v.io/v23/services/mgmt/pprof"
- "v.io/v23/services/mgmt/stats"
- vtracesvc "v.io/v23/services/mgmt/vtrace"
+ "v.io/v23/services/logreader"
+ "v.io/v23/services/pprof"
+ "v.io/v23/services/stats"
+ s_vtrace "v.io/v23/services/vtrace"
"v.io/v23/services/watch"
"v.io/v23/uniqueid"
"v.io/v23/vdl"
@@ -72,7 +72,7 @@
`,
}
-func doFetchTrace(ctx *context.T, wg *sync.WaitGroup, client vtracesvc.StoreClientStub,
+func doFetchTrace(ctx *context.T, wg *sync.WaitGroup, client s_vtrace.StoreClientStub,
id uniqueid.Id, traces chan *vtrace.TraceRecord, errors chan error) {
defer wg.Done()
@@ -91,7 +91,7 @@
}
name := args[0]
- client := vtracesvc.StoreClient(name)
+ client := s_vtrace.StoreClient(name)
if arglen == 1 {
call, err := client.AllTraces(gctx)
if err != nil {
diff --git a/cmd/mgmt/device/acl_impl.go b/cmd/mgmt/device/acl_impl.go
index 65f427a..0b02e14 100644
--- a/cmd/mgmt/device/acl_impl.go
+++ b/cmd/mgmt/device/acl_impl.go
@@ -11,7 +11,7 @@
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/v23/verror"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/mgmt/device/associate_impl.go b/cmd/mgmt/device/associate_impl.go
index a387445..45a8a0c 100644
--- a/cmd/mgmt/device/associate_impl.go
+++ b/cmd/mgmt/device/associate_impl.go
@@ -9,7 +9,7 @@
"time"
"v.io/v23/context"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/mgmt/device/devicemanager_mock_test.go b/cmd/mgmt/device/devicemanager_mock_test.go
index 41b2190..42d502f 100644
--- a/cmd/mgmt/device/devicemanager_mock_test.go
+++ b/cmd/mgmt/device/devicemanager_mock_test.go
@@ -18,10 +18,10 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/device"
+ "v.io/v23/services/repository"
"v.io/x/lib/vlog"
binlib "v.io/x/ref/services/mgmt/lib/binary"
diff --git a/cmd/mgmt/device/impl.go b/cmd/mgmt/device/impl.go
index a27bf6c..bfd28cb 100644
--- a/cmd/mgmt/device/impl.go
+++ b/cmd/mgmt/device/impl.go
@@ -15,8 +15,8 @@
"v.io/v23/options"
"v.io/v23/rpc"
"v.io/v23/security"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/mgmt/device/impl_test.go b/cmd/mgmt/device/impl_test.go
index 313fdeb..bc5ea53 100644
--- a/cmd/mgmt/device/impl_test.go
+++ b/cmd/mgmt/device/impl_test.go
@@ -15,8 +15,8 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
"v.io/v23/verror"
cmd_device "v.io/x/ref/cmd/mgmt/device"
diff --git a/cmd/mgmt/device/instance_impl.go b/cmd/mgmt/device/instance_impl.go
index e927860..e6c3289 100644
--- a/cmd/mgmt/device/instance_impl.go
+++ b/cmd/mgmt/device/instance_impl.go
@@ -9,7 +9,7 @@
import (
"fmt"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/mgmt/device/local_install.go b/cmd/mgmt/device/local_install.go
index f722b65..90d24a1 100644
--- a/cmd/mgmt/device/local_install.go
+++ b/cmd/mgmt/device/local_install.go
@@ -20,10 +20,10 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/device"
+ "v.io/v23/services/repository"
"v.io/v23/uniqueid"
"v.io/x/lib/vlog"
diff --git a/cmd/mgmt/device/local_install_test.go b/cmd/mgmt/device/local_install_test.go
index ce6620b..8524813 100644
--- a/cmd/mgmt/device/local_install_test.go
+++ b/cmd/mgmt/device/local_install_test.go
@@ -17,8 +17,8 @@
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
cmd_device "v.io/x/ref/cmd/mgmt/device"
)
diff --git a/cmd/mgmt/device/publish.go b/cmd/mgmt/device/publish.go
index b2e2bc8..3743625 100644
--- a/cmd/mgmt/device/publish.go
+++ b/cmd/mgmt/device/publish.go
@@ -16,7 +16,7 @@
"v.io/v23/naming"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/services/permissions"
"v.io/v23/verror"
diff --git a/cmd/mgmt/device/updateall.go b/cmd/mgmt/device/updateall.go
index 1c7ad91..19b1b04 100644
--- a/cmd/mgmt/device/updateall.go
+++ b/cmd/mgmt/device/updateall.go
@@ -11,7 +11,7 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/v23/verror"
"v.io/x/lib/cmdline"
diff --git a/cmd/profile/impl.go b/cmd/profile/impl.go
index 8d438cc..cda78b9 100644
--- a/cmd/profile/impl.go
+++ b/cmd/profile/impl.go
@@ -9,7 +9,7 @@
"time"
"v.io/v23/context"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
"v.io/x/lib/cmdline"
"v.io/x/ref/services/mgmt/profile"
"v.io/x/ref/services/mgmt/repository"
diff --git a/cmd/profile/impl_test.go b/cmd/profile/impl_test.go
index e89b79c..9f4ace8 100644
--- a/cmd/profile/impl_test.go
+++ b/cmd/profile/impl_test.go
@@ -15,7 +15,7 @@
"v.io/v23/naming"
"v.io/v23/rpc"
"v.io/v23/security"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index 431b244..82d5958 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -19,7 +19,7 @@
"v.io/v23/mgmt"
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/appcycle"
+ "v.io/v23/services/appcycle"
"v.io/v23/vtrace"
_ "v.io/x/ref/profiles"
diff --git a/lib/stats/stats.go b/lib/stats/stats.go
index 2bdc961..1ccaf92 100644
--- a/lib/stats/stats.go
+++ b/lib/stats/stats.go
@@ -20,7 +20,7 @@
"sync"
"time"
- mgmtstats "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/stats"
"v.io/v23/verror"
)
@@ -66,7 +66,7 @@
return 0, err
}
if obj == nil {
- return nil, verror.New(mgmtstats.ErrNoValue, nil, name)
+ return nil, verror.New(stats.ErrNoValue, nil, name)
}
return obj.Value(), nil
}
diff --git a/profiles/internal/lib/appcycle/appcycle.go b/profiles/internal/lib/appcycle/appcycle.go
index eb56037..cb67dec 100644
--- a/profiles/internal/lib/appcycle/appcycle.go
+++ b/profiles/internal/lib/appcycle/appcycle.go
@@ -14,7 +14,7 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- stub "v.io/v23/services/mgmt/appcycle"
+ public "v.io/v23/services/appcycle"
)
type AppCycle struct {
@@ -122,10 +122,10 @@
}
func (m *AppCycle) Remote() interface{} {
- return stub.AppCycleServer(m.disp)
+ return public.AppCycleServer(m.disp)
}
-func (d *invoker) Stop(call stub.AppCycleStopServerCall) error {
+func (d *invoker) Stop(call public.AppCycleStopServerCall) error {
blessings, _ := security.RemoteBlessingNames(call.Context())
vlog.Infof("AppCycle Stop request from %v", blessings)
// The size of the channel should be reasonably sized to expect not to
@@ -140,7 +140,7 @@
// Channel closed, meaning process shutdown is imminent.
break
}
- actask := stub.Task{Progress: task.Progress, Goal: task.Goal}
+ actask := public.Task{Progress: task.Progress, Goal: task.Goal}
vlog.Infof("AppCycle Stop progress %d/%d", task.Progress, task.Goal)
call.SendStream().Send(actask)
}
diff --git a/profiles/internal/rt/mgmt_test.go b/profiles/internal/rt/mgmt_test.go
index 12f4bb7..55f8321 100644
--- a/profiles/internal/rt/mgmt_test.go
+++ b/profiles/internal/rt/mgmt_test.go
@@ -18,7 +18,7 @@
"v.io/v23/mgmt"
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/appcycle"
+ "v.io/v23/services/appcycle"
_ "v.io/x/ref/profiles"
vflag "v.io/x/ref/security/flag"
diff --git a/services/mgmt/application/applicationd/acl_test.go b/services/mgmt/application/applicationd/acl_test.go
index 99c3b03..950fd58 100644
--- a/services/mgmt/application/applicationd/acl_test.go
+++ b/services/mgmt/application/applicationd/acl_test.go
@@ -16,7 +16,7 @@
"v.io/v23/naming"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/application/applicationd/applicationd_v23_test.go b/services/mgmt/application/applicationd/applicationd_v23_test.go
index e2a5981..79c08bd 100644
--- a/services/mgmt/application/applicationd/applicationd_v23_test.go
+++ b/services/mgmt/application/applicationd/applicationd_v23_test.go
@@ -10,7 +10,7 @@
"strings"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/x/ref/test/v23tests"
)
diff --git a/services/mgmt/application/applicationd/impl_test.go b/services/mgmt/application/applicationd/impl_test.go
index 2b58ba8..f4c5ea1 100644
--- a/services/mgmt/application/applicationd/impl_test.go
+++ b/services/mgmt/application/applicationd/impl_test.go
@@ -14,7 +14,7 @@
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
appd "v.io/x/ref/services/mgmt/application/applicationd"
diff --git a/services/mgmt/application/applicationd/service.go b/services/mgmt/application/applicationd/service.go
index 7ec48b8..2568f64 100644
--- a/services/mgmt/application/applicationd/service.go
+++ b/services/mgmt/application/applicationd/service.go
@@ -14,7 +14,7 @@
"v.io/v23/naming"
"v.io/v23/rpc"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
"v.io/x/lib/vlog"
)
diff --git a/services/mgmt/binary/impl/acl_test.go b/services/mgmt/binary/impl/acl_test.go
index dc90be2..da76e54 100644
--- a/services/mgmt/binary/impl/acl_test.go
+++ b/services/mgmt/binary/impl/acl_test.go
@@ -17,7 +17,7 @@
"v.io/v23/naming"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index 83a39da..ff967c4 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -9,7 +9,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/x/ref/services/mgmt/lib/acls"
)
diff --git a/services/mgmt/binary/impl/http_test.go b/services/mgmt/binary/impl/http_test.go
index 3472ab3..d4c10d8 100644
--- a/services/mgmt/binary/impl/http_test.go
+++ b/services/mgmt/binary/impl/http_test.go
@@ -14,7 +14,7 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/x/ref/services/mgmt/binary/impl"
"v.io/x/ref/test"
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 4f308e4..435465f 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -17,7 +17,7 @@
"v.io/v23"
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/binary/impl/service.go b/services/mgmt/binary/impl/service.go
index 46e4b0f..dd279d8 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -43,8 +43,8 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
"v.io/x/ref/services/mgmt/lib/acls"
diff --git a/services/mgmt/binary/impl/util_test.go b/services/mgmt/binary/impl/util_test.go
index dd208ac..8f8534f 100644
--- a/services/mgmt/binary/impl/util_test.go
+++ b/services/mgmt/binary/impl/util_test.go
@@ -11,7 +11,7 @@
"testing"
"v.io/v23/context"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/x/ref/services/mgmt/binary/impl"
"v.io/x/ref/test/testutil"
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index fbab4d0..3d601d7 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -9,7 +9,7 @@
"os"
"v.io/v23"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
"v.io/x/lib/vlog"
"v.io/x/ref/lib/signals"
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index 140cc39..7eba418 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -14,7 +14,7 @@
"v.io/v23"
"v.io/v23/context"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
_ "v.io/x/ref/profiles"
"v.io/x/ref/test"
diff --git a/services/mgmt/build/impl/service.go b/services/mgmt/build/impl/service.go
index 1466d55..54adcc9 100644
--- a/services/mgmt/build/impl/service.go
+++ b/services/mgmt/build/impl/service.go
@@ -14,8 +14,8 @@
"runtime"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/build"
"v.io/v23/verror"
"v.io/x/lib/host"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/build/impl/util.go b/services/mgmt/build/impl/util.go
index cff6ed0..8619690 100644
--- a/services/mgmt/build/impl/util.go
+++ b/services/mgmt/build/impl/util.go
@@ -7,7 +7,7 @@
import (
"runtime"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
)
func getArch() build.Architecture {
diff --git a/services/mgmt/debug/dispatcher_test.go b/services/mgmt/debug/dispatcher_test.go
index af0f472..30d065a 100644
--- a/services/mgmt/debug/dispatcher_test.go
+++ b/services/mgmt/debug/dispatcher_test.go
@@ -20,9 +20,9 @@
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/logreader"
- "v.io/v23/services/mgmt/stats"
- vtracesvc "v.io/v23/services/mgmt/vtrace"
+ "v.io/v23/services/logreader"
+ "v.io/v23/services/stats"
+ s_vtrace "v.io/v23/services/vtrace"
"v.io/v23/vdl"
"v.io/v23/verror"
"v.io/v23/vtrace"
@@ -151,7 +151,7 @@
// Access vtrace.
{
- vt := vtracesvc.StoreClient(naming.JoinAddressName(endpoint, "debug/vtrace"))
+ vt := s_vtrace.StoreClient(naming.JoinAddressName(endpoint, "debug/vtrace"))
call, err := vt.AllTraces(ctx)
if err != nil {
t.Errorf("AllTraces failed: %v", err)
diff --git a/services/mgmt/device/config/config.go b/services/mgmt/device/config/config.go
index f60ca22..16b96b0 100644
--- a/services/mgmt/device/config/config.go
+++ b/services/mgmt/device/config/config.go
@@ -30,7 +30,7 @@
"v.io/x/ref/envvar"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
)
diff --git a/services/mgmt/device/config/config_test.go b/services/mgmt/device/config/config_test.go
index 149fe0c..4356961 100644
--- a/services/mgmt/device/config/config_test.go
+++ b/services/mgmt/device/config/config_test.go
@@ -13,7 +13,7 @@
"v.io/x/ref/services/mgmt/device/config"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
)
// TestState checks that encoding/decoding State to child/from parent works
diff --git a/services/mgmt/device/doc.go b/services/mgmt/device/doc.go
index 99285d5..92919c7 100644
--- a/services/mgmt/device/doc.go
+++ b/services/mgmt/device/doc.go
@@ -21,10 +21,9 @@
// link to enable auto-updates. To enable updates, in addition to the symbolic
// link path, the device manager needs to be told what its application metadata
// is (such as command-line arguments and environment variables, i.e. the
-// application envelope defined in the veyron2/services/mgmt/application
-// package), as well as the object name for where it can fetch an updated
-// envelope, and the local filesystem path for its previous version (for
-// rollbacks).
+// application envelope defined in the v.io/v23/services/application package),
+// as well as the object name for where it can fetch an updated envelope, and
+// the local filesystem path for its previous version (for rollbacks).
//
// Finally, the device manager needs to know its own object name, so it can pass
// that along to the applications that it starts.
diff --git a/services/mgmt/device/impl/app_service.go b/services/mgmt/device/impl/app_service.go
index 1de87ed..69b3531 100644
--- a/services/mgmt/device/impl/app_service.go
+++ b/services/mgmt/device/impl/app_service.go
@@ -145,9 +145,9 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/appcycle"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/appcycle"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/device/impl/app_state.go b/services/mgmt/device/impl/app_state.go
index 6c191c2..97a7964 100644
--- a/services/mgmt/device/impl/app_state.go
+++ b/services/mgmt/device/impl/app_state.go
@@ -10,7 +10,7 @@
"os"
"path/filepath"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/v23/verror"
)
diff --git a/services/mgmt/device/impl/app_state_test.go b/services/mgmt/device/impl/app_state_test.go
index 6057069..f0e626d 100644
--- a/services/mgmt/device/impl/app_state_test.go
+++ b/services/mgmt/device/impl/app_state_test.go
@@ -9,7 +9,7 @@
"os"
"testing"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
)
// TestInstallationState verifies the state transition logic for app installations.
diff --git a/services/mgmt/device/impl/association_state.go b/services/mgmt/device/impl/association_state.go
index 8a5a673..2f25912 100644
--- a/services/mgmt/device/impl/association_state.go
+++ b/services/mgmt/device/impl/association_state.go
@@ -10,7 +10,7 @@
"path/filepath"
"sync"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/v23/verror"
)
diff --git a/services/mgmt/device/impl/association_state_test.go b/services/mgmt/device/impl/association_state_test.go
index 0d09a89..0c5bb8a 100644
--- a/services/mgmt/device/impl/association_state_test.go
+++ b/services/mgmt/device/impl/association_state_test.go
@@ -11,7 +11,7 @@
"path"
"testing"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/x/ref/services/mgmt/device/impl"
)
diff --git a/services/mgmt/device/impl/device_installer.go b/services/mgmt/device/impl/device_installer.go
index 8175e10..d880d36 100644
--- a/services/mgmt/device/impl/device_installer.go
+++ b/services/mgmt/device/impl/device_installer.go
@@ -54,7 +54,7 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/x/ref/envvar"
"v.io/x/ref/services/mgmt/device/config"
diff --git a/services/mgmt/device/impl/device_service.go b/services/mgmt/device/impl/device_service.go
index 86a3ae1..6761f2e 100644
--- a/services/mgmt/device/impl/device_service.go
+++ b/services/mgmt/device/impl/device_service.go
@@ -58,9 +58,9 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/application"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/device"
"v.io/v23/verror"
"v.io/x/lib/vlog"
"v.io/x/ref/lib/flags/buildinfo"
diff --git a/services/mgmt/device/impl/dispatcher.go b/services/mgmt/device/impl/dispatcher.go
index 044243b..4f0f4fa 100644
--- a/services/mgmt/device/impl/dispatcher.go
+++ b/services/mgmt/device/impl/dispatcher.go
@@ -25,9 +25,9 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/pprof"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/device"
+ "v.io/v23/services/pprof"
+ "v.io/v23/services/stats"
"v.io/v23/vdl"
"v.io/v23/vdlroot/signature"
"v.io/v23/verror"
diff --git a/services/mgmt/device/impl/impl_test.go b/services/mgmt/device/impl/impl_test.go
index 2991672..d155a1d 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -38,9 +38,9 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/ref/envvar"
diff --git a/services/mgmt/device/impl/instance_reaping.go b/services/mgmt/device/impl/instance_reaping.go
index 0ca7e88..2c7da8c 100644
--- a/services/mgmt/device/impl/instance_reaping.go
+++ b/services/mgmt/device/impl/instance_reaping.go
@@ -12,8 +12,8 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/device"
+ "v.io/v23/services/stats"
"v.io/v23/vdl"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/device/impl/instance_reaping_test.go b/services/mgmt/device/impl/instance_reaping_test.go
index cdb7158..8b0e906 100644
--- a/services/mgmt/device/impl/instance_reaping_test.go
+++ b/services/mgmt/device/impl/instance_reaping_test.go
@@ -14,8 +14,8 @@
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/device"
+ "v.io/v23/services/stats"
"v.io/v23/vdl"
"v.io/x/ref/envvar"
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index 04d9817..527c01c 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -17,9 +17,9 @@
"v.io/v23/context"
"v.io/v23/rpc"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/device/impl/only_for_test.go b/services/mgmt/device/impl/only_for_test.go
index aaea14e..23bcc37 100644
--- a/services/mgmt/device/impl/only_for_test.go
+++ b/services/mgmt/device/impl/only_for_test.go
@@ -11,7 +11,7 @@
"path/filepath"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/device"
"v.io/x/lib/vlog"
)
diff --git a/services/mgmt/device/impl/profile.go b/services/mgmt/device/impl/profile.go
index 7e810ac..b430bdb 100644
--- a/services/mgmt/device/impl/profile.go
+++ b/services/mgmt/device/impl/profile.go
@@ -13,8 +13,8 @@
"v.io/x/ref/services/mgmt/profile"
- "v.io/v23/services/mgmt/build"
- "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/build"
+ "v.io/v23/services/device"
)
// ComputeDeviceProfile generates a description of the runtime
diff --git a/services/mgmt/device/impl/proxy_invoker_test.go b/services/mgmt/device/impl/proxy_invoker_test.go
index ef6063b..5f8f002 100644
--- a/services/mgmt/device/impl/proxy_invoker_test.go
+++ b/services/mgmt/device/impl/proxy_invoker_test.go
@@ -13,7 +13,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/stats"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/device/impl/util.go b/services/mgmt/device/impl/util.go
index c449ae2..25836e8 100644
--- a/services/mgmt/device/impl/util.go
+++ b/services/mgmt/device/impl/util.go
@@ -19,8 +19,8 @@
"v.io/v23/context"
"v.io/v23/security"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
)
diff --git a/services/mgmt/device/impl/util_test.go b/services/mgmt/device/impl/util_test.go
index 7e0614c..8158ddc 100644
--- a/services/mgmt/device/impl/util_test.go
+++ b/services/mgmt/device/impl/util_test.go
@@ -25,11 +25,11 @@
"v.io/v23/options"
"v.io/v23/rpc"
"v.io/v23/security"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/device"
- "v.io/v23/services/mgmt/logreader"
- "v.io/v23/services/mgmt/pprof"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/application"
+ "v.io/v23/services/device"
+ "v.io/v23/services/logreader"
+ "v.io/v23/services/pprof"
+ "v.io/v23/services/stats"
"v.io/v23/verror"
_ "v.io/x/ref/profiles/roaming"
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index ae17686..aae347a 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -24,8 +24,8 @@
"v.io/v23"
"v.io/v23/context"
"v.io/v23/security"
- "v.io/v23/services/mgmt/binary"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/binary"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index 49388d7..91523f6 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -16,7 +16,7 @@
"v.io/v23"
"v.io/v23/context"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index 442d327..b1b3179 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -19,7 +19,7 @@
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
"v.io/v23/vom"
)
diff --git a/services/mgmt/lib/fs/simplestore_test.go b/services/mgmt/lib/fs/simplestore_test.go
index df723d3..4d10f66 100644
--- a/services/mgmt/lib/fs/simplestore_test.go
+++ b/services/mgmt/lib/fs/simplestore_test.go
@@ -12,7 +12,7 @@
"testing"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/v23/verror"
"v.io/x/ref/services/mgmt/lib/fs"
_ "v.io/x/ref/services/mgmt/profile"
diff --git a/services/mgmt/lib/packages/packages.go b/services/mgmt/lib/packages/packages.go
index 26b7584..2522a04 100644
--- a/services/mgmt/lib/packages/packages.go
+++ b/services/mgmt/lib/packages/packages.go
@@ -17,7 +17,7 @@
"path/filepath"
"strings"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/v23/verror"
)
diff --git a/services/mgmt/lib/packages/packages_test.go b/services/mgmt/lib/packages/packages_test.go
index 247ab80..43a062d 100644
--- a/services/mgmt/lib/packages/packages_test.go
+++ b/services/mgmt/lib/packages/packages_test.go
@@ -16,7 +16,7 @@
"sort"
"testing"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/repository"
"v.io/x/ref/services/mgmt/lib/packages"
)
diff --git a/services/mgmt/logreader/impl/logfile.go b/services/mgmt/logreader/impl/logfile.go
index b1eb185..10d9db4 100644
--- a/services/mgmt/logreader/impl/logfile.go
+++ b/services/mgmt/logreader/impl/logfile.go
@@ -3,9 +3,9 @@
// license that can be found in the LICENSE file.
// Package impl implements the LogFile interface from
-// v.io/v23/services/mgmt/logreader, which can be used to allow remote access to
-// log files, and the Globbable interface from v.io/v23/services/mounttable to
-// find the files in a logs directory.
+// v.io/v23/services/logreader, which can be used to allow remote access to log
+// files, and the Globbable interface from v.io/v23/services/mounttable to find
+// the files in a logs directory.
package impl
import (
@@ -16,7 +16,7 @@
"strings"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/logreader"
"v.io/v23/verror"
"v.io/x/lib/vlog"
)
diff --git a/services/mgmt/logreader/impl/logfile_test.go b/services/mgmt/logreader/impl/logfile_test.go
index fa3081a..8e9d229 100644
--- a/services/mgmt/logreader/impl/logfile_test.go
+++ b/services/mgmt/logreader/impl/logfile_test.go
@@ -15,7 +15,7 @@
"v.io/v23/naming"
"v.io/v23/rpc"
"v.io/v23/security"
- "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/logreader"
"v.io/v23/verror"
_ "v.io/x/ref/profiles"
diff --git a/services/mgmt/pprof/client/proxy.go b/services/mgmt/pprof/client/proxy.go
index 6a1086a..eab49fc 100644
--- a/services/mgmt/pprof/client/proxy.go
+++ b/services/mgmt/pprof/client/proxy.go
@@ -21,7 +21,7 @@
"time"
"v.io/v23/context"
- "v.io/v23/services/mgmt/pprof"
+ "v.io/v23/services/pprof"
"v.io/v23/vtrace"
)
diff --git a/services/mgmt/pprof/impl/server.go b/services/mgmt/pprof/impl/server.go
index 3693b63..a373cbf 100644
--- a/services/mgmt/pprof/impl/server.go
+++ b/services/mgmt/pprof/impl/server.go
@@ -12,7 +12,7 @@
"time"
"v.io/v23/rpc"
- spprof "v.io/v23/services/mgmt/pprof"
+ spprof "v.io/v23/services/pprof"
"v.io/v23/verror"
)
diff --git a/services/mgmt/profile/profile.vdl b/services/mgmt/profile/profile.vdl
index 462b230..5b783b7 100644
--- a/services/mgmt/profile/profile.vdl
+++ b/services/mgmt/profile/profile.vdl
@@ -6,7 +6,7 @@
// types used by the implementation of Vanadium profiles.
package profile
-import "v.io/v23/services/mgmt/build"
+import "v.io/v23/services/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 f6268ee..b64bd42 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -14,7 +14,7 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
)
// Library describes a shared library that applications may use.
diff --git a/services/mgmt/profile/profiled/impl_test.go b/services/mgmt/profile/profiled/impl_test.go
index ba1c88b..0a92df8 100644
--- a/services/mgmt/profile/profiled/impl_test.go
+++ b/services/mgmt/profile/profiled/impl_test.go
@@ -12,7 +12,7 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/build"
"v.io/x/ref/services/mgmt/profile"
"v.io/x/ref/services/mgmt/repository"
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index 4f6f1b3..8b8f879 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -8,9 +8,9 @@
import (
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/application"
"v.io/x/ref/services/mgmt/profile"
- public "v.io/v23/services/mgmt/repository"
+ public "v.io/v23/services/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 7134d5f..fe46e75 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -18,9 +18,9 @@
// VDL user imports
"v.io/v23/security/access"
- "v.io/v23/services/mgmt/application"
- "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/application"
"v.io/v23/services/permissions"
+ "v.io/v23/services/repository"
"v.io/x/ref/services/mgmt/profile"
)
@@ -185,7 +185,7 @@
PkgPath: "v.io/x/ref/services/mgmt/repository",
Doc: "// Application describes an application repository internally. Besides\n// the public Application interface, it allows to add and remove\n// application envelopes.",
Embeds: []rpc.EmbedDesc{
- {"Application", "v.io/v23/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
+ {"Application", "v.io/v23/services/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
},
Methods: []rpc.MethodDesc{
{
@@ -362,7 +362,7 @@
PkgPath: "v.io/x/ref/services/mgmt/repository",
Doc: "// Profile describes a profile internally. Besides the public Profile\n// interface, it allows to add and remove profile specifications.",
Embeds: []rpc.EmbedDesc{
- {"Profile", "v.io/v23/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
+ {"Profile", "v.io/v23/services/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
},
Methods: []rpc.MethodDesc{
{
diff --git a/services/mgmt/stats/impl/stats.go b/services/mgmt/stats/impl/stats.go
index 6a39a45..503420a 100644
--- a/services/mgmt/stats/impl/stats.go
+++ b/services/mgmt/stats/impl/stats.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// Package impl implements the Stats interface from
-// v.io/v23/services/mgmt/stats.
+// v.io/v23/services/stats.
package impl
import (
@@ -14,7 +14,7 @@
"v.io/v23/naming"
"v.io/v23/rpc"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/stats"
"v.io/v23/services/watch"
"v.io/v23/vdl"
"v.io/v23/verror"
diff --git a/services/mgmt/stats/impl/stats_test.go b/services/mgmt/stats/impl/stats_test.go
index 02e2f7c..ca5a184 100644
--- a/services/mgmt/stats/impl/stats_test.go
+++ b/services/mgmt/stats/impl/stats_test.go
@@ -14,7 +14,7 @@
"v.io/v23/context"
"v.io/v23/naming"
"v.io/v23/security"
- "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/stats"
"v.io/v23/services/watch"
"v.io/v23/vdl"
diff --git a/services/mgmt/vtrace/impl/vtrace.go b/services/mgmt/vtrace/impl/vtrace.go
index c5ca6b2..b9e54b5 100644
--- a/services/mgmt/vtrace/impl/vtrace.go
+++ b/services/mgmt/vtrace/impl/vtrace.go
@@ -6,7 +6,7 @@
import (
"v.io/v23/rpc"
- svtrace "v.io/v23/services/mgmt/vtrace"
+ s_vtrace "v.io/v23/services/vtrace"
"v.io/v23/uniqueid"
"v.io/v23/verror"
"v.io/v23/vtrace"
@@ -23,7 +23,7 @@
return *tr, nil
}
-func (v *vtraceService) AllTraces(call svtrace.StoreAllTracesServerCall) error {
+func (v *vtraceService) AllTraces(call s_vtrace.StoreAllTracesServerCall) error {
// TODO(mattr): Consider changing the store to allow us to iterate through traces
// when there are many.
store := vtrace.GetStore(call.Context())
@@ -37,5 +37,5 @@
}
func NewVtraceService() interface{} {
- return svtrace.StoreServer(&vtraceService{})
+ return s_vtrace.StoreServer(&vtraceService{})
}
diff --git a/services/mgmt/vtrace/impl/vtrace_test.go b/services/mgmt/vtrace/impl/vtrace_test.go
index 1084e5f..1134981 100644
--- a/services/mgmt/vtrace/impl/vtrace_test.go
+++ b/services/mgmt/vtrace/impl/vtrace_test.go
@@ -9,7 +9,7 @@
"testing"
"v.io/v23"
- service "v.io/v23/services/mgmt/vtrace"
+ s_vtrace "v.io/v23/services/vtrace"
"v.io/v23/vtrace"
_ "v.io/x/ref/profiles"
@@ -40,7 +40,7 @@
span.Finish()
id := span.Trace()
- client := service.StoreClient(endpoints[0].Name())
+ client := s_vtrace.StoreClient(endpoints[0].Name())
sctx, _ = vtrace.SetNewTrace(sctx)
trace, err := client.Trace(sctx, id)
