directory structure change to work with glide

glide has its own requirements. My previous workaround caused me some
code checkin errors. Need to fix this.

.gitignore

@@ -1,5 +1,5 @@
-go/weed/.goxc*
+.goxc*
-go/weed/vendor
+vendor
 tags
 *.swp
 ### OSX template

Dockerfile.go_build

@@ -1,5 +1,5 @@
 FROM cydev/go
-RUN go get github.com/chrislusf/seaweedfs/go/weed
+RUN go get github.com/chrislusf/seaweedfs/weed/weed
 EXPOSE 8080
 EXPOSE 9333
 VOLUME /data

README.md

@@ -1,7 +1,7 @@
 # SeaweedFS
 
 [![Build Status](https://travis-ci.org/chrislusf/seaweedfs.svg?branch=master)](https://travis-ci.org/chrislusf/seaweedfs)
-[![GoDoc](https://godoc.org/github.com/chrislusf/seaweedfs/go?status.svg)](https://godoc.org/github.com/chrislusf/seaweedfs/go)
+[![GoDoc](https://godoc.org/github.com/chrislusf/seaweedfs/weed?status.svg)](https://godoc.org/github.com/chrislusf/seaweedfs/weed)
 [![Wiki](https://img.shields.io/badge/docs-wiki-blue.svg)](https://github.com/chrislusf/seaweedfs/wiki)
 
 ![SeaweedFS Logo](https://raw.githubusercontent.com/chrislusf/seaweedfs/master/note/seaweedfs.png)
@@ -287,11 +287,11 @@ http://mercurial.selenic.com/downloads
 
 step 3: download, compile, and install the project by executing the following command
 
-go get github.com/chrislusf/seaweedfs/go/weed
+go get github.com/chrislusf/seaweedfs/weed/weed
 
 once this is done, you should see the executable "weed" under $GOPATH/bin
 
-step 4: after you modify your code locally, you could start a local build by calling "go install" under $GOPATH/src/github.com/chrislusf/seaweedfs/go/weed
+step 4: after you modify your code locally, you could start a local build by calling "go install" under $GOPATH/src/github.com/chrislusf/seaweedfs/weed/weed
 
 ## Disk Related topics ##
 

go/weed/glide.yaml

@@ -1,16 +0,0 @@
-package: github.com/chrislusf/seaweedfs/go/weed
-import:
-- package: bazil.org/fuse
-  subpackages:
-  - fs
-- package: github.com/chrislusf/raft
-- package: github.com/golang/protobuf
-  subpackages:
-  - proto
-- package: github.com/gorilla/mux
-- package: github.com/syndtr/goleveldb
-  subpackages:
-  - leveldb
-- package: golang.org/x/net
-  subpackages:
-  - context

unmaintained/fix_dat/fix_dat.go

@@ -8,9 +8,9 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

unmaintained/see_idx/see_idx.go

@@ -6,8 +6,8 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 var (

weed/command/backup.go

@@ -1,10 +1,10 @@
-package main
+package command
 
 import (
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 var (

weed/command/benchmark.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bufio"
@@ -14,10 +14,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type BenchmarkOptions struct {

weed/command/command.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"flag"
@@ -7,6 +7,23 @@ import (
 	"strings"
 )
 
+var Commands = []*Command{
+	cmdBenchmark,
+	cmdBackup,
+	cmdCompact,
+	cmdFix,
+	cmdServer,
+	cmdMaster,
+	cmdFiler,
+	cmdUpload,
+	cmdDownload,
+	cmdShell,
+	cmdVersion,
+	cmdVolume,
+	cmdExport,
+	cmdMount,
+}
+
 type Command struct {
 	// Run runs the command.
 	// The args are the arguments after the command name.

weed/command/compact.go

@@ -1,8 +1,8 @@
-package main
+package command
 
 import (
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 func init() {

weed/command/download.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"
@@ -8,8 +8,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

weed/command/export.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"archive/tar"
@@ -12,8 +12,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 const (

weed/command/filer.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/server"
-	"github.com/chrislusf/seaweedfs/go/weed/weed_server"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

weed/command/fix.go

@@ -1,12 +1,12 @@
-package main
+package command
 
 import (
 	"os"
 	"path"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 func init() {

weed/command/master.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/server"
-	"github.com/chrislusf/seaweedfs/go/weed/weed_server"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
 )
 

weed/command/mount.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 type MountOptions struct {
 	filer *string

weed/command/mount_notsupported.go

@@ -1,7 +1,7 @@
 // +build !linux
 // +build !darwin
 
-package main
+package command
 
 import (
 	"fmt"

weed/command/mount_std.go

@@ -1,6 +1,6 @@
 // +build linux darwin
 
-package main
+package command
 
 import (
 	"fmt"
@@ -8,10 +8,10 @@ import (
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"golang.org/x/net/context"
 )
 

weed/command/server.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/server"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/weed/weed_server"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
 )
 

weed/command/shell.go

@@ -1,11 +1,11 @@
-package main
+package command
 
 import (
 	"bufio"
 	"fmt"
 	"os"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 func init() {

weed/command/signal_handling.go

@@ -1,6 +1,6 @@
 // +build !plan9
 
-package main
+package command
 
 import (
 	"os"

weed/command/signal_handling_notsupported.go

@@ -1,6 +1,6 @@
 // +build plan9
 
-package main
+package command
 
 func OnInterrupt(fn func()) {
 }

weed/command/upload.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"encoding/json"
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
 )
 
 var (

weed/command/version.go

@@ -1,10 +1,10 @@
-package main
+package command
 
 import (
 	"fmt"
 	"runtime"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var cmdVersion = &Command{

weed/command/volume.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/server"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/weed/weed_server"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

weed/command/volume_test.go

@@ -1,11 +1,11 @@
-package main
+package command
 
 import (
 	"net/http"
 	"testing"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 func TestXYZ(t *testing.T) {

weed/filer/cassandra_store/cassandra_store.go

@@ -3,7 +3,7 @@ package cassandra_store
 import (
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 
 	"github.com/gocql/gocql"
 )

weed/filer/client_operations.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 
 	"net/url"
 )

weed/filer/embedded_filer/directory.go

@@ -1,7 +1,7 @@
 package embedded_filer
 
 import (
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
 )
 
 type DirectoryManager interface {

weed/filer/embedded_filer/directory_in_map.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var writeLock sync.Mutex //serialize changes to dir.log

weed/filer/embedded_filer/filer_embedded.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
 )
 
 type FilerEmbedded struct {

weed/filer/embedded_filer/files_in_leveldb.go

@@ -3,8 +3,8 @@ package embedded_filer
 import (
 	"bytes"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/util"
 )

weed/filer/flat_namespace/flat_namespace_filer.go

@@ -3,7 +3,7 @@ package flat_namespace
 import (
 	"errors"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
 )
 
 type FlatNamespaceFiler struct {

weed/glide.lock

@@ -1,5 +1,5 @@
-hash: 97328ff2a0b9e682660bd51e424a7f850388df96bd153fa6f9ee419c993065c1
+hash: fc2f4ccfa5d703b62b9c93047bae2295e6926ce1603c2164510c9010ff829945
-updated: 2016-05-24T10:27:49.252798956-07:00
+updated: 2016-06-02T12:26:29.018990826-07:00
 imports:
 - name: bazil.org/fuse
   version: 5d02b06737b3b3c2e6a44e03348b6f2b44aa6835
@@ -9,33 +9,33 @@ imports:
 - name: github.com/boltdb/bolt
   version: dfb21201d9270c1082d5fb0f07f500311ff72f18
 - name: github.com/chrislusf/raft
-  version: 90f631ee823c83f594f27257bab64911190856af
+  version: 5f7ddd8f479583daf05879d3d3b174aa202c8fb7
   subpackages:
   - protobuf
 - name: github.com/dgrijalva/jwt-go
-  version: 40bd0f3b4891a9d7f121bfb7b8e8b0525625e262
+  version: 9b486c879bab3fde556ce8c27d9a2bb05d5b2c60
 - name: github.com/disintegration/imaging
   version: d8bbae1de109b518dabc98c6c1633eb358c148a4
 - name: github.com/gocql/gocql
-  version: 7218e81e87ca6f3d2285c56e0aae80bc0d8fb655
+  version: b7b8a0e04b0cb0ca0b379421c58ec6fab9939b85
   subpackages:
   - internal/lru
   - internal/murmur
   - internal/streams
 - name: github.com/gogo/protobuf
-  version: c18eea6ad611eecf94a9ba38471f59706199409e
+  version: 7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4
   subpackages:
   - proto
 - name: github.com/golang/protobuf
-  version: e51d002c610dbe8c136679a67a6ded5df4d49b5c
+  version: 3b06fc7a4cad73efce5fe6217ab6c33e7231ab4a
   subpackages:
   - proto
 - name: github.com/golang/snappy
-  version: d6668316e43571d7dde95be6fd077f96de002f8b
+  version: d9eb7a3d35ec988b8585d4a0068e462c27d28380
 - name: github.com/gorilla/context
-  version: a8d44e7d8e4d532b6a27a02dd82abb31cc1b01bd
+  version: aed02d124ae4a0e94fea4541c8effd05bf0c8296
 - name: github.com/gorilla/mux
-  version: 9c19ed558d5df4da88e2ade9c8940d742aef0e7e
+  version: bd09be08ed4377796d312df0a45314e11b8f5dc1
 - name: github.com/hailocab/go-hostpool
   version: e80d13ce29ede4452c43dea11e79b9bc8a15b478
 - name: github.com/hashicorp/golang-lru
@@ -44,6 +44,12 @@ imports:
   - simplelru
 - name: github.com/klauspost/crc32
   version: 19b0b332c9e4516a6370a0456e6182c3b5036720
+- name: github.com/reducedb/encoding
+  version: e31efcfdf1b19f4698709a6f522feaf101b1b1f4
+  subpackages:
+  - cursor
+  - delta/bp32
+  - bitpacking
 - name: github.com/rwcarlsen/goexif
   version: 709fab3d192d7c62f86043caff1e7e3fb0f42bd8
   subpackages:
@@ -65,17 +71,17 @@ imports:
   - leveldb/storage
   - leveldb/table
 - name: golang.org/x/image
-  version: f551d3a6b7fc11df315ad9e18b404280680f8bec
+  version: 97680175a5267bb8b31f1923e7a66df98013b11a
   subpackages:
   - bmp
   - tiff
   - tiff/lzw
 - name: golang.org/x/net
-  version: 0c607074acd38c5f23d1344dfe74c977464d1257
+  version: c4c3ea71919de159c9e246d7be66deb7f0a39a58
   subpackages:
   - context
 - name: golang.org/x/sys
-  version: d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03
+  version: 076b546753157f758b316e59bcb51e6807c04057
   subpackages:
   - unix
 - name: gopkg.in/bufio.v1

weed/glide.yaml

@@ -0,0 +1,31 @@
+package: github.com/chrislusf/seaweedfs/weed
+import:
+- package: bazil.org/fuse
+  subpackages:
+  - fs
+- package: github.com/boltdb/bolt
+- package: github.com/chrislusf/raft
+- package: github.com/dgrijalva/jwt-go
+- package: github.com/disintegration/imaging
+- package: github.com/gocql/gocql
+- package: github.com/golang/protobuf
+  subpackages:
+  - proto
+- package: github.com/gorilla/mux
+- package: github.com/hashicorp/golang-lru
+- package: github.com/klauspost/crc32
+- package: github.com/reducedb/encoding
+  subpackages:
+  - cursor
+  - delta/bp32
+- package: github.com/rwcarlsen/goexif
+  subpackages:
+  - exif
+- package: github.com/syndtr/goleveldb
+  subpackages:
+  - leveldb
+  - leveldb/util
+- package: golang.org/x/net
+  subpackages:
+  - context
+- package: gopkg.in/redis.v2

weed/images/resizing.go

@@ -7,7 +7,7 @@ import (
 	"image/jpeg"
 	"image/png"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/disintegration/imaging"
 )
 

weed/operation/assign_file_id.go

@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type AssignResult struct {

weed/operation/chunked_file.go

@@ -10,8 +10,8 @@ import (
 
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

weed/operation/compress.go

@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 /*

weed/operation/delete_content.go

@@ -10,8 +10,8 @@ import (
 
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type DeleteResult struct {

weed/operation/list_masters.go

@@ -3,8 +3,8 @@ package operation
 import (
 	"encoding/json"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type ClusterStatusResult struct {

weed/operation/lookup.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type Location struct {

weed/operation/lookup_vid_cache.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 type VidInfo struct {

weed/operation/submit.go

@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
 )
 
 type FilePart struct {

weed/operation/sync_volume.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type SyncVolumeResponse struct {

weed/operation/upload_content.go

@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
 )
 
 type UploadResult struct {

weed/security/guard.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 var (

weed/security/jwt.go

@@ -6,7 +6,7 @@ import (
 
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	jwt "github.com/dgrijalva/jwt-go"
 )
 

weed/server/common.go

@@ -11,12 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var serverStats *stats.ServerStats

weed/server/filer_server.go

@@ -4,13 +4,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
-	"github.com/chrislusf/seaweedfs/go/filer/cassandra_store"
+	"github.com/chrislusf/seaweedfs/weed/filer/cassandra_store"
-	"github.com/chrislusf/seaweedfs/go/filer/embedded_filer"
+	"github.com/chrislusf/seaweedfs/weed/filer/embedded_filer"
-	"github.com/chrislusf/seaweedfs/go/filer/flat_namespace"
+	"github.com/chrislusf/seaweedfs/weed/filer/flat_namespace"
-	"github.com/chrislusf/seaweedfs/go/filer/redis_store"
+	"github.com/chrislusf/seaweedfs/weed/filer/redis_store"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
 )
 
 type FilerServer struct {

weed/server/filer_server_handlers.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

weed/server/filer_server_handlers_admin.go

@@ -3,7 +3,7 @@ package weed_server
 import (
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 /*

weed/server/master_server.go

@@ -8,11 +8,11 @@ import (
 	"sync"
 
 	"github.com/chrislusf/raft"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
-	"github.com/chrislusf/seaweedfs/go/sequence"
+	"github.com/chrislusf/seaweedfs/weed/sequence"
-	"github.com/chrislusf/seaweedfs/go/topology"
+	"github.com/chrislusf/seaweedfs/weed/topology"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
 )
 

weed/server/master_server_handlers.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 func (ms *MasterServer) lookupVolumeId(vids []string, collection string) (volumeLocations map[string]operation.LookupResult) {

weed/server/master_server_handlers_admin.go

@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/topology"
+	"github.com/chrislusf/seaweedfs/weed/topology"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/golang/protobuf/proto"
 )
 

weed/server/master_server_handlers_ui.go

@@ -3,9 +3,9 @@ package weed_server
 import (
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
-	ui "github.com/chrislusf/seaweedfs/go/weed/weed_server/master_ui"
+	ui "github.com/chrislusf/seaweedfs/weed/server/master_ui"
 )
 
 func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {

weed/server/raft_server.go

@@ -17,8 +17,8 @@ import (
 	"time"
 
 	"github.com/chrislusf/raft"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/topology"
+	"github.com/chrislusf/seaweedfs/weed/topology"
 	"github.com/gorilla/mux"
 )
 

weed/server/raft_server_handlers.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/chrislusf/raft"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
 )
 
 // Handles incoming RAFT joins.

weed/server/volume_server.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/security"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 type VolumeServer struct {

weed/server/volume_server_handlers.go

@@ -3,7 +3,7 @@ package weed_server
 import (
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
 )
 
 /*

weed/server/volume_server_handlers_admin.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"path/filepath"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {

weed/server/volume_server_handlers_read.go

@@ -13,11 +13,11 @@ import (
 
 	"net/url"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/images"
+	"github.com/chrislusf/seaweedfs/weed/images"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"")

weed/server/volume_server_handlers_sync.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func (vs *VolumeServer) getVolumeSyncStatusHandler(w http.ResponseWriter, r *http.Request) {

weed/server/volume_server_handlers_ui.go

@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/stats"
+	"github.com/chrislusf/seaweedfs/weed/stats"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
-	ui "github.com/chrislusf/seaweedfs/go/weed/weed_server/volume_server_ui"
+	ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui"
 )
 
 func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {

weed/server/volume_server_handlers_vacuum.go

@@ -3,7 +3,7 @@ package weed_server
 import (
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 func (vs *VolumeServer) vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) {

weed/server/volume_server_handlers_write.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/go/topology"
+	"github.com/chrislusf/seaweedfs/weed/topology"
 )
 
 func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) {