sensorlog: Fix paths after migration, drop _lite suffix.
Change-Id: I798a6f8704603ff1141130662c57c3ea3672c5aa
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b294e50..18f9ea5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,3 +8,5 @@
#
# Names should be added to this file as:
# Name <email address>
+Ivan Pilat <ivanpi@google.com>
+Jatin Lodhia <jlodhia@google.com>
diff --git a/go/src/v.io/x/sensorlog/Makefile b/go/src/v.io/x/sensorlog/Makefile
index d880055..93f8c02 100644
--- a/go/src/v.io/x/sensorlog/Makefile
+++ b/go/src/v.io/x/sensorlog/Makefile
@@ -1,7 +1,7 @@
-PATH := $(JIRI_ROOT)/experimental/projects/sensorlog_lite/bin:$(JIRI_ROOT)/release/go/bin:$(PATH)
+PATH := $(JIRI_ROOT)/release/projects/sensorlog/go/bin:$(JIRI_ROOT)/release/go/bin:$(PATH)
SHELL := /bin/bash -euo pipefail
-export GOPATH := $(JIRI_ROOT)/experimental/projects/sensorlog_lite:$(GOPATH)
-export VDLPATH := $(JIRI_ROOT)/experimental/projects/sensorlog_lite/src:$(VDLPATH)
+export GOPATH := $(JIRI_ROOT)/release/projects/sensorlog/go:$(GOPATH)
+export VDLPATH := $(JIRI_ROOT)/release/projects/sensorlog/go/src:$(VDLPATH)
.DELETE_ON_ERROR:
@@ -10,11 +10,11 @@
.PHONY: measured
measured:
- jiri go install v.io/x/sensorlog_lite/measured
+ jiri go install v.io/x/sensorlog/measured
.PHONY: slcli
slcli:
- jiri go install v.io/x/sensorlog_lite/slcli
+ jiri go install v.io/x/sensorlog/slcli
.PHONY: run-deps
run-deps:
@@ -25,6 +25,6 @@
.PHONY: test
test:
- jiri go test v.io/x/sensorlog_lite/...
+ jiri go test v.io/x/sensorlog/...
# TODO(ivanpi): Add jiri command to run integration tests.
- jiri go test v.io/x/sensorlog_lite/internal/client -run=TestV23* -v23.tests
+ jiri go test v.io/x/sensorlog/internal/client -run=TestV23* -v23.tests
diff --git a/go/src/v.io/x/sensorlog/README.md b/go/src/v.io/x/sensorlog/README.md
index 734d822..670c017 100644
--- a/go/src/v.io/x/sensorlog/README.md
+++ b/go/src/v.io/x/sensorlog/README.md
@@ -1,9 +1,9 @@
-# Sensor Log Lite
+# Sensor Log
-Sensor Log Lite is an example Syncbase application for measuring streams of
+Sensor Log is an example Syncbase application for measuring streams of
time series data on a group of devices.
-A Sensor Log Lite system consists of a master and any number of measuring
+A Sensor Log system consists of a master and any number of measuring
devices. The master device runs Syncbase and the command line client
(`slcli`), while each measuring device runs Syncbase and the measuring
daemon (`measured`). The client controls the measuring daemon through
@@ -85,4 +85,4 @@
The internal state of the master Syncbase can be examined using `sb`:
- $ V23_CREDENTIALS=<creds> ${JIRI_ROOT}/release/go/bin/vbecome -name sl:client:main ${JIRI_ROOT}/release/go/bin/sb -service /$(dig $(hostname) +short):8202/sl/client/main/syncbased sh sensorlog_lite sldb
+ $ V23_CREDENTIALS=<creds> ${JIRI_ROOT}/release/go/bin/vbecome -name sl:client:main ${JIRI_ROOT}/release/go/bin/sb -service /$(dig $(hostname) +short):8202/sl/client/main/syncbased sh sensorlog sldb
diff --git a/go/src/v.io/x/sensorlog/internal/client/device.go b/go/src/v.io/x/sensorlog/internal/client/device.go
index ee266e3..cfb4326 100644
--- a/go/src/v.io/x/sensorlog/internal/client/device.go
+++ b/go/src/v.io/x/sensorlog/internal/client/device.go
@@ -13,9 +13,9 @@
nosql_wire "v.io/v23/services/syncbase/nosql"
"v.io/v23/syncbase/nosql"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
// AddDevice joins the syncgroup of the measuring device identified by devId,
diff --git a/go/src/v.io/x/sensorlog/internal/client/device_v23_test.go b/go/src/v.io/x/sensorlog/internal/client/device_v23_test.go
index 98a9182..d45e3d4 100644
--- a/go/src/v.io/x/sensorlog/internal/client/device_v23_test.go
+++ b/go/src/v.io/x/sensorlog/internal/client/device_v23_test.go
@@ -20,11 +20,11 @@
sbtu "v.io/x/ref/services/syncbase/testutil"
"v.io/x/ref/test/modules"
"v.io/x/ref/test/v23tests"
- slltu "v.io/x/sensorlog_lite/internal/client/testutil"
- "v.io/x/sensorlog_lite/internal/measure"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
- "v.io/x/sensorlog_lite/internal/util"
+ slltu "v.io/x/sensorlog/internal/client/testutil"
+ "v.io/x/sensorlog/internal/measure"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
+ "v.io/x/sensorlog/internal/util"
)
//go:generate jiri test generate
diff --git a/go/src/v.io/x/sensorlog/internal/client/list.go b/go/src/v.io/x/sensorlog/internal/client/list.go
index e2aedb0..e658247 100644
--- a/go/src/v.io/x/sensorlog/internal/client/list.go
+++ b/go/src/v.io/x/sensorlog/internal/client/list.go
@@ -15,8 +15,8 @@
"v.io/v23/services/watch"
"v.io/v23/syncbase/nosql"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
type ListCallback func(key *sbmodel.KDataPoint, val sbmodel.VDataPoint) error
diff --git a/go/src/v.io/x/sensorlog/internal/client/measured_v23_test.go b/go/src/v.io/x/sensorlog/internal/client/measured_v23_test.go
index 8558501..5c1a187 100644
--- a/go/src/v.io/x/sensorlog/internal/client/measured_v23_test.go
+++ b/go/src/v.io/x/sensorlog/internal/client/measured_v23_test.go
@@ -18,10 +18,10 @@
sbtu "v.io/x/ref/services/syncbase/testutil"
"v.io/x/ref/test/modules"
"v.io/x/ref/test/v23tests"
- "v.io/x/sensorlog_lite/internal/client"
- slltu "v.io/x/sensorlog_lite/internal/client/testutil"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/client"
+ slltu "v.io/x/sensorlog/internal/client/testutil"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
//go:generate jiri test generate
@@ -47,7 +47,7 @@
time.Sleep(1 * time.Second)
// Start measured.
- measuredBin := t.BuildV23Pkg("v.io/x/sensorlog_lite/measured")
+ measuredBin := t.BuildV23Pkg("v.io/x/sensorlog/measured")
devId := "measured1"
publishSb := naming.Join(mtName, measuredSb)
measuredOpts := measuredBin.StartOpts().WithCustomCredentials(measuredCreds).WithSessions(t, 180*time.Second)
diff --git a/go/src/v.io/x/sensorlog/internal/client/stream.go b/go/src/v.io/x/sensorlog/internal/client/stream.go
index 74a9fb5..4462097 100644
--- a/go/src/v.io/x/sensorlog/internal/client/stream.go
+++ b/go/src/v.io/x/sensorlog/internal/client/stream.go
@@ -15,9 +15,9 @@
nosql_wire "v.io/v23/services/syncbase/nosql"
"v.io/v23/syncbase/nosql"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
// CreateStream writes the configuration for a new sampling stream to Syncbase.
diff --git a/go/src/v.io/x/sensorlog/internal/client/testutil/testutil.go b/go/src/v.io/x/sensorlog/internal/client/testutil/testutil.go
index 80b6f5e..b31a6c5 100644
--- a/go/src/v.io/x/sensorlog/internal/client/testutil/testutil.go
+++ b/go/src/v.io/x/sensorlog/internal/client/testutil/testutil.go
@@ -12,9 +12,9 @@
"v.io/v23"
"v.io/v23/verror"
"v.io/x/ref/test/modules"
- "v.io/x/sensorlog_lite/internal/client"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/client"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
// Required parameters: sbService, devId, publishSb
diff --git a/go/src/v.io/x/sensorlog/internal/config/defaults.go b/go/src/v.io/x/sensorlog/internal/config/defaults.go
index a948ae2..28d0b40 100644
--- a/go/src/v.io/x/sensorlog/internal/config/defaults.go
+++ b/go/src/v.io/x/sensorlog/internal/config/defaults.go
@@ -14,7 +14,7 @@
const (
DefaultSbService = "syncbase"
- AppName = "sensorlog_lite"
+ AppName = "sensorlog"
DBName = "sldb"
SyncPriority = 42
@@ -30,5 +30,5 @@
)
func SyncgroupName(publishService, devId string) string {
- return naming.Join(publishService, "%%sync", "sllite", "dev", devId)
+ return naming.Join(publishService, "%%sync", "sl", "dev", devId)
}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop.go b/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop.go
index 8f854a2..1f4ae19 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop.go
@@ -10,9 +10,9 @@
"time"
"v.io/v23/context"
- "v.io/x/sensorlog_lite/internal/measure/sampler"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/measure/sampler"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/util"
)
type DataCallback func(ctx *context.T, key *sbmodel.KDataPoint, val sbmodel.VDataPoint) error
diff --git a/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop_test.go b/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop_test.go
index 4c56b6a..b535f46 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/runloop/runloop_test.go
@@ -13,9 +13,9 @@
"v.io/v23/context"
tu "v.io/x/ref/test/testutil"
- "v.io/x/sensorlog_lite/internal/measure/sampler"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/measure/sampler"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/util"
)
// Time delay quantum. It is assumed that several goroutines can reliably
diff --git a/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler.go b/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler.go
index ee54ec1..bf4561f 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler.go
@@ -16,8 +16,8 @@
"time"
"v.io/v23/context"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
)
type MeasureCallback func(result *MeasureResult) error
diff --git a/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler_test.go b/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler_test.go
index 04466c4..147828e 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/sampler/sampler_test.go
@@ -11,8 +11,8 @@
"v.io/v23/context"
tu "v.io/x/ref/test/testutil"
- "v.io/x/sensorlog_lite/internal/measure/sampler"
- "v.io/x/sensorlog_lite/internal/sbmodel"
+ "v.io/x/sensorlog/internal/measure/sampler"
+ "v.io/x/sensorlog/internal/sbmodel"
)
// Runs the sampler script and verifies that the callback was called with the
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
index 1ee3909..9e5c17d 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
@@ -15,10 +15,10 @@
nosql_wire "v.io/v23/services/syncbase/nosql"
"v.io/v23/syncbase/nosql"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbutil"
)
// InitSyncgroup creates the syncgroup for the measuring device devId, giving
@@ -56,7 +56,7 @@
// Admin client has full permissions, measured drops to readonly.
prefixStreamDef := nosql_wire.TableRow{
TableName: sbmodel.KStreamDef{}.Table(),
- Row: devId,
+ Row: devId,
}
aclStreamDef := access.Permissions{}
sbutil.AddPermsForPrincipal(&aclStreamDef, v23.GetPrincipal(ctx), access.Resolve, access.Read)
@@ -67,7 +67,7 @@
// Admin client has full permissions, measured drops to read/write.
prefixDataPoint := nosql_wire.TableRow{
TableName: sbmodel.KDataPoint{}.Table(),
- Row: devId,
+ Row: devId,
}
aclDataPoint := access.Permissions{}
sbutil.AddPermsForPrincipal(&aclDataPoint, v23.GetPrincipal(ctx), access.Resolve, access.Read, access.Write)
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
index d447fa6..6e5f1a2 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
@@ -12,10 +12,10 @@
"v.io/v23/security/access"
_ "v.io/x/ref/runtime/factories/generic"
sbtu "v.io/x/ref/services/syncbase/testutil"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/measure"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/measure"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
func TestCreateSyncgroup(t *testing.T) {
diff --git a/go/src/v.io/x/sensorlog/internal/measure/watcher.go b/go/src/v.io/x/sensorlog/internal/measure/watcher.go
index 6f7897e..3340308 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/watcher.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/watcher.go
@@ -13,8 +13,8 @@
nosql_wire "v.io/v23/services/syncbase/nosql"
"v.io/v23/services/watch"
"v.io/v23/syncbase/nosql"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
// RegisterWorker is called with the key and value of a new or modified
diff --git a/go/src/v.io/x/sensorlog/internal/measure/watcher_test.go b/go/src/v.io/x/sensorlog/internal/measure/watcher_test.go
index b28cb78..b05c271 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/watcher_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/watcher_test.go
@@ -16,11 +16,11 @@
_ "v.io/x/ref/runtime/factories/generic"
sbtu "v.io/x/ref/services/syncbase/testutil"
tu "v.io/x/ref/test/testutil"
- "v.io/x/sensorlog_lite/internal/measure"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
- "v.io/x/sensorlog_lite/internal/sbutil"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/measure"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbutil"
+ "v.io/x/sensorlog/internal/util"
)
var watchTables = []sbmodel.TableSpec{
diff --git a/go/src/v.io/x/sensorlog/internal/sbmodel/types.go b/go/src/v.io/x/sensorlog/internal/sbmodel/types.go
index 32167f6..73aceac 100644
--- a/go/src/v.io/x/sensorlog/internal/sbmodel/types.go
+++ b/go/src/v.io/x/sensorlog/internal/sbmodel/types.go
@@ -7,7 +7,7 @@
package sbmodel
import (
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
// PersistentDataKey is a type encapsulating data from the row key of a
diff --git a/go/src/v.io/x/sensorlog/internal/sbmodel/types.vdl.go b/go/src/v.io/x/sensorlog/internal/sbmodel/types.vdl.go
index 3f1c289..bd2c241 100644
--- a/go/src/v.io/x/sensorlog/internal/sbmodel/types.vdl.go
+++ b/go/src/v.io/x/sensorlog/internal/sbmodel/types.vdl.go
@@ -32,7 +32,7 @@
}
func (VDeviceCfg) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.VDeviceCfg"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.VDeviceCfg"`
}) {
}
@@ -41,7 +41,7 @@
}
func (KDeviceCfg) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.KDeviceCfg"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.KDeviceCfg"`
}) {
}
@@ -57,7 +57,7 @@
}
func (VStreamDef) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.VStreamDef"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.VStreamDef"`
}) {
}
@@ -67,7 +67,7 @@
}
func (KStreamDef) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.KStreamDef"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.KStreamDef"`
}) {
}
@@ -82,7 +82,7 @@
}
func (SamplerDef) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.SamplerDef"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.SamplerDef"`
}) {
}
@@ -95,7 +95,7 @@
}
func (KDataPoint) __VDLReflect(struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.KDataPoint"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.KDataPoint"`
}) {
}
@@ -117,7 +117,7 @@
VDataPointError struct{ Value string }
// __VDataPointReflect describes the VDataPoint union type.
__VDataPointReflect struct {
- Name string `vdl:"v.io/x/sensorlog_lite/internal/sbmodel.VDataPoint"`
+ Name string `vdl:"v.io/x/sensorlog/internal/sbmodel.VDataPoint"`
Type VDataPoint
Union struct {
Value VDataPointValue
diff --git a/go/src/v.io/x/sensorlog/internal/sbmodel/types_test.go b/go/src/v.io/x/sensorlog/internal/sbmodel/types_test.go
index f166f99..c82ced7 100644
--- a/go/src/v.io/x/sensorlog/internal/sbmodel/types_test.go
+++ b/go/src/v.io/x/sensorlog/internal/sbmodel/types_test.go
@@ -9,8 +9,8 @@
"testing"
"time"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbmodel/keyutil"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbmodel/keyutil"
)
type keyTest interface {
diff --git a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase.go b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase.go
index 1bc1784..3e0eedd 100644
--- a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase.go
+++ b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase.go
@@ -13,8 +13,8 @@
"v.io/v23/syncbase"
"v.io/v23/syncbase/nosql"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
)
// CreateOrOpenDB opens the Sensor Log database hosted on specified Syncbase
diff --git a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
index 8b4155a..e57a228 100644
--- a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
+++ b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
@@ -13,8 +13,8 @@
"v.io/v23/verror"
_ "v.io/x/ref/runtime/factories/generic"
sbtu "v.io/x/ref/services/syncbase/testutil"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
func TestCreateOrOpenDB(t *testing.T) {
diff --git a/go/src/v.io/x/sensorlog/internal/util/util_test.go b/go/src/v.io/x/sensorlog/internal/util/util_test.go
index 90a820f..d4b29c7 100644
--- a/go/src/v.io/x/sensorlog/internal/util/util_test.go
+++ b/go/src/v.io/x/sensorlog/internal/util/util_test.go
@@ -11,7 +11,7 @@
"v.io/v23/context"
"v.io/v23/verror"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/util"
)
var (
diff --git a/go/src/v.io/x/sensorlog/measured/measured.go b/go/src/v.io/x/sensorlog/measured/measured.go
index 7c75976..f44eff4 100644
--- a/go/src/v.io/x/sensorlog/measured/measured.go
+++ b/go/src/v.io/x/sensorlog/measured/measured.go
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// measured is the Sensor Log Lite measuring daemon. Runs on any device,
-// sampling data points and writing them to Syncbase. Sampling configuration
-// is read from Syncbase as written by the client.
+// measured is the Sensor Log measuring daemon. Runs on any device, sampling
+// data points and writing them to Syncbase. Sampling configuration is read
+// from Syncbase as written by the client.
package main
import (
@@ -17,12 +17,12 @@
"v.io/x/lib/vlog"
"v.io/x/ref/lib/signals"
_ "v.io/x/ref/runtime/factories/generic"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/measure"
- "v.io/x/sensorlog_lite/internal/measure/runloop"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/measure"
+ "v.io/x/sensorlog/internal/measure/runloop"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
+ "v.io/x/sensorlog/internal/util"
)
var (
diff --git a/go/src/v.io/x/sensorlog/scripts/run_cli_syncbased.sh b/go/src/v.io/x/sensorlog/scripts/run_cli_syncbased.sh
index e8ca090..53b4c4f 100755
--- a/go/src/v.io/x/sensorlog/scripts/run_cli_syncbased.sh
+++ b/go/src/v.io/x/sensorlog/scripts/run_cli_syncbased.sh
@@ -7,7 +7,7 @@
set -eu
-source "${JIRI_ROOT}/experimental/projects/sensorlog_lite/src/v.io/x/sensorlog_lite/scripts/runner_lib.sh"
+source "${JIRI_ROOT}/release/projects/sensorlog/go/src/v.io/x/sensorlog/scripts/runner_lib.sh"
# Must be run with V23_CREDENTIALS set or through the agent.
# Optional environment variables: SL_PREFIX, SL_DEVID, SL_IPADDR_PORT, SL_TMPDIR
diff --git a/go/src/v.io/x/sensorlog/scripts/run_measured.sh b/go/src/v.io/x/sensorlog/scripts/run_measured.sh
index f034099..30e5c6d 100755
--- a/go/src/v.io/x/sensorlog/scripts/run_measured.sh
+++ b/go/src/v.io/x/sensorlog/scripts/run_measured.sh
@@ -19,7 +19,7 @@
set -eu
-source "${JIRI_ROOT}/experimental/projects/sensorlog_lite/src/v.io/x/sensorlog_lite/scripts/runner_lib.sh"
+source "${JIRI_ROOT}/release/projects/sensorlog/go/src/v.io/x/sensorlog/scripts/runner_lib.sh"
# Must be run with V23_CREDENTIALS set or through the agent.
# Optional environment variables: SL_PREFIX, SL_DEVID, SL_ADMIN, SL_IPADDR_PORT, SL_USER, SL_GLOBAL_MT, SL_TMPDIR
diff --git a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
index c503c91..96f9f0b 100644
--- a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
+++ b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
@@ -108,7 +108,7 @@
local -r DEF_BLESSING_ADMIN="$(name_to_blessing "$(get_blessing_root)/${ADMIN}")"
"${JIRI_ROOT}"/release/go/bin/vbecome -duration="${TIMEOUT}" \
-name="$(name_to_blessing "${NAME}")" \
- "${JIRI_ROOT}"/experimental/projects/sensorlog_lite/bin/measured -v23.namespace.root "${MT}" \
+ "${JIRI_ROOT}"/release/projects/sensorlog/go/bin/measured -v23.namespace.root "${MT}" \
-service "${NAME}/syncbased" -devid="${DEVID}" -admin="${DEF_BLESSING_ADMIN}" \
-publish-sb "${PUBLISH_SB}" -publish-mt="${PUBLISH_MT}" \
-alsologtostderr \
@@ -125,7 +125,7 @@
shift 2
"${JIRI_ROOT}"/release/go/bin/vbecome -duration="${TIMEOUT}" \
-name "$(name_to_blessing "${NAME}")" \
- "${JIRI_ROOT}"/experimental/projects/sensorlog_lite/bin/slcli -v23.namespace.root "${MT}" \
+ "${JIRI_ROOT}"/release/projects/sensorlog/go/bin/slcli -v23.namespace.root "${MT}" \
-service "${NAME}/syncbased" "$@"
}
export -f run_slcli
diff --git a/go/src/v.io/x/sensorlog/scripts/slcli.sh b/go/src/v.io/x/sensorlog/scripts/slcli.sh
index 04fe39c..36ae91f 100755
--- a/go/src/v.io/x/sensorlog/scripts/slcli.sh
+++ b/go/src/v.io/x/sensorlog/scripts/slcli.sh
@@ -7,7 +7,7 @@
set -eu
-source "${JIRI_ROOT}/experimental/projects/sensorlog_lite/src/v.io/x/sensorlog_lite/scripts/runner_lib.sh"
+source "${JIRI_ROOT}/release/projects/sensorlog/go/src/v.io/x/sensorlog/scripts/runner_lib.sh"
# Must be run with V23_CREDENTIALS set or through the agent.
# Optional environment variables: SL_PREFIX, SL_DEVID, SL_IPADDR_PORT
diff --git a/go/src/v.io/x/sensorlog/slcli/device.go b/go/src/v.io/x/sensorlog/slcli/device.go
index ee658f0..373e43c 100644
--- a/go/src/v.io/x/sensorlog/slcli/device.go
+++ b/go/src/v.io/x/sensorlog/slcli/device.go
@@ -12,9 +12,9 @@
"v.io/v23/context"
"v.io/x/lib/cmdline"
"v.io/x/ref/lib/v23cmd"
- "v.io/x/sensorlog_lite/internal/client"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/client"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
var cmdSLDevice = &cmdline.Command{
diff --git a/go/src/v.io/x/sensorlog/slcli/list.go b/go/src/v.io/x/sensorlog/slcli/list.go
index 3a87fa5..b62b448 100644
--- a/go/src/v.io/x/sensorlog/slcli/list.go
+++ b/go/src/v.io/x/sensorlog/slcli/list.go
@@ -13,11 +13,11 @@
"v.io/x/lib/cmdline"
"v.io/x/ref/lib/signals"
"v.io/x/ref/lib/v23cmd"
- "v.io/x/sensorlog_lite/internal/client"
- "v.io/x/sensorlog_lite/internal/config"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
- "v.io/x/sensorlog_lite/internal/util"
+ "v.io/x/sensorlog/internal/client"
+ "v.io/x/sensorlog/internal/config"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
+ "v.io/x/sensorlog/internal/util"
)
var cmdSLList = &cmdline.Command{
diff --git a/go/src/v.io/x/sensorlog/slcli/slcli.go b/go/src/v.io/x/sensorlog/slcli/slcli.go
index 20c65f6..d56e299 100644
--- a/go/src/v.io/x/sensorlog/slcli/slcli.go
+++ b/go/src/v.io/x/sensorlog/slcli/slcli.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// slcli is the Sensor Log Lite command line configuration tool and client.
+// slcli is the Sensor Log command line configuration tool and client.
// Must be run against master device Syncbase.
// Supports configuring sampling streams by writing configuration to Syncbase,
// which is then read by measured on the target device.
@@ -16,24 +16,24 @@
"v.io/x/lib/cmdline"
_ "v.io/x/ref/runtime/factories/generic"
- "v.io/x/sensorlog_lite/internal/config"
+ "v.io/x/sensorlog/internal/config"
)
var (
flagSbService = flag.String("service", config.DefaultSbService, "Name of the Syncbase service to connect to. Can be absolute or relative to the namespace root.")
)
-var cmdSensorLogLite = &cmdline.Command{
+var cmdSensorLog = &cmdline.Command{
Name: "slcli",
- Short: "Sensor Log Lite command line configuration tool and client",
+ Short: "Sensor Log command line configuration tool and client",
Long: `
-Command line interface for Sensor Log Lite, used for listing data and
-manipulating configuration via a master device Syncbase.
+Command line interface for Sensor Log, used for listing data and manipulating
+configuration via a master device Syncbase.
`,
Children: []*cmdline.Command{cmdSLDevice, cmdSLStream, cmdSLList},
}
func main() {
cmdline.HideGlobalFlagsExcept(regexp.MustCompile(`^((service)|(v23\.namespace\.root)|(v23\.credentials))$`))
- cmdline.Main(cmdSensorLogLite)
+ cmdline.Main(cmdSensorLog)
}
diff --git a/go/src/v.io/x/sensorlog/slcli/stream.go b/go/src/v.io/x/sensorlog/slcli/stream.go
index 23c75bc..1b7fb1f 100644
--- a/go/src/v.io/x/sensorlog/slcli/stream.go
+++ b/go/src/v.io/x/sensorlog/slcli/stream.go
@@ -14,9 +14,9 @@
"v.io/v23/context"
"v.io/x/lib/cmdline"
"v.io/x/ref/lib/v23cmd"
- "v.io/x/sensorlog_lite/internal/client"
- "v.io/x/sensorlog_lite/internal/sbmodel"
- "v.io/x/sensorlog_lite/internal/sbutil"
+ "v.io/x/sensorlog/internal/client"
+ "v.io/x/sensorlog/internal/sbmodel"
+ "v.io/x/sensorlog/internal/sbutil"
)
var cmdSLStream = &cmdline.Command{
