TBR syncbase: fix import paths post-merge
MultiPart: 1/2
Change-Id: Icc1015776991f39d31f219398bb43c09e5cb14a2
diff --git a/services/syncbase/server/interfaces/app.go b/services/syncbase/server/interfaces/app.go
index e990b29..f9d0323 100644
--- a/services/syncbase/server/interfaces/app.go
+++ b/services/syncbase/server/interfaces/app.go
@@ -5,10 +5,10 @@
package interfaces
import (
- wire "v.io/syncbase/v23/services/syncbase/nosql"
"v.io/v23/context"
"v.io/v23/rpc"
"v.io/v23/security/access"
+ wire "v.io/v23/services/syncbase/nosql"
)
// App is an internal interface to the app layer.
diff --git a/services/syncbase/server/interfaces/database.go b/services/syncbase/server/interfaces/database.go
index 8be30d8..01fa56f 100644
--- a/services/syncbase/server/interfaces/database.go
+++ b/services/syncbase/server/interfaces/database.go
@@ -5,10 +5,10 @@
package interfaces
import (
- "v.io/syncbase/x/ref/services/syncbase/store"
"v.io/v23/context"
"v.io/v23/rpc"
"v.io/v23/security/access"
+ "v.io/x/ref/services/syncbase/store"
)
// Database is an internal interface to the database layer.
diff --git a/services/syncbase/server/interfaces/service.go b/services/syncbase/server/interfaces/service.go
index ce665e2..60eb932 100644
--- a/services/syncbase/server/interfaces/service.go
+++ b/services/syncbase/server/interfaces/service.go
@@ -5,9 +5,9 @@
package interfaces
import (
- "v.io/syncbase/x/ref/services/syncbase/store"
"v.io/v23/context"
"v.io/v23/rpc"
+ "v.io/x/ref/services/syncbase/store"
)
// Service is an internal interface to the service layer.
diff --git a/services/syncbase/server/interfaces/sync.vdl b/services/syncbase/server/interfaces/sync.vdl
index b97e845..a3d7f7f 100644
--- a/services/syncbase/server/interfaces/sync.vdl
+++ b/services/syncbase/server/interfaces/sync.vdl
@@ -5,7 +5,7 @@
package interfaces
import (
- wire "v.io/syncbase/v23/services/syncbase/nosql"
+ wire "v.io/v23/services/syncbase/nosql"
"v.io/v23/security/access"
)
diff --git a/services/syncbase/server/interfaces/sync.vdl.go b/services/syncbase/server/interfaces/sync.vdl.go
index 4ec1eea..a281543 100644
--- a/services/syncbase/server/interfaces/sync.vdl.go
+++ b/services/syncbase/server/interfaces/sync.vdl.go
@@ -16,8 +16,8 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/syncbase/v23/services/syncbase/nosql"
"v.io/v23/security/access"
+ "v.io/v23/services/syncbase/nosql"
)
// SyncClientMethods is the client interface
diff --git a/services/syncbase/server/interfaces/sync_types.vdl b/services/syncbase/server/interfaces/sync_types.vdl
index 324928b..692a731 100644
--- a/services/syncbase/server/interfaces/sync_types.vdl
+++ b/services/syncbase/server/interfaces/sync_types.vdl
@@ -7,7 +7,7 @@
import (
"time"
- wire "v.io/syncbase/v23/services/syncbase/nosql"
+ wire "v.io/v23/services/syncbase/nosql"
)
const (
diff --git a/services/syncbase/server/interfaces/sync_types.vdl.go b/services/syncbase/server/interfaces/sync_types.vdl.go
index 7d43af8..1fb1396 100644
--- a/services/syncbase/server/interfaces/sync_types.vdl.go
+++ b/services/syncbase/server/interfaces/sync_types.vdl.go
@@ -14,7 +14,7 @@
// VDL user imports
"time"
- "v.io/syncbase/v23/services/syncbase/nosql"
+ "v.io/v23/services/syncbase/nosql"
_ "v.io/v23/vdlroot/time"
)
