From 40be4d8da29a164513347d54334a3aed849585db Mon Sep 17 00:00:00 2001 From: mpl Date: Tue, 1 Dec 2015 17:19:49 +0100 Subject: [PATCH] vendor: go4.org/jsonconfig (and errorutil) Previously pkg/jsonconfig and pkg/errorutil Copied from go4.org at rev d1b8a2fb2de6160036e4801aa5e4d855571078b8 Change-Id: I673ed55b0825baa2607289b6082f205100261d7a --- cmd/camtool/dp_idx_rebuild.go | 2 +- pkg/blobserver/blobpacked/blobpacked.go | 2 +- pkg/blobserver/cond/cond.go | 2 +- pkg/blobserver/cond/cond_test.go | 2 +- pkg/blobserver/diskpacked/diskpacked.go | 2 +- pkg/blobserver/diskpacked/diskpacked_test.go | 2 +- pkg/blobserver/diskpacked/reindex.go | 2 +- pkg/blobserver/encrypt/encrypt.go | 2 +- pkg/blobserver/google/cloudstorage/cloudstorage_test.go | 2 +- pkg/blobserver/google/cloudstorage/storage.go | 2 +- pkg/blobserver/google/drive/drive.go | 2 +- pkg/blobserver/google/drive/drive_test.go | 2 +- pkg/blobserver/localdisk/localdisk.go | 2 +- pkg/blobserver/memory/mem.go | 2 +- pkg/blobserver/mongo/mongo.go | 2 +- pkg/blobserver/namespace/ns.go | 2 +- pkg/blobserver/proxycache/proxycache.go | 2 +- pkg/blobserver/registry.go | 2 +- pkg/blobserver/remote/remote.go | 2 +- pkg/blobserver/replica/replica.go | 2 +- pkg/blobserver/replica/replica_test.go | 2 +- pkg/blobserver/s3/s3.go | 2 +- pkg/blobserver/s3/s3_test.go | 2 +- pkg/blobserver/shard/shard.go | 2 +- pkg/client/config.go | 2 +- pkg/googlestorage/googlestorage_test.go | 2 +- pkg/importer/importer.go | 2 +- pkg/importer/importer_test.go | 2 +- pkg/index/index.go | 2 +- pkg/index/memindex.go | 2 +- pkg/index/mongo_test.go | 2 +- pkg/index/mysql_test.go | 2 +- pkg/index/postgres_test.go | 2 +- pkg/index/sqlite/sqlite_test.go | 2 +- pkg/jsonsign/signhandler/sig.go | 2 +- pkg/osutil/gce/gce.go | 2 +- pkg/osutil/paths.go | 2 +- pkg/search/handler.go | 2 +- pkg/server/app/app.go | 2 +- pkg/server/help.go | 2 +- pkg/server/root.go | 2 +- pkg/server/share.go | 2 +- pkg/server/status.go | 2 +- pkg/server/sync.go | 2 +- pkg/server/ui.go | 2 +- pkg/server/wizard.go | 2 +- pkg/serverinit/genconfig.go | 2 +- pkg/serverinit/serverinit.go | 2 +- pkg/serverinit/serverinit_test.go | 2 +- pkg/sorted/kv.go | 2 +- pkg/sorted/kvfile/kvfile.go | 2 +- pkg/sorted/kvfile/kvfile_test.go | 2 +- pkg/sorted/leveldb/leveldb.go | 2 +- pkg/sorted/leveldb/leveldb_test.go | 2 +- pkg/sorted/mem.go | 2 +- pkg/sorted/mongo/mongokv.go | 2 +- pkg/sorted/mongo/mongokv_test.go | 2 +- pkg/sorted/mysql/mysqlkv.go | 2 +- pkg/sorted/mysql/mysqlkv_test.go | 2 +- pkg/sorted/postgres/postgreskv.go | 2 +- pkg/sorted/postgres/postgreskv_test.go | 2 +- pkg/sorted/sqlite/sqlitekv.go | 2 +- pkg/sorted/sqlite/sqlitekv_test.go | 2 +- pkg/types/clientconfig/config.go | 2 +- pkg/video/thumbnail/service.go | 2 +- pkg/video/thumbnail/thumbnailer.go | 2 +- server/appengine/camli/aeindex.go | 2 +- server/appengine/camli/storage.go | 2 +- {pkg => vendor/go4.org}/errorutil/highlight.go | 0 {pkg => vendor/go4.org}/jsonconfig/eval.go | 5 ++--- {pkg => vendor/go4.org}/jsonconfig/jsonconfig.go | 2 +- {pkg => vendor/go4.org}/jsonconfig/jsonconfig_test.go | 2 +- {pkg => vendor/go4.org}/jsonconfig/testdata/boolenv.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/include1.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/include1bis.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/include2.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/listexpand.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/loop1.json | 0 {pkg => vendor/go4.org}/jsonconfig/testdata/loop2.json | 0 79 files changed, 72 insertions(+), 73 deletions(-) rename {pkg => vendor/go4.org}/errorutil/highlight.go (100%) rename {pkg => vendor/go4.org}/jsonconfig/eval.go (99%) rename {pkg => vendor/go4.org}/jsonconfig/jsonconfig.go (99%) rename {pkg => vendor/go4.org}/jsonconfig/jsonconfig_test.go (98%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/boolenv.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/include1.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/include1bis.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/include2.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/listexpand.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/loop1.json (100%) rename {pkg => vendor/go4.org}/jsonconfig/testdata/loop2.json (100%) diff --git a/cmd/camtool/dp_idx_rebuild.go b/cmd/camtool/dp_idx_rebuild.go index 45edbf5b8..56851e3db 100644 --- a/cmd/camtool/dp_idx_rebuild.go +++ b/cmd/camtool/dp_idx_rebuild.go @@ -25,9 +25,9 @@ import ( "camlistore.org/pkg/blobserver/diskpacked" "camlistore.org/pkg/cmdmain" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/serverinit" + "go4.org/jsonconfig" ) type reindexdpCmd struct { diff --git a/pkg/blobserver/blobpacked/blobpacked.go b/pkg/blobserver/blobpacked/blobpacked.go index 6f929377b..07a580526 100644 --- a/pkg/blobserver/blobpacked/blobpacked.go +++ b/pkg/blobserver/blobpacked/blobpacked.go @@ -98,11 +98,11 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/constants" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/pools" "camlistore.org/pkg/schema" "camlistore.org/pkg/sorted" "camlistore.org/third_party/go/pkg/archive/zip" + "go4.org/jsonconfig" "go4.org/strutil" "go4.org/syncutil" diff --git a/pkg/blobserver/cond/cond.go b/pkg/blobserver/cond/cond.go index c4827be18..35c678a75 100644 --- a/pkg/blobserver/cond/cond.go +++ b/pkg/blobserver/cond/cond.go @@ -48,8 +48,8 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/schema" + "go4.org/jsonconfig" ) const buffered = 8 diff --git a/pkg/blobserver/cond/cond_test.go b/pkg/blobserver/cond/cond_test.go index f7510456b..170c398b7 100644 --- a/pkg/blobserver/cond/cond_test.go +++ b/pkg/blobserver/cond/cond_test.go @@ -23,8 +23,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/replica" "camlistore.org/pkg/blobserver/storagetest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/test" + "go4.org/jsonconfig" ) func newCond(t *testing.T, ld *test.Loader, config jsonconfig.Obj) *condStorage { diff --git a/pkg/blobserver/diskpacked/diskpacked.go b/pkg/blobserver/diskpacked/diskpacked.go index f7f8c7dcf..81400f70a 100644 --- a/pkg/blobserver/diskpacked/diskpacked.go +++ b/pkg/blobserver/diskpacked/diskpacked.go @@ -51,10 +51,10 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/local" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/types" "camlistore.org/third_party/github.com/camlistore/lock" + "go4.org/jsonconfig" "go4.org/strutil" "go4.org/syncutil" diff --git a/pkg/blobserver/diskpacked/diskpacked_test.go b/pkg/blobserver/diskpacked/diskpacked_test.go index 3a06f5244..6e87b2261 100644 --- a/pkg/blobserver/diskpacked/diskpacked_test.go +++ b/pkg/blobserver/diskpacked/diskpacked_test.go @@ -29,9 +29,9 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/storagetest" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/test" + "go4.org/jsonconfig" ) func newTempDiskpacked(t *testing.T) (sto blobserver.Storage, cleanup func()) { diff --git a/pkg/blobserver/diskpacked/reindex.go b/pkg/blobserver/diskpacked/reindex.go index 5b93960cf..4d839d678 100644 --- a/pkg/blobserver/diskpacked/reindex.go +++ b/pkg/blobserver/diskpacked/reindex.go @@ -29,8 +29,8 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/context" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" // possible index formats _ "camlistore.org/pkg/sorted/kvfile" diff --git a/pkg/blobserver/encrypt/encrypt.go b/pkg/blobserver/encrypt/encrypt.go index b7a67b094..c18c598e5 100644 --- a/pkg/blobserver/encrypt/encrypt.go +++ b/pkg/blobserver/encrypt/encrypt.go @@ -52,9 +52,9 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/types" + "go4.org/jsonconfig" ) // Compaction constants diff --git a/pkg/blobserver/google/cloudstorage/cloudstorage_test.go b/pkg/blobserver/google/cloudstorage/cloudstorage_test.go index c1d83964d..6a331a75d 100644 --- a/pkg/blobserver/google/cloudstorage/cloudstorage_test.go +++ b/pkg/blobserver/google/cloudstorage/cloudstorage_test.go @@ -31,7 +31,7 @@ import ( "camlistore.org/pkg/constants/google" "camlistore.org/pkg/context" "camlistore.org/pkg/googlestorage" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" "go4.org/oauthutil" "golang.org/x/oauth2" diff --git a/pkg/blobserver/google/cloudstorage/storage.go b/pkg/blobserver/google/cloudstorage/storage.go index 60f7afc1d..0e2c2cfc8 100644 --- a/pkg/blobserver/google/cloudstorage/storage.go +++ b/pkg/blobserver/google/cloudstorage/storage.go @@ -38,7 +38,7 @@ import ( "camlistore.org/pkg/constants/google" "camlistore.org/pkg/context" "camlistore.org/pkg/googlestorage" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" "go4.org/oauthutil" "go4.org/syncutil" diff --git a/pkg/blobserver/google/drive/drive.go b/pkg/blobserver/google/drive/drive.go index f0e98d980..c0b606fc3 100644 --- a/pkg/blobserver/google/drive/drive.go +++ b/pkg/blobserver/google/drive/drive.go @@ -38,7 +38,7 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/google/drive/service" "camlistore.org/pkg/constants/google" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" "go4.org/oauthutil" "golang.org/x/oauth2" diff --git a/pkg/blobserver/google/drive/drive_test.go b/pkg/blobserver/google/drive/drive_test.go index 426882aa9..5131e9d2a 100644 --- a/pkg/blobserver/google/drive/drive_test.go +++ b/pkg/blobserver/google/drive/drive_test.go @@ -26,7 +26,7 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/storagetest" "camlistore.org/pkg/constants/google" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" "go4.org/oauthutil" "golang.org/x/oauth2" diff --git a/pkg/blobserver/localdisk/localdisk.go b/pkg/blobserver/localdisk/localdisk.go index 7a87bcc2b..cfa637cb0 100644 --- a/pkg/blobserver/localdisk/localdisk.go +++ b/pkg/blobserver/localdisk/localdisk.go @@ -40,9 +40,9 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/local" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/types" + "go4.org/jsonconfig" ) // DiskStorage implements the blobserver.Storage interface using the diff --git a/pkg/blobserver/memory/mem.go b/pkg/blobserver/memory/mem.go index 1de74b4f4..13b02dc12 100644 --- a/pkg/blobserver/memory/mem.go +++ b/pkg/blobserver/memory/mem.go @@ -31,9 +31,9 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/lru" "camlistore.org/pkg/types" + "go4.org/jsonconfig" ) // Storage is an in-memory implementation of the blobserver Storage diff --git a/pkg/blobserver/mongo/mongo.go b/pkg/blobserver/mongo/mongo.go index ff579302f..ebdbb2d30 100644 --- a/pkg/blobserver/mongo/mongo.go +++ b/pkg/blobserver/mongo/mongo.go @@ -38,8 +38,8 @@ package mongo import ( "camlistore.org/pkg/blobserver" - "camlistore.org/pkg/jsonconfig" "camlistore.org/third_party/labix.org/v2/mgo" + "go4.org/jsonconfig" ) type mongoStorage struct { diff --git a/pkg/blobserver/namespace/ns.go b/pkg/blobserver/namespace/ns.go index 0d8b467c6..56c19ca59 100644 --- a/pkg/blobserver/namespace/ns.go +++ b/pkg/blobserver/namespace/ns.go @@ -33,8 +33,8 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" "go4.org/strutil" ) diff --git a/pkg/blobserver/proxycache/proxycache.go b/pkg/blobserver/proxycache/proxycache.go index 125739f33..18ef29b31 100644 --- a/pkg/blobserver/proxycache/proxycache.go +++ b/pkg/blobserver/proxycache/proxycache.go @@ -46,8 +46,8 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" ) const buffered = 8 diff --git a/pkg/blobserver/registry.go b/pkg/blobserver/registry.go index f3c3563e1..5e21d6c3e 100644 --- a/pkg/blobserver/registry.go +++ b/pkg/blobserver/registry.go @@ -22,7 +22,7 @@ import ( "net/http" "sync" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) var ErrHandlerTypeNotFound = errors.New("requested handler type not loaded") diff --git a/pkg/blobserver/remote/remote.go b/pkg/blobserver/remote/remote.go index 6894be561..823ef1c1a 100644 --- a/pkg/blobserver/remote/remote.go +++ b/pkg/blobserver/remote/remote.go @@ -42,7 +42,7 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/client" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) // remoteStorage is a blobserver.Storage proxy for a remote camlistore diff --git a/pkg/blobserver/replica/replica.go b/pkg/blobserver/replica/replica.go index 333dd0db4..3680a7ecd 100644 --- a/pkg/blobserver/replica/replica.go +++ b/pkg/blobserver/replica/replica.go @@ -46,7 +46,7 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) var ( diff --git a/pkg/blobserver/replica/replica_test.go b/pkg/blobserver/replica/replica_test.go index ebbd480e5..86ee5b53f 100644 --- a/pkg/blobserver/replica/replica_test.go +++ b/pkg/blobserver/replica/replica_test.go @@ -22,8 +22,8 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/storagetest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/test" + "go4.org/jsonconfig" ) func newReplica(t *testing.T, config jsonconfig.Obj) *replicaStorage { diff --git a/pkg/blobserver/s3/s3.go b/pkg/blobserver/s3/s3.go index ce67bc1c6..c2e2e97bd 100644 --- a/pkg/blobserver/s3/s3.go +++ b/pkg/blobserver/s3/s3.go @@ -42,8 +42,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/memory" "camlistore.org/pkg/fault" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/misc/amazon/s3" + "go4.org/jsonconfig" ) var ( diff --git a/pkg/blobserver/s3/s3_test.go b/pkg/blobserver/s3/s3_test.go index 4471827d0..461aa99e3 100644 --- a/pkg/blobserver/s3/s3_test.go +++ b/pkg/blobserver/s3/s3_test.go @@ -26,7 +26,7 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/storagetest" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) var ( diff --git a/pkg/blobserver/shard/shard.go b/pkg/blobserver/shard/shard.go index 8dbaebbc8..c605948ee 100644 --- a/pkg/blobserver/shard/shard.go +++ b/pkg/blobserver/shard/shard.go @@ -38,7 +38,7 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) type shardStorage struct { diff --git a/pkg/client/config.go b/pkg/client/config.go index 96dc29ff0..0bf84e581 100644 --- a/pkg/client/config.go +++ b/pkg/client/config.go @@ -32,11 +32,11 @@ import ( "camlistore.org/pkg/buildinfo" "camlistore.org/pkg/client/android" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign" "camlistore.org/pkg/osutil" "camlistore.org/pkg/types/camtypes" "camlistore.org/pkg/types/clientconfig" + "go4.org/jsonconfig" "go4.org/wkfs" ) diff --git a/pkg/googlestorage/googlestorage_test.go b/pkg/googlestorage/googlestorage_test.go index c38ffb55b..a309db3ca 100644 --- a/pkg/googlestorage/googlestorage_test.go +++ b/pkg/googlestorage/googlestorage_test.go @@ -28,8 +28,8 @@ import ( "time" "camlistore.org/pkg/constants/google" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" + "go4.org/jsonconfig" "go4.org/oauthutil" "golang.org/x/oauth2" diff --git a/pkg/importer/importer.go b/pkg/importer/importer.go index 07bd3e19b..a7876fdc4 100644 --- a/pkg/importer/importer.go +++ b/pkg/importer/importer.go @@ -35,12 +35,12 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign/signhandler" "camlistore.org/pkg/schema" "camlistore.org/pkg/search" "camlistore.org/pkg/server" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" "go4.org/syncutil" ) diff --git a/pkg/importer/importer_test.go b/pkg/importer/importer_test.go index b80ce8f4a..37dd7b096 100644 --- a/pkg/importer/importer_test.go +++ b/pkg/importer/importer_test.go @@ -19,8 +19,8 @@ package importer import ( "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/test" + "go4.org/jsonconfig" ) func init() { diff --git a/pkg/index/index.go b/pkg/index/index.go index ee96f7425..a18d9e1c0 100644 --- a/pkg/index/index.go +++ b/pkg/index/index.go @@ -33,11 +33,11 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/schema" "camlistore.org/pkg/sorted" "camlistore.org/pkg/types" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" "go4.org/strutil" ) diff --git a/pkg/index/memindex.go b/pkg/index/memindex.go index 3f1010bf2..17bbb665f 100644 --- a/pkg/index/memindex.go +++ b/pkg/index/memindex.go @@ -18,8 +18,8 @@ package index import ( "camlistore.org/pkg/blobserver" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" ) func init() { diff --git a/pkg/index/mongo_test.go b/pkg/index/mongo_test.go index 5ee85a12e..b7a2e3a9b 100644 --- a/pkg/index/mongo_test.go +++ b/pkg/index/mongo_test.go @@ -20,12 +20,12 @@ import ( "testing" "camlistore.org/pkg/index/indextest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" _ "camlistore.org/pkg/sorted/mongo" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) func newMongoSorted(t *testing.T) (kv sorted.KeyValue, cleanup func()) { diff --git a/pkg/index/mysql_test.go b/pkg/index/mysql_test.go index b6c5b06bf..12ce5ab85 100644 --- a/pkg/index/mysql_test.go +++ b/pkg/index/mysql_test.go @@ -20,12 +20,12 @@ import ( "testing" "camlistore.org/pkg/index/indextest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" _ "camlistore.org/pkg/sorted/mysql" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) func newMySQLSorted(t *testing.T) (kv sorted.KeyValue, clean func()) { diff --git a/pkg/index/postgres_test.go b/pkg/index/postgres_test.go index 5e130f7bd..52b00934d 100644 --- a/pkg/index/postgres_test.go +++ b/pkg/index/postgres_test.go @@ -20,12 +20,12 @@ import ( "testing" "camlistore.org/pkg/index/indextest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" _ "camlistore.org/pkg/sorted/postgres" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) func newPostgresSorted(t *testing.T) (kv sorted.KeyValue, clean func()) { diff --git a/pkg/index/sqlite/sqlite_test.go b/pkg/index/sqlite/sqlite_test.go index 862948518..5805b9e6c 100644 --- a/pkg/index/sqlite/sqlite_test.go +++ b/pkg/index/sqlite/sqlite_test.go @@ -30,10 +30,10 @@ import ( "camlistore.org/pkg/index" "camlistore.org/pkg/index/indextest" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" _ "camlistore.org/pkg/sorted/sqlite" + "go4.org/jsonconfig" _ "camlistore.org/third_party/github.com/mattn/go-sqlite3" ) diff --git a/pkg/jsonsign/signhandler/sig.go b/pkg/jsonsign/signhandler/sig.go index 231965c14..000d27b45 100644 --- a/pkg/jsonsign/signhandler/sig.go +++ b/pkg/jsonsign/signhandler/sig.go @@ -30,11 +30,11 @@ import ( "camlistore.org/pkg/blobserver/gethandler" "camlistore.org/pkg/blobserver/memory" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign" "camlistore.org/pkg/osutil" "camlistore.org/pkg/schema" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" "camlistore.org/third_party/code.google.com/p/go.crypto/openpgp" ) diff --git a/pkg/osutil/gce/gce.go b/pkg/osutil/gce/gce.go index 64850b556..d905bfdb9 100644 --- a/pkg/osutil/gce/gce.go +++ b/pkg/osutil/gce/gce.go @@ -27,9 +27,9 @@ import ( "strings" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" _ "camlistore.org/pkg/wkfs/gcs" + "go4.org/jsonconfig" "golang.org/x/net/context" "google.golang.org/cloud/compute/metadata" diff --git a/pkg/osutil/paths.go b/pkg/osutil/paths.go index 7f0ff02e1..166a89038 100644 --- a/pkg/osutil/paths.go +++ b/pkg/osutil/paths.go @@ -25,7 +25,7 @@ import ( "sync" "camlistore.org/pkg/buildinfo" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) // HomeDir returns the path to the user's home directory. diff --git a/pkg/search/handler.go b/pkg/search/handler.go index 6db46bde7..102e031d2 100644 --- a/pkg/search/handler.go +++ b/pkg/search/handler.go @@ -33,9 +33,9 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/httputil" "camlistore.org/pkg/index" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/types" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" ) const buffered = 32 // arbitrary channel buffer size diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index 9199ab708..43b84b095 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -34,7 +34,7 @@ import ( "camlistore.org/pkg/auth" camhttputil "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) // Handler acts as a reverse proxy for a server application started by diff --git a/pkg/server/help.go b/pkg/server/help.go index 9b2f2bc38..a2f516194 100644 --- a/pkg/server/help.go +++ b/pkg/server/help.go @@ -28,8 +28,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/types/clientconfig" + "go4.org/jsonconfig" ) const helpHTML string = ` diff --git a/pkg/server/root.go b/pkg/server/root.go index cc87ad9f7..2f8604498 100644 --- a/pkg/server/root.go +++ b/pkg/server/root.go @@ -30,12 +30,12 @@ import ( "camlistore.org/pkg/env" "camlistore.org/pkg/httputil" "camlistore.org/pkg/images" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign/signhandler" "camlistore.org/pkg/osutil" "camlistore.org/pkg/search" "camlistore.org/pkg/types" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" ) // RootHandler handles serving the about/splash page. diff --git a/pkg/server/share.go b/pkg/server/share.go index ea58cce04..5b1bbd983 100644 --- a/pkg/server/share.go +++ b/pkg/server/share.go @@ -33,8 +33,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/blobserver/gethandler" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/schema" + "go4.org/jsonconfig" ) type responseType int diff --git a/pkg/server/status.go b/pkg/server/status.go index 206ab2801..2f6465e46 100644 --- a/pkg/server/status.go +++ b/pkg/server/status.go @@ -35,11 +35,11 @@ import ( "camlistore.org/pkg/env" "camlistore.org/pkg/httputil" "camlistore.org/pkg/index" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/search" "camlistore.org/pkg/server/app" "camlistore.org/pkg/types/camtypes" + "go4.org/jsonconfig" ) // StatusHandler publishes server status information. diff --git a/pkg/server/sync.go b/pkg/server/sync.go index 906ebaa70..10ab64bb6 100644 --- a/pkg/server/sync.go +++ b/pkg/server/sync.go @@ -38,10 +38,10 @@ import ( "camlistore.org/pkg/constants" "camlistore.org/pkg/context" "camlistore.org/pkg/index" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/types/camtypes" "camlistore.org/third_party/code.google.com/p/xsrftoken" + "go4.org/jsonconfig" "go4.org/syncutil" ) diff --git a/pkg/server/ui.go b/pkg/server/ui.go index 1655ae9ed..19a749608 100644 --- a/pkg/server/ui.go +++ b/pkg/server/ui.go @@ -34,7 +34,6 @@ import ( "camlistore.org/pkg/constants" "camlistore.org/pkg/fileembed" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/misc/closure" "camlistore.org/pkg/search" "camlistore.org/pkg/server/app" @@ -47,6 +46,7 @@ import ( glitchstatic "camlistore.org/third_party/glitch" lessstatic "camlistore.org/third_party/less" reactstatic "camlistore.org/third_party/react" + "go4.org/jsonconfig" "go4.org/syncutil" ) diff --git a/pkg/server/wizard.go b/pkg/server/wizard.go index 54718a499..0cbd220e0 100644 --- a/pkg/server/wizard.go +++ b/pkg/server/wizard.go @@ -31,8 +31,8 @@ import ( "camlistore.org/pkg/auth" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" + "go4.org/jsonconfig" "camlistore.org/third_party/code.google.com/p/xsrftoken" ) diff --git a/pkg/serverinit/genconfig.go b/pkg/serverinit/genconfig.go index 05236d83f..5069693e6 100644 --- a/pkg/serverinit/genconfig.go +++ b/pkg/serverinit/genconfig.go @@ -29,11 +29,11 @@ import ( "strings" "camlistore.org/pkg/blob" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/types/serverconfig" + "go4.org/jsonconfig" "go4.org/wkfs" ) diff --git a/pkg/serverinit/serverinit.go b/pkg/serverinit/serverinit.go index 469fa55c6..ef195989a 100644 --- a/pkg/serverinit/serverinit.go +++ b/pkg/serverinit/serverinit.go @@ -42,11 +42,11 @@ import ( "camlistore.org/pkg/blobserver/handlers" "camlistore.org/pkg/httputil" "camlistore.org/pkg/index" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/server" "camlistore.org/pkg/server/app" "camlistore.org/pkg/types/serverconfig" + "go4.org/jsonconfig" "google.golang.org/cloud/compute/metadata" ) diff --git a/pkg/serverinit/serverinit_test.go b/pkg/serverinit/serverinit_test.go index 7b3d54984..59bdee971 100644 --- a/pkg/serverinit/serverinit_test.go +++ b/pkg/serverinit/serverinit_test.go @@ -37,7 +37,6 @@ import ( "camlistore.org/pkg/auth" "camlistore.org/pkg/httputil" "camlistore.org/pkg/importer" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/jsonsign/signhandler" "camlistore.org/pkg/osutil" "camlistore.org/pkg/search" @@ -46,6 +45,7 @@ import ( "camlistore.org/pkg/test" "camlistore.org/pkg/types/clientconfig" "camlistore.org/pkg/types/serverconfig" + "go4.org/jsonconfig" // For registering all the handler constructors needed in TestInstallHandlers _ "camlistore.org/pkg/blobserver/cond" diff --git a/pkg/sorted/kv.go b/pkg/sorted/kv.go index 2daaa8398..b04178d8a 100644 --- a/pkg/sorted/kv.go +++ b/pkg/sorted/kv.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) const ( diff --git a/pkg/sorted/kvfile/kvfile.go b/pkg/sorted/kvfile/kvfile.go index 4959cb304..2fde1f652 100644 --- a/pkg/sorted/kvfile/kvfile.go +++ b/pkg/sorted/kvfile/kvfile.go @@ -28,9 +28,9 @@ import ( "os" "sync" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/kvutil" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" "camlistore.org/third_party/github.com/cznic/kv" ) diff --git a/pkg/sorted/kvfile/kvfile_test.go b/pkg/sorted/kvfile/kvfile_test.go index 3b567160b..45c88b6a4 100644 --- a/pkg/sorted/kvfile/kvfile_test.go +++ b/pkg/sorted/kvfile/kvfile_test.go @@ -22,9 +22,9 @@ import ( "path/filepath" "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" + "go4.org/jsonconfig" ) func TestKvfileKV(t *testing.T) { diff --git a/pkg/sorted/leveldb/leveldb.go b/pkg/sorted/leveldb/leveldb.go index 5ed7ee993..f96d44895 100644 --- a/pkg/sorted/leveldb/leveldb.go +++ b/pkg/sorted/leveldb/leveldb.go @@ -26,8 +26,8 @@ import ( "sync" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" "camlistore.org/third_party/github.com/syndtr/goleveldb/leveldb" "camlistore.org/third_party/github.com/syndtr/goleveldb/leveldb/filter" diff --git a/pkg/sorted/leveldb/leveldb_test.go b/pkg/sorted/leveldb/leveldb_test.go index 7e72ffdd5..ae2a4cc22 100644 --- a/pkg/sorted/leveldb/leveldb_test.go +++ b/pkg/sorted/leveldb/leveldb_test.go @@ -22,9 +22,9 @@ import ( "path/filepath" "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" + "go4.org/jsonconfig" ) func TestLeveldbKV(t *testing.T) { diff --git a/pkg/sorted/mem.go b/pkg/sorted/mem.go index e4fb63704..dacf1b277 100644 --- a/pkg/sorted/mem.go +++ b/pkg/sorted/mem.go @@ -21,9 +21,9 @@ import ( "errors" "sync" - "camlistore.org/pkg/jsonconfig" "camlistore.org/third_party/code.google.com/p/leveldb-go/leveldb/db" "camlistore.org/third_party/code.google.com/p/leveldb-go/leveldb/memdb" + "go4.org/jsonconfig" ) // NewMemoryKeyValue returns a KeyValue implementation that's backed only diff --git a/pkg/sorted/mongo/mongokv.go b/pkg/sorted/mongo/mongokv.go index 699780366..1d61e57ea 100644 --- a/pkg/sorted/mongo/mongokv.go +++ b/pkg/sorted/mongo/mongokv.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" "camlistore.org/third_party/labix.org/v2/mgo" "camlistore.org/third_party/labix.org/v2/mgo/bson" diff --git a/pkg/sorted/mongo/mongokv_test.go b/pkg/sorted/mongo/mongokv_test.go index 25945d72b..9cce43bed 100644 --- a/pkg/sorted/mongo/mongokv_test.go +++ b/pkg/sorted/mongo/mongokv_test.go @@ -19,10 +19,10 @@ package mongo import ( "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) // TestMongoKV tests against a real MongoDB instance, using a Docker container. diff --git a/pkg/sorted/mysql/mysqlkv.go b/pkg/sorted/mysql/mysqlkv.go index 1e6f3c92c..bc90424ef 100644 --- a/pkg/sorted/mysql/mysqlkv.go +++ b/pkg/sorted/mysql/mysqlkv.go @@ -29,10 +29,10 @@ import ( "sync" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/sqlkv" _ "camlistore.org/third_party/github.com/go-sql-driver/mysql" + "go4.org/jsonconfig" ) func init() { diff --git a/pkg/sorted/mysql/mysqlkv_test.go b/pkg/sorted/mysql/mysqlkv_test.go index 8d79ec126..0214bf244 100644 --- a/pkg/sorted/mysql/mysqlkv_test.go +++ b/pkg/sorted/mysql/mysqlkv_test.go @@ -19,11 +19,11 @@ package mysql import ( "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) // TestMySQLKV tests against a real MySQL instance, using a Docker container. diff --git a/pkg/sorted/postgres/postgreskv.go b/pkg/sorted/postgres/postgreskv.go index 227a5bd29..415d7d416 100644 --- a/pkg/sorted/postgres/postgreskv.go +++ b/pkg/sorted/postgres/postgreskv.go @@ -24,9 +24,9 @@ import ( "regexp" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/sqlkv" + "go4.org/jsonconfig" _ "camlistore.org/third_party/github.com/lib/pq" ) diff --git a/pkg/sorted/postgres/postgreskv_test.go b/pkg/sorted/postgres/postgreskv_test.go index 2d825e4e0..26a4d13eb 100644 --- a/pkg/sorted/postgres/postgreskv_test.go +++ b/pkg/sorted/postgres/postgreskv_test.go @@ -19,11 +19,11 @@ package postgres import ( "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/osutil" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" "camlistore.org/pkg/test/dockertest" + "go4.org/jsonconfig" ) // TestPostgreSQLKV tests against a real PostgreSQL instance, using a Docker container. diff --git a/pkg/sorted/sqlite/sqlitekv.go b/pkg/sorted/sqlite/sqlitekv.go index 04f928027..87c98a29d 100644 --- a/pkg/sorted/sqlite/sqlitekv.go +++ b/pkg/sorted/sqlite/sqlitekv.go @@ -25,9 +25,9 @@ import ( "os" "camlistore.org/pkg/env" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/sqlkv" + "go4.org/jsonconfig" ) func init() { diff --git a/pkg/sorted/sqlite/sqlitekv_test.go b/pkg/sorted/sqlite/sqlitekv_test.go index 570f082ea..471df207c 100644 --- a/pkg/sorted/sqlite/sqlitekv_test.go +++ b/pkg/sorted/sqlite/sqlitekv_test.go @@ -22,9 +22,9 @@ import ( "path/filepath" "testing" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" "camlistore.org/pkg/sorted/kvtest" + "go4.org/jsonconfig" ) func TestSQLiteKV(t *testing.T) { diff --git a/pkg/types/clientconfig/config.go b/pkg/types/clientconfig/config.go index 4431ae1a3..ddd6345bd 100644 --- a/pkg/types/clientconfig/config.go +++ b/pkg/types/clientconfig/config.go @@ -24,7 +24,7 @@ import ( "strings" "camlistore.org/pkg/httputil" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" "go4.org/wkfs" ) diff --git a/pkg/video/thumbnail/service.go b/pkg/video/thumbnail/service.go index 1e6bb9b42..fda267386 100644 --- a/pkg/video/thumbnail/service.go +++ b/pkg/video/thumbnail/service.go @@ -38,8 +38,8 @@ import ( "time" "camlistore.org/pkg/blob" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/netutil" + "go4.org/jsonconfig" "go4.org/syncutil" ) diff --git a/pkg/video/thumbnail/thumbnailer.go b/pkg/video/thumbnail/thumbnailer.go index 8de5e507b..b482f52dd 100644 --- a/pkg/video/thumbnail/thumbnailer.go +++ b/pkg/video/thumbnail/thumbnailer.go @@ -21,7 +21,7 @@ import ( "net/url" "os/exec" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) // Thumbnailer is the interface that wraps the Command method. diff --git a/server/appengine/camli/aeindex.go b/server/appengine/camli/aeindex.go index 234936f60..1eae15efe 100644 --- a/server/appengine/camli/aeindex.go +++ b/server/appengine/camli/aeindex.go @@ -23,8 +23,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/index" - "camlistore.org/pkg/jsonconfig" "camlistore.org/pkg/sorted" + "go4.org/jsonconfig" "appengine" "appengine/datastore" diff --git a/server/appengine/camli/storage.go b/server/appengine/camli/storage.go index 25d8a9117..db810880d 100644 --- a/server/appengine/camli/storage.go +++ b/server/appengine/camli/storage.go @@ -33,7 +33,7 @@ import ( "camlistore.org/pkg/blob" "camlistore.org/pkg/blobserver" "camlistore.org/pkg/context" - "camlistore.org/pkg/jsonconfig" + "go4.org/jsonconfig" ) const ( diff --git a/pkg/errorutil/highlight.go b/vendor/go4.org/errorutil/highlight.go similarity index 100% rename from pkg/errorutil/highlight.go rename to vendor/go4.org/errorutil/highlight.go diff --git a/pkg/jsonconfig/eval.go b/vendor/go4.org/jsonconfig/eval.go similarity index 99% rename from pkg/jsonconfig/eval.go rename to vendor/go4.org/jsonconfig/eval.go index 15fb851ce..988597d47 100644 --- a/pkg/jsonconfig/eval.go +++ b/vendor/go4.org/jsonconfig/eval.go @@ -1,5 +1,5 @@ /* -Copyright 2011 Google Inc. +Copyright 2011 The go4 Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,8 +29,7 @@ import ( "strconv" "strings" - "camlistore.org/pkg/errorutil" - + "go4.org/errorutil" "go4.org/wkfs" ) diff --git a/pkg/jsonconfig/jsonconfig.go b/vendor/go4.org/jsonconfig/jsonconfig.go similarity index 99% rename from pkg/jsonconfig/jsonconfig.go rename to vendor/go4.org/jsonconfig/jsonconfig.go index d277af63b..b5b193347 100644 --- a/pkg/jsonconfig/jsonconfig.go +++ b/vendor/go4.org/jsonconfig/jsonconfig.go @@ -1,5 +1,5 @@ /* -Copyright 2011 Google Inc. +Copyright 2011 The go4 Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/jsonconfig/jsonconfig_test.go b/vendor/go4.org/jsonconfig/jsonconfig_test.go similarity index 98% rename from pkg/jsonconfig/jsonconfig_test.go rename to vendor/go4.org/jsonconfig/jsonconfig_test.go index a6621aa9b..8d2a1bd6a 100644 --- a/pkg/jsonconfig/jsonconfig_test.go +++ b/vendor/go4.org/jsonconfig/jsonconfig_test.go @@ -1,5 +1,5 @@ /* -Copyright 2011 Google Inc. +Copyright 2011 The go4 Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/jsonconfig/testdata/boolenv.json b/vendor/go4.org/jsonconfig/testdata/boolenv.json similarity index 100% rename from pkg/jsonconfig/testdata/boolenv.json rename to vendor/go4.org/jsonconfig/testdata/boolenv.json diff --git a/pkg/jsonconfig/testdata/include1.json b/vendor/go4.org/jsonconfig/testdata/include1.json similarity index 100% rename from pkg/jsonconfig/testdata/include1.json rename to vendor/go4.org/jsonconfig/testdata/include1.json diff --git a/pkg/jsonconfig/testdata/include1bis.json b/vendor/go4.org/jsonconfig/testdata/include1bis.json similarity index 100% rename from pkg/jsonconfig/testdata/include1bis.json rename to vendor/go4.org/jsonconfig/testdata/include1bis.json diff --git a/pkg/jsonconfig/testdata/include2.json b/vendor/go4.org/jsonconfig/testdata/include2.json similarity index 100% rename from pkg/jsonconfig/testdata/include2.json rename to vendor/go4.org/jsonconfig/testdata/include2.json diff --git a/pkg/jsonconfig/testdata/listexpand.json b/vendor/go4.org/jsonconfig/testdata/listexpand.json similarity index 100% rename from pkg/jsonconfig/testdata/listexpand.json rename to vendor/go4.org/jsonconfig/testdata/listexpand.json diff --git a/pkg/jsonconfig/testdata/loop1.json b/vendor/go4.org/jsonconfig/testdata/loop1.json similarity index 100% rename from pkg/jsonconfig/testdata/loop1.json rename to vendor/go4.org/jsonconfig/testdata/loop1.json diff --git a/pkg/jsonconfig/testdata/loop2.json b/vendor/go4.org/jsonconfig/testdata/loop2.json similarity index 100% rename from pkg/jsonconfig/testdata/loop2.json rename to vendor/go4.org/jsonconfig/testdata/loop2.json