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

@@ -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 {

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"

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

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 {

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"

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()) {

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"

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

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"

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"

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"

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"

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

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

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 {

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"
 )

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

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")

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

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 (

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 {

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 (

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 (

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 {

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"
 )

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"

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"
 )

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() {

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"
 )

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() {

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()) {

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()) {

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()) {

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"
 )

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"
 )

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"

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.

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

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

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 = `<html>

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.

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

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.

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"

pkg/sorted/kv.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"camlistore.org/pkg/jsonconfig"
+	"go4.org/jsonconfig"
 )
 
 const (

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"
 )

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) {

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"

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) {

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

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"

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.

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() {

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.

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"
 )

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.

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() {

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) {

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"
 )

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"
 )

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.

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"

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 (

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"
 )
 

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.

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.