From 11fe4b1d8b35a908671abb93b334e5fe0bcd7020 Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 11 Aug 2016 16:26:21 +0800 Subject: [PATCH] Godep workspace -> vendor/ --- Godeps/Godeps.json | 2 +- Godeps/_workspace/.gitignore | 2 - .../github.com/astaxie/beego/logs/es/es.go | 76 ------------------- .../astaxie/beego/utils/captcha/LICENSE | 19 ----- .../src/github.com/golang/protobuf/LICENSE | 31 -------- .../_workspace/src/golang.org/x/net/LICENSE | 27 ------- .../_workspace/src/golang.org/x/net/PATENTS | 22 ------ .../github.com/astaxie/beego/LICENSE | 0 .../github.com/astaxie/beego/logs/README.md | 0 .../github.com/astaxie/beego/logs/conn.go | 0 .../github.com/astaxie/beego/logs/console.go | 0 .../github.com/astaxie/beego/logs/file.go | 0 .../github.com/astaxie/beego/logs/log.go | 0 .../github.com/astaxie/beego/logs/smtp.go | 0 .../github.com/docopt/docopt-go/.gitignore | 0 .../github.com/docopt/docopt-go/.travis.yml | 0 .../github.com/docopt/docopt-go/LICENSE | 0 .../github.com/docopt/docopt-go/README.md | 0 .../github.com/docopt/docopt-go/docopt.go | 0 .../docopt/docopt-go/test_golang.docopt | 0 .../docopt/docopt-go/testcases.docopt | 0 .../github.com/vaughan0/go-ini/LICENSE | 0 .../github.com/vaughan0/go-ini/README.md | 0 .../github.com/vaughan0/go-ini/ini.go | 0 .../github.com/vaughan0/go-ini/test.ini | 0 25 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 Godeps/_workspace/.gitignore delete mode 100644 Godeps/_workspace/src/github.com/astaxie/beego/logs/es/es.go delete mode 100644 Godeps/_workspace/src/github.com/astaxie/beego/utils/captcha/LICENSE delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/LICENSE delete mode 100644 Godeps/_workspace/src/golang.org/x/net/LICENSE delete mode 100644 Godeps/_workspace/src/golang.org/x/net/PATENTS rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/conn.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/console.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/file.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/log.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/astaxie/beego/logs/smtp.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/.travis.yml (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/docopt.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/test_golang.docopt (100%) rename {Godeps/_workspace/src => vendor}/github.com/docopt/docopt-go/testcases.docopt (100%) rename {Godeps/_workspace/src => vendor}/github.com/vaughan0/go-ini/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/vaughan0/go-ini/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/vaughan0/go-ini/ini.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/vaughan0/go-ini/test.ini (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 5dcecd23..dd435272 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -3,7 +3,7 @@ "GoVersion": "go1.6", "GodepVersion": "v74", "Packages": [ - "./..." + "./src/..." ], "Deps": [ { diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d684..00000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/es/es.go b/Godeps/_workspace/src/github.com/astaxie/beego/logs/es/es.go deleted file mode 100644 index 3a73d4dd..00000000 --- a/Godeps/_workspace/src/github.com/astaxie/beego/logs/es/es.go +++ /dev/null @@ -1,76 +0,0 @@ -package es - -import ( - "encoding/json" - "errors" - "fmt" - "net" - "net/url" - "time" - - "github.com/astaxie/beego/logs" - "github.com/belogik/goes" -) - -func NewES() logs.LoggerInterface { - cw := &esLogger{ - Level: logs.LevelDebug, - } - return cw -} - -type esLogger struct { - *goes.Connection - DSN string `json:"dsn"` - Level int `json:"level"` -} - -// {"dsn":"http://localhost:9200/","level":1} -func (el *esLogger) Init(jsonconfig string) error { - err := json.Unmarshal([]byte(jsonconfig), el) - if err != nil { - return err - } - if el.DSN == "" { - return errors.New("empty dsn") - } else if u, err := url.Parse(el.DSN); err != nil { - return err - } else if u.Path == "" { - return errors.New("missing prefix") - } else if host, port, err := net.SplitHostPort(u.Host); err != nil { - return err - } else { - conn := goes.NewConnection(host, port) - el.Connection = conn - } - return nil -} - -func (el *esLogger) WriteMsg(msg string, level int) error { - if level > el.Level { - return nil - } - t := time.Now() - vals := make(map[string]interface{}) - vals["@timestamp"] = t.Format(time.RFC3339) - vals["@msg"] = msg - d := goes.Document{ - Index: fmt.Sprintf("%04d.%02d.%02d", t.Year(), t.Month(), t.Day()), - Type: "logs", - Fields: vals, - } - _, err := el.Index(d, nil) - return err -} - -func (el *esLogger) Destroy() { - -} - -func (el *esLogger) Flush() { - -} - -func init() { - logs.Register("es", NewES) -} diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/utils/captcha/LICENSE b/Godeps/_workspace/src/github.com/astaxie/beego/utils/captcha/LICENSE deleted file mode 100644 index 0ad73ae0..00000000 --- a/Godeps/_workspace/src/github.com/astaxie/beego/utils/captcha/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2011-2014 Dmitry Chestnykh - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE b/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE deleted file mode 100644 index 1b1b1921..00000000 --- a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -Go support for Protocol Buffers - Google's data interchange format - -Copyright 2010 The Go Authors. All rights reserved. -https://github.com/golang/protobuf - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/Godeps/_workspace/src/golang.org/x/net/LICENSE b/Godeps/_workspace/src/golang.org/x/net/LICENSE deleted file mode 100644 index 6a66aea5..00000000 --- a/Godeps/_workspace/src/golang.org/x/net/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Godeps/_workspace/src/golang.org/x/net/PATENTS b/Godeps/_workspace/src/golang.org/x/net/PATENTS deleted file mode 100644 index 73309904..00000000 --- a/Godeps/_workspace/src/golang.org/x/net/PATENTS +++ /dev/null @@ -1,22 +0,0 @@ -Additional IP Rights Grant (Patents) - -"This implementation" means the copyrightable works distributed by -Google as part of the Go project. - -Google hereby grants to You a perpetual, worldwide, non-exclusive, -no-charge, royalty-free, irrevocable (except as stated in this section) -patent license to make, have made, use, offer to sell, sell, import, -transfer and otherwise run, modify and propagate the contents of this -implementation of Go, where such license applies only to those patent -claims, both currently owned or controlled by Google and acquired in -the future, licensable by Google that are necessarily infringed by this -implementation of Go. This grant does not include claims that would be -infringed only as a consequence of further modification of this -implementation. If you or your agent or exclusive licensee institute or -order or agree to the institution of patent litigation against any -entity (including a cross-claim or counterclaim in a lawsuit) alleging -that this implementation of Go or any code incorporated within this -implementation of Go constitutes direct or contributory patent -infringement, or inducement of patent infringement, then any patent -rights granted to you under this License for this implementation of Go -shall terminate as of the date such litigation is filed. diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/LICENSE b/vendor/github.com/astaxie/beego/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/LICENSE rename to vendor/github.com/astaxie/beego/LICENSE diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/README.md b/vendor/github.com/astaxie/beego/logs/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/README.md rename to vendor/github.com/astaxie/beego/logs/README.md diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/conn.go b/vendor/github.com/astaxie/beego/logs/conn.go similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/conn.go rename to vendor/github.com/astaxie/beego/logs/conn.go diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/console.go b/vendor/github.com/astaxie/beego/logs/console.go similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/console.go rename to vendor/github.com/astaxie/beego/logs/console.go diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/file.go b/vendor/github.com/astaxie/beego/logs/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/file.go rename to vendor/github.com/astaxie/beego/logs/file.go diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/log.go b/vendor/github.com/astaxie/beego/logs/log.go similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/log.go rename to vendor/github.com/astaxie/beego/logs/log.go diff --git a/Godeps/_workspace/src/github.com/astaxie/beego/logs/smtp.go b/vendor/github.com/astaxie/beego/logs/smtp.go similarity index 100% rename from Godeps/_workspace/src/github.com/astaxie/beego/logs/smtp.go rename to vendor/github.com/astaxie/beego/logs/smtp.go diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/.gitignore b/vendor/github.com/docopt/docopt-go/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/.gitignore rename to vendor/github.com/docopt/docopt-go/.gitignore diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/.travis.yml b/vendor/github.com/docopt/docopt-go/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/.travis.yml rename to vendor/github.com/docopt/docopt-go/.travis.yml diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/LICENSE b/vendor/github.com/docopt/docopt-go/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/LICENSE rename to vendor/github.com/docopt/docopt-go/LICENSE diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/README.md b/vendor/github.com/docopt/docopt-go/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/README.md rename to vendor/github.com/docopt/docopt-go/README.md diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/docopt.go b/vendor/github.com/docopt/docopt-go/docopt.go similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/docopt.go rename to vendor/github.com/docopt/docopt-go/docopt.go diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/test_golang.docopt b/vendor/github.com/docopt/docopt-go/test_golang.docopt similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/test_golang.docopt rename to vendor/github.com/docopt/docopt-go/test_golang.docopt diff --git a/Godeps/_workspace/src/github.com/docopt/docopt-go/testcases.docopt b/vendor/github.com/docopt/docopt-go/testcases.docopt similarity index 100% rename from Godeps/_workspace/src/github.com/docopt/docopt-go/testcases.docopt rename to vendor/github.com/docopt/docopt-go/testcases.docopt diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE b/vendor/github.com/vaughan0/go-ini/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE rename to vendor/github.com/vaughan0/go-ini/LICENSE diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md b/vendor/github.com/vaughan0/go-ini/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md rename to vendor/github.com/vaughan0/go-ini/README.md diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go b/vendor/github.com/vaughan0/go-ini/ini.go similarity index 100% rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go rename to vendor/github.com/vaughan0/go-ini/ini.go diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini b/vendor/github.com/vaughan0/go-ini/test.ini similarity index 100% rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini rename to vendor/github.com/vaughan0/go-ini/test.ini