vendor

.gitignore

@@ -7,6 +7,7 @@ bin/release
 bin/test.sh
 bin/tmp
 bin/test
+bin/src
 public/upload
 app/routes/routes.go
 app/tmp/main.go

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>leanote-public</name>
+	<comment>leanote, your own cloud note!</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.googlecode.goclipse.goBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>goclipse.goNature</nature>
+	</natures>
+</projectDescription>

.travis.yml

@@ -7,8 +7,9 @@ services:
 install:
   - export PATH=$PATH:$HOME/gopath/bin
   - go get -v github.com/leanote/leanote/app
-  - go get -u github.com/revel/cmd/revel
-  - ls $GOPATH/src/github.com/revel/
+  - go get -v github.com/leanote/leanote/cmd
+  # - go get -u github.com/revel/cmd/revel
+  # - ls $GOPATH/src/github.com/revel/
   # - go get github.com/revel/moudle/revel
   # - go install github.com/revel/cmd/revel
   - pwd
@@ -16,7 +17,7 @@ install:
 
 script:
   - mongo --version
-  - mongorestore -h localhost -d leanote --dir ./mongodb_backup/leanote_install_data/
+  - mongorestore -h localhost -d leanote --directoryperdb ./mongodb_backup/leanote_install_data/
 
   # gen tmp/main.go, routes/routes.go
   - go run app/cmd/main.go

README.md

@@ -31,7 +31,7 @@ We have been using the popular note-taking software/service `Evernote` as our kn
 
 * A more powerful editor: `Evernote`'s editor lacks the functionalities of **document navigation**, **syntax based code rendering** (as a programmer, syntax highlighted code rendering is a necessity), **image resizing** and so forth.
 * Everybody loves *markdown*, however `Evernote` simply wouldn't add it despite of years' of requests from users. So we will do the favor and bring a *markdown* enabled editor to you, guess what, it is also rendered in real-time!
-* If you a developer and miss the `Vim` or `Emacs` ways of writing, we offer you the choice of `Vim` and `Emacs` editing modes. Equipped with *markdown* syntax for text formatting, you will never need to touch your mouse while writing.
+* If you a developer and miss the `Vim` or `Emacs` ways of writing, we offer you the choice of `Vim` and `Emacs` editting modes. Equipped   with *markdown* syntax for text formatting, you will never need to touch your mouse while writing.
 * We love managing knowledge and thoughts as much as sharing them, so everybody has their own note account (`Evernote`, `Onenote`, `Google doc`, `Wiz note` etc.) and social media account (`Facebook`, `Wordpress`, blogs, etc.). But why can’t those two be one? Leanote makes this first step to bridge the private note-taking and public knowledge sharing seamlessly.
 * A complete and all-platform (sorry Windows phone) covering software suite: that includes Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). And they are all open source!
 * ......
@@ -66,7 +66,7 @@ If you are a developer yourself and feel like to build on top of Leanote, please
 ## 6. Contributions
 
 Like or dislike Leanote, please leave your comments and suggestions to help us improve it.
-If you encounter any issue, we suggest you first search the issues section to see whether a solution already exists, or open up a new one otherwise.
+If you encounter any issue, we suggest you first do a search in the issues section to see whether a solution already exists, or open up a new one otherwise.
 
 We’d like to acknowledge the contributions made by our [developers and contributors](https://github.com/leanote/leanote/graphs/contributors) to
 this project. Leanote won’t exist without your hard work. Your help is much appreciated.
@@ -81,7 +81,7 @@ If you find any problems or have any good ideas, feature requests, please submit
 ## 8. Donation
 
 If you like our product, consider supporting us via [donate us](http://leanote.org/#donate).
-We acknowledge the donations made by all the [donators](http://leanote.leanote.com/post/leanote-donation-list).
+We acknowledge the donations make by all the [donators](http://leanote.leanote.com/post/leanote-donation-list).
 
 ## 9. Related projects
 
@@ -186,3 +186,4 @@ Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善Lea
 * [Leanote 社区](http://bbs.leanote.com)
 * [QQ群](http://leanote.leanote.com/post/Leanote-groups)
 * [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
+

Vendor.md

@@ -1,26 +1,20 @@
-# Vendor
+# Modifications
 
-脱离 revel 每次升级不向下兼容 的控制!! 基于revel 0.18
+* revel.go
 
-## Install leanote_revel cmd
+```
+RevelImportPath = "github.com/leanote/leanote/vendor/github.com/revel/revel"
+```
 
+
+# RUN
 ```
 go install github.com/leanote/leanote/cmd/leanote_revel
 leanote_revel run github.com/leanote/leanote
-````
-
-## build leanote
-
-在当前目录生成了leanote二进制文件
-
 ```
+
+# build leanote, 在当前目录生成了leanote二进制文件
 go build -o ./leanote github.com/leanote/leanote/app/tmp
-```
-
-## 运行leanote
-
-其中-importPath是必须的
-
-```
-./leanote -importPath=github.com/leanote/leanote -runMode=prod -port=9000
-```
+ 
+# 运行leanote, 其中-importPath是必须的
+./leanote -importPath=github.com/leanote/leanote -runMode=prod -port=9000

app/controllers/AttachController.go

@@ -46,17 +46,14 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 		return re
 	}
 
-	var data []byte
-	c.Params.Bind(&data, "file")
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		return re
+	}
+	defer file.Close()
 
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	return re
-	// }
-	// defer file.Close()
-
-	// data, err := ioutil.ReadAll(file)
-	if data == nil || len(data) == 0 {
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
 		return re
 	}
 	// > 5M?
@@ -74,13 +71,10 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 	newGuid := NewGuid()
 	filePath := "files/" + GetRandomFilePath(c.GetUserId(), newGuid) + "/attachs"
 	dir := revel.BasePath + "/" + filePath
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return re
 	}
-
-	handel := c.Params.Files["file"][0]
-
 	// 生成新的文件名
 	filename := handel.Filename
 	_, ext := SplitFilename(filename) // .doc

app/controllers/BlogController.go

@@ -6,7 +6,7 @@ import (
 	//	"encoding/json"
 	"fmt"
 	"github.com/leanote/leanote/app/info"
-	// . "github.com/leanote/leanote/app/lea"
+	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/lea/blog"
 	"gopkg.in/mgo.v2/bson"
 	//	"github.com/leanote/leanote/app/types"
@@ -77,7 +77,7 @@ func (c Blog) e404(themePath string) revel.Result {
 // life.leanote.com
 // lealife.com
 func (c Blog) domain() (ok bool, userBlog info.UserBlog) {
-	host := c.Request.Host // a.cc.com:9000
+	host := c.Request.Request.Host // a.cc.com:9000
 	hostArr := strings.Split(host, ".")
 	if strings.Contains(host, configService.GetDefaultDomain()) {
 		// 有二级域名 a.leanoe.com 3个
@@ -609,7 +609,7 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) {
 	hasDomain, userBlog := c.domain()
 	defer func() {
 		if err := recover(); err != nil {
-			// Log(err)
+			Log(err)
 			re = c.e404(userBlog.ThemePath)
 		}
 	}()

app/controllers/CaptchaController.go

@@ -14,7 +14,6 @@ import (
 	//	"path"
 	//	"strconv"
 	"net/http"
-	"io"
 )
 
 // 验证码服务
@@ -31,8 +30,7 @@ func (r Ca) Apply(req *revel.Request, resp *revel.Response) {
 func (c Captcha) Get() revel.Result {
 	c.Response.ContentType = "image/png"
 	image, str := captcha.Fetch()
-	out := io.Writer(c.Response.GetWriter())
-	image.WriteTo(out)
+	image.WriteTo(c.Response.Out)
 
 	sessionId := c.Session["_ID"]
 	//	LogJ(c.Session)

app/controllers/FileController.go

@@ -97,27 +97,11 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 		re.Ok = Ok
 	}()
 
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	return re
-	// }
-	// defer file.Close()
-
-	var data []byte
-	c.Params.Bind(&data, "file")
-	handel := c.Params.Files["file"][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
 		return re
 	}
-
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	return re
-	// }
-	// defer file.Close()
-
-	// data, err := ioutil.ReadAll(file)
-	
+	defer file.Close()
 
 	// 生成上传路径
 	newGuid := NewGuid()
@@ -132,7 +116,7 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	}
 
 	dir := revel.BasePath + "/" + fileUrlPath
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return re
 	}
@@ -152,11 +136,11 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	}
 
 	filename = newGuid + ext
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	LogJ(err)
-	// 	return re
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		LogJ(err)
+		return re
+	}
 
 	var maxFileSize float64
 	if from == "logo" {

app/controllers/NoteController.go

@@ -11,7 +11,6 @@ import (
 	"regexp"
 	"strings"
 	"time"
-	"runtime"
 	//	"github.com/leanote/leanote/app/types"
 	//	"io/ioutil"
 	"fmt"
@@ -234,21 +233,20 @@ func (c Note) UpdateNoteOrContent(noteOrContent info.NoteOrContent) revel.Result
 	}
 
 	//-------------
-	// afterContentUsn := 0
-	// contentOk := false
-	// contentMsg := ""
+	afterContentUsn := 0
+	contentOk := false
+	contentMsg := ""
 	if c.Has("Content") {
 		//		noteService.UpdateNoteContent(noteOrContent.UserId, c.GetUserId(),
 		//			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract)
-		// contentOk, contentMsg, afterContentUsn = 
-		noteService.UpdateNoteContent(c.GetUserId(),
+		contentOk, contentMsg, afterContentUsn = noteService.UpdateNoteContent(c.GetUserId(),
 			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract,
 			needUpdateNote, -1, time.Now())
 	}
 
-	// Log("usn", "afterContentUsn", afterContentUsn + "")
-	// Log(contentOk)
-	// Log(contentMsg)
+	Log(afterContentUsn)
+	Log(contentOk)
+	Log(contentMsg)
 
 	return c.RenderJSON(true)
 }
@@ -448,11 +446,7 @@ func (c Note) ExportPdf(noteId string) revel.Result {
 	binPath := configService.GetGlobalStringConfig("exportPdfBinPath")
 	// 默认路径
 	if binPath == "" {
-		if runtime.GOOS == "windows" {
-			binPath = `C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe`
-		} else {
-			binPath = "/usr/local/bin/wkhtmltopdf"
-		}
+		binPath = "/usr/local/bin/wkhtmltopdf"
 	}
 
 	url := configService.GetSiteUrl() + "/note/toPdf?noteId=" + noteId + "&appKey=" + appKey
@@ -462,29 +456,13 @@ func (c Note) ExportPdf(noteId string) revel.Result {
 	// http://madalgo.au.dk/~jakobt/wkhtmltoxdoc/wkhtmltopdf_0.10.0_rc2-doc.html
 	// wkhtmltopdf参数大全
 	var cc string
-	// var cc []string
-	var ccWindows []string
 	if note.IsMarkdown {
 		cc = binPath + " --lowquality --window-status done \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
-		// cc = []string{binPath, "--lowquality", "--window-status", "done", "\"" + url + "\"", "\"" + path + "\""}
-		ccWindows = []string{"/C", binPath, "--lowquality", "--window-status", "done", url, path}
 	} else {
 		cc = binPath + " --lowquality \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
-		// cc = []string{binPath, "--lowquality", "\"" + url + "\"", "\"" + path + "\""}
-		ccWindows = []string{"/C", binPath, "--lowquality", url, path}
 	}
 
-	var cmd *exec.Cmd
-
-	// fmt.Println("-------1", runtime.GOOS, ccWindows)
-	if runtime.GOOS == "windows" {
-		fmt.Println(ccWindows)
-		// cmd = exec.Command("cmd", ccWindows...)
-		cmd = exec.Command(ccWindows[1], ccWindows[2:]...)
-	} else {
-		fmt.Println(cc)
-		cmd = exec.Command("/bin/sh", "-c", cc)
-	}
+	cmd := exec.Command("/bin/sh", "-c", cc)
 	_, err := cmd.Output()
 	if err != nil {
 		return c.RenderText("export pdf error. " + fmt.Sprintf("%v", err))

app/controllers/api/ApiBaseController.go

@@ -53,23 +53,16 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
 		}
 	*/
 
-	var data []byte
-	c.Params.Bind(&data, name)
-	handel := c.Params.Files[name][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile(name)
+	if err != nil {
 		return
 	}
+	defer file.Close()
 
-	// file, handel, err := c.Request.FormFile(name)
-	// if err != nil {
-	// 	return
-	// }
-	// defer file.Close()
-
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	return
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return
+	}
 	// > 5M?
 	maxFileSize := configService.GetUploadSize("uploadAttachSize")
 	if maxFileSize <= 0 {
@@ -86,7 +79,7 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
 	filePath := "files/" + GetRandomFilePath(userId, newGuid) + "/attachs"
 
 	dir := revel.BasePath + "/" + filePath
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return
 	}
@@ -129,18 +122,11 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
 	if isAttach {
 		return c.uploadAttach(name, noteId)
 	}
-	// file, handel, err := c.Request.FormFile(name)
-	// if err != nil {
-	// 	return
-	// }
-	// defer file.Close()
-
-	var data []byte
-	c.Params.Bind(&data, name)
-	handel := c.Params.Files[name][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile(name)
+	if err != nil {
 		return
 	}
+	defer file.Close()
 
 	newGuid := NewGuid()
 	// 生成上传路径
@@ -149,7 +135,7 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
 	fileUrlPath := "files/" + GetRandomFilePath(userId, newGuid) + "/images"
 
 	dir := revel.BasePath + "/" + fileUrlPath
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return
 	}
@@ -162,10 +148,10 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
 	// }
 
 	filename = newGuid + ext
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	return
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return
+	}
 
 	maxFileSize := configService.GetUploadSize("uploadImageSize")
 	if maxFileSize <= 0 {

app/controllers/api/ApiNoteController.go

@@ -178,7 +178,7 @@ func (c ApiNote) fixPostNotecontent(noteOrContent *info.ApiNote) {
 					// 	"/api/file/getImage?fileId="+file.FileId, -1)
 				} else {
 					reg, _ := regexp.Compile(`https*://[^/]*?/api/file/getAttach\?fileId=`+file.LocalFileId)
-					// Log(reg)
+					Log(reg)
 					noteOrContent.Content = reg.ReplaceAllString(noteOrContent.Content, `/api/file/getAttach?fileId=`+file.FileId)  
 					/*
 					noteOrContent.Content = strings.Replace(noteOrContent.Content, 

app/controllers/api/ApiUserController.go

@@ -104,23 +104,16 @@ func (c ApiUser) uploadImage() (ok bool, msg, url string) {
 	var fileUrlPath = ""
 	ok = false
 
-	var data []byte
-	c.Params.Bind(&data, "file")
-	handel := c.Params.Files["file"][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
 		return
 	}
-
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	return
-	// }
-	// defer file.Close()
+	defer file.Close()
 	// 生成上传路径
 	fileUrlPath = "public/upload/" + c.getUserId() + "/images/logo"
 
 	dir := revel.BasePath + "/" + fileUrlPath
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return
 	}
@@ -136,11 +129,11 @@ func (c ApiUser) uploadImage() (ok bool, msg, url string) {
 	}
 
 	filename = NewGuid() + ext
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	LogJ(err)
-	// 	return
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		LogJ(err)
+		return
+	}
 
 	// > 5M?
 	if len(data) > 5*1024*1024 {

app/controllers/member/MemberBlogController.go

@@ -351,21 +351,14 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
 		re.Ok = Ok
 	}()
 
-	var data []byte
-	c.Params.Bind(&data, "file")
-	handel := c.Params.Files["file"][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
 		return re
 	}
-
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	return re
-	// }
-	// defer file.Close()
+	defer file.Close()
 	// 生成上传路径
 	dir := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images"
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		return re
 	}
@@ -381,11 +374,11 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
 	}
 
 	filename = filename
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	LogJ(err)
-	// 	return re
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		LogJ(err)
+		return re
+	}
 
 	// > 2M?
 	if len(data) > 5*1024*1024 {
@@ -448,24 +441,17 @@ func (c MemberBlog) ExportTheme(themeId string) revel.Result {
 func (c MemberBlog) ImportTheme() revel.Result {
 	re := info.NewRe()
 
-	var data []byte
-	c.Params.Bind(&data, "file")
-	handel := c.Params.Files["file"][0]
-	if data == nil || len(data) == 0 {
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		re.Msg = fmt.Sprintf("%v", err)
 		return c.RenderJSON(re)
 	}
 
-	// file, handel, err := c.Request.FormFile("file")
-	// if err != nil {
-	// 	re.Msg = fmt.Sprintf("%v", err)
-	// 	return c.RenderJSON(re)
-	// }
-
-	// defer file.Close()
+	defer file.Close()
 	// 生成上传路径
 	userId := c.GetUserId()
 	dir := revel.BasePath + "/public/upload/" + userId + "/tmp"
-	err := os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		re.Msg = fmt.Sprintf("%v", err)
 		return c.RenderJSON(re)
@@ -481,10 +467,10 @@ func (c MemberBlog) ImportTheme() revel.Result {
 	}
 
 	filename = filename
-	// data, err := ioutil.ReadAll(file)
-	// if err != nil {
-	// 	return c.RenderJSON(re)
-	// }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return c.RenderJSON(re)
+	}
 
 	// > 10M?
 	if len(data) > 10*1024*1024 {

app/lea/Debug.go

@@ -6,21 +6,21 @@ import (
     "github.com/revel/revel"
 )
 
-func Log(msg string, i ...interface{}) {
-    revel.AppLog.Info(msg, i...)
+func Log(i ...interface{}) {
+    revel.INFO.Println(i...)
 }
 
-func Logf(msg string, i ...interface{}) {
-    revel.AppLog.Infof(msg, i...)
+func LogW(i ...interface{}) {
+    revel.WARN.Println(i...)
 }
 
-func LogW(msg string, i ...interface{}) {
-    revel.AppLog.Warn(msg, i...)
+func Log1(key, i interface{}) {
+    revel.INFO.Println(key, i)
 }
 
 func LogJ(i interface{}) {
     b, _ := json.MarshalIndent(i, "", " ")
-    revel.AppLog.Info(string(b))
+    revel.INFO.Println(string(b))
 }
 
 // 为test用

app/lea/Email.go

@@ -79,6 +79,7 @@ func SendEmailOld(to, subject, body string) bool {
 	err := smtp.SendMail(host+":"+port, auth, username, send_to, msg)
 
 	if err != nil {
+		Log(err)
 		return false
 	}
 	return true

app/lea/File.go

@@ -183,6 +183,7 @@ func PutFileStrContent(path, content string) bool {
 	//	Log(path)
 
 	if err1 != nil {
+		Log(err1)
 		return false
 	}
 	return true

app/lea/Util.go

@@ -400,6 +400,9 @@ func FixFilename(filename string) string {
 func IsValidTime(t time.Time) bool {
 	if t.Year() > 20 {
 		now := time.Now()
+		Log("------")
+		Log(t)
+		Log(now)
 		if t.Before(now) {
 			return true
 		}

app/lea/blog/Template.go

@@ -104,7 +104,7 @@ func (r *RenderTemplateResult) Apply(req *revel.Request, resp *revel.Response) {
 	chunked := revel.Config.BoolDefault("results.chunked", false)
 
 	// If it's a HEAD request, throw away the bytes.
-	out := io.Writer(resp.GetWriter())
+	out := io.Writer(resp.Out)
 	if req.Method == "HEAD" {
 		out = ioutil.Discard
 	}
@@ -289,7 +289,7 @@ func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) {
 	// 不是preview就不要显示错误了
 	if r.IsPreview {
 		var b bytes.Buffer
-		out := io.Writer(resp.GetWriter())
+		out := io.Writer(resp.Out)
 		//	out = ioutil.Discard
 		err = tmpl.Execute(&b, r.ViewArgs)
 		resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")

app/lea/i18n/i18n.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
-	. "github.com/leanote/leanote/app/lea"
 )
 
 const (
@@ -147,15 +146,15 @@ func loadMessageFile(locale string, path string, info os.FileInfo, osError error
 			// If we have already parsed a message file for this locale, merge both
 			if _, exists := messages[locale]; exists {
 				messages[locale].Merge(config)
-				Logf("Successfully merged messages for locale '%s'", locale)
+				revel.TRACE.Printf("Successfully merged messages for locale '%s'", locale)
 			} else {
 				messages[locale] = config
 			}
 
-			Logf("Successfully loaded messages from file", info.Name())
+			revel.TRACE.Println("Successfully loaded messages from file", info.Name())
 		}
 	} else {
-		Logf("Ignoring file %s because it did not have a valid extension", info.Name())
+		revel.TRACE.Printf("Ignoring file %s because it did not have a valid extension", info.Name())
 	}
 
 	return nil
@@ -179,13 +178,13 @@ func init() {
 
 func I18nFilter(c *revel.Controller, fc []revel.Filter) {
 	if foundCookie, cookieValue := hasLocaleCookie(c.Request); foundCookie {
-		// revel.TRACE.Printf("Found locale cookie value: %s", cookieValue)
+		revel.TRACE.Printf("Found locale cookie value: %s", cookieValue)
 		setCurrentLocaleControllerArguments(c, cookieValue)
 	} else if foundHeader, headerValue := hasAcceptLanguageHeader(c.Request); foundHeader {
-		// revel.TRACE.Printf("Found Accept-Language header value: %s", headerValue)
+		revel.TRACE.Printf("Found Accept-Language header value: %s", headerValue)
 		setCurrentLocaleControllerArguments(c, headerValue)
 	} else {
-		// revel.TRACE.Println("Unable to find locale in cookie or header, using empty string")
+		revel.TRACE.Println("Unable to find locale in cookie or header, using empty string")
 		setCurrentLocaleControllerArguments(c, "")
 	}
 	fc[0](c, fc[1:])
@@ -211,12 +210,12 @@ func hasAcceptLanguageHeader(request *revel.Request) (bool, string) {
 
 // Determine whether the given request has a valid language cookie value.
 func hasLocaleCookie(request *revel.Request) (bool, string) {
-	if request != nil {
+	if request != nil && request.Cookies() != nil {
 		name := revel.Config.StringDefault(localeCookieConfigKey, revel.CookiePrefix+"_LANG")
 		if cookie, error := request.Cookie(name); error == nil {
-			return true, cookie.GetValue()
+			return true, cookie.Value
 		} else {
-			// revel.TRACE.Printf("Unable to read locale cookie with name '%s': %s", name, error.Error())
+			revel.TRACE.Printf("Unable to read locale cookie with name '%s': %s", name, error.Error())
 		}
 	}
 

app/lea/netutil/NetUtil.go

@@ -53,6 +53,7 @@ func WriteUrl(url string, toPath string) (length int64, newFilename, path string
 func GetContent(url string) (content []byte, err error) {
 	var resp *http.Response
 	resp, err = http.Get(url)
+	Log(err)
 	if resp != nil && resp.Body != nil {
 		defer resp.Body.Close()
 	} else {
@@ -64,6 +65,7 @@ func GetContent(url string) (content []byte, err error) {
 	var buf []byte
 	buf, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
+		Log(err)
 		return
 	}
 

app/lea/route/Route.go

@@ -3,7 +3,7 @@ package route
 import (
 	"github.com/leanote/leanote/app/db"
 	"github.com/revel/revel"
-		// . "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
 	"net/url"
 	"strings"
 )
@@ -14,19 +14,15 @@ var staticPrefix = []string{"/public", "/favicon.ico", "/css", "/js", "/images",
 
 func RouterFilter(c *revel.Controller, fc []revel.Filter) {
 	// 补全controller部分
-	path := c.Request.URL.Path
+	path := c.Request.Request.URL.Path
 
 	// Figure out the Controller/Action
-	// var route *revel.RouteMatch = revel.MainRouter.Route(c.Request.Request)
-	route := revel.MainRouter.Route(c.Request)
-
+	var route *revel.RouteMatch = revel.MainRouter.Route(c.Request.Request)
 	if route == nil {
-		c.Result = c.NotFound("No matching route found: " + c.Request.GetRequestURI())
+		c.Result = c.NotFound("No matching route found: " + c.Request.RequestURI)
 		return
 	}
 
-	// Log("---------" + route.Action + "  " + path)
-
 	// The route may want to explicitly return a 404.
 	if route.Action == "404" {
 		c.Result = c.NotFound("(intentionally)")
@@ -51,23 +47,14 @@ func RouterFilter(c *revel.Controller, fc []revel.Filter) {
 		// 检查mongodb 是否lost
 		db.CheckMongoSessionLost()
 
-		// /api/file/getImage -> App\file (/api/file/getImage)
-		// App\auth
-		// App\note
-		// static\static
-		// 
-		// Log("---------" + route.ControllerName + "  " + path)
-
 		// api设置
 		// leanote.com/api/user/get => ApiUser::Get
 		//*       /api/login               ApiAuth.Login,  这里的设置, 其实已经转成了ApiAuth了
-		if strings.HasPrefix(path, "/api") && !strings.HasPrefix(route.ControllerName, "App\\api") {
-			route.ControllerName = "App\\api" + strings.Split(route.ControllerName, "\\")[1]
-			// route.ControllerName = "App\\apifile"
-		} else if strings.HasPrefix(path, "/member") && !strings.HasPrefix(route.ControllerName, "App\\member") {
+		if strings.HasPrefix(path, "/api") && !strings.HasPrefix(route.ControllerName, "Api") {
+			route.ControllerName = "Api" + route.ControllerName
+		} else if strings.HasPrefix(path, "/member") && !strings.HasPrefix(route.ControllerName, "Member") {
 			// member设置
-			// route.ControllerName = "App\\Member" + route.ControllerName
-			route.ControllerName = "App\\member" + strings.Split(route.ControllerName, "\\")[1]
+			route.ControllerName = "Member" + route.ControllerName
 		}
 		// end
 	}

app/service/ConfigService.go

@@ -606,5 +606,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "2.6.1"
+	return "2.4"
 }

app/service/NoteService.go

@@ -1106,7 +1106,7 @@ func (this *NoteService) FixContent(content string, isMarkdown bool) string {
 				reg2, _ = regexp.Compile("<a(?:[^>]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`)
 			}
 
-			// Log(reg2)
+			Log(reg2)
 
 			content = reg.ReplaceAllStringFunc(content, func(str string) string {
 				// str=这样的

app/service/NotebookService.go

@@ -360,8 +360,8 @@ func (this *NotebookService) DragNotebooks(userId string, curNotebookId string,
 func (this *NotebookService) ReCountNotebookNumberNotes(notebookId string) bool {
 	notebookIdO := bson.ObjectIdHex(notebookId)
 	count := db.Count(db.Notes, bson.M{"NotebookId": notebookIdO, "IsTrash": false, "IsDeleted": false})
-	// Log(count)
-	// Log(notebookId)
+	Log(count)
+	Log(notebookId)
 	return db.UpdateByQField(db.Notebooks, bson.M{"_id": notebookIdO}, "NumberNotes", count)
 }
 

app/service/SessionService.go

@@ -3,7 +3,7 @@ package service
 import (
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
-	// . "github.com/leanote/leanote/app/lea"
+	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
 	"time"
 	//	"strings"
@@ -66,10 +66,10 @@ func (this *SessionService) GetCaptcha(sessionId string) string {
 }
 func (this *SessionService) SetCaptcha(sessionId, captcha string) bool {
 	this.Get(sessionId)
-	// Log(sessionId)
-	// Log(captcha)
+	Log(sessionId)
+	Log(captcha)
 	ok := this.Update(sessionId, "Captcha", captcha)
-	// Log(ok)
+	Log(ok)
 	return ok
 }
 

app/service/ThemeService.go

@@ -311,7 +311,7 @@ func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content st
 	basePath := this.GetThemeAbsolutePath(userId, themeId)
 	path := basePath + "/" + filename
 	if strings.Contains(filename, ".html") {
-		// Log(">>")
+		Log(">>")
 		if ok, msg = this.ValidateTheme(basePath, filename, content); ok {
 			// 模板
 			if ok, msg = this.mustTpl(filename, content); ok {
@@ -359,7 +359,7 @@ func (this *ThemeService) mustTpl(filename, content string) (ok bool, msg string
 	defer func() {
 		if err := recover(); err != nil {
 			ok = false
-			// Log(err)
+			Log(err)
 			msg = fmt.Sprintf("%v", err)
 		}
 	}()
@@ -405,7 +405,7 @@ func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path str
 	theme := this.GetThemeById(themeId)
 	// 打包
 	// 验证路径, 别把整个项目打包了
-	// Log(theme.Path)
+	Log(theme.Path)
 	if theme.Path == "" ||
 		(!strings.HasPrefix(theme.Path, "public/upload") &&
 			!strings.HasPrefix(theme.Path, "public/blog/themes")) ||
@@ -417,12 +417,12 @@ func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path str
 	targetPath := revel.BasePath + "/public/upload/" + userId + "/tmp"
 	err := os.MkdirAll(targetPath, 0755)
 	if err != nil {
-		// Log(err)
+		Log(err)
 		return
 	}
 	targetName := targetPath + "/" + theme.Name + ".zip"
-	// Log(sourcePath)
-	// Log(targetName)
+	Log(sourcePath)
+	Log(targetName)
 	ok = archive.Zip(sourcePath, targetName)
 	if !ok {
 		return
@@ -445,7 +445,7 @@ func (this *ThemeService) ImportTheme(userId, path string) (ok bool, msg string)
 	}
 	if ok, msg = archive.Unzip(path, targetPath); !ok {
 		DeleteFile(targetPath)
-		// Log("oh no")
+		Log("oh no")
 		return
 	}
 
@@ -558,8 +558,8 @@ func (this *ThemeService) InstallTheme(userId, themeId string) (ok bool) {
 // 验证主题是否全法, 存在循环引用?
 // filename, newContent 表示在修改模板时要判断模板修改时是否有错误
 func (this *ThemeService) ValidateTheme(path string, filename, newContent string) (ok bool, msg string) {
-	// Log("theme Path")
-	// Log(path)
+	Log("theme Path")
+	Log(path)
 	// 建立一个有向图
 	// 将该path下的所有文件提出, 得到文件的引用情况
 	files := ListDir(path)
@@ -613,9 +613,9 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 			for _, includes := range finds {
 				include := includes[1]
 				includeIndex, has := fileIndexMap[include]
-				// Log(includeIndex)
-				// Log("??")
-				// Log(has)
+				Log(includeIndex)
+				Log("??")
+				Log(has)
 				if has {
 					vector[thisIndex][includeIndex] = 1
 				}

app/service/UserService.go

@@ -485,7 +485,7 @@ func (this *UserService) GetAllUserByFilter(userFilterEmail, userFilterWhiteList
 	users := []info.User{}
 	q := db.Users.Find(query)
 	q.All(&users)
-	// Log(len(users))
+	Log(len(users))
 
 	return users
 }

app/views/admin/setting/export_pdf.html

@@ -3,16 +3,16 @@
 
 <div class="row">
 
-<div class="col-sm-8">
+<div class="col-sm-6">
 	<form id="add_user_form">
 		<section class="panel panel-default">
 			<div class="panel-body">
 				<div class="form-group">
 					<label>Wkhtmltopdf Binary Path</label>
-					<input type="text" class="form-control" placeholder="/usr/local/bin/wkhtmltopdf or C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe" name="path" value="{{.str.exportPdfBinPath}}">
+					<input type="text" class="form-control" placeholder="/usr/local/bin/wkhtmltopdf" name="path" value="{{.str.exportPdfBinPath}}">
 					Leanote use <a target="_blank" href="http://wkhtmltopdf.org">wkhtmltopdf</a> to export pdf. You should install it on your server.
 					<br />
-					Please input the path that wkhtmltopdf installed, e.g. <code>/usr/local/bin/wkhtmltopdf</code> on mac os/linux or <code>C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe</code> on windows.
+					Please input the path that wkhtmltopdf installed, e.g. <code>/usr/local/bin/wkhtmltopdf</code>
 				</div>
 			</div>
 

bin/release.sh

@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v2.6.1"
+V="v2.5"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种
@@ -42,6 +42,7 @@ build "linux" "arm";
 build "windows" "386";
 build "windows" "amd64";
 
+# build "darwin" "386";
 build "darwin" "amd64";
 
 
@@ -61,12 +62,16 @@ cd $SP
 cd ../
 
 # bin
-cp -r ./bin/src $tmp/leanote/bin/
+# cp -r ./bin/src $tmp/leanote/bin/
+mkdir -p $tmp/leanote/bin/src/github.com/leanote
 cp  ./bin/run.sh $tmp/leanote/bin/
 cp  ./bin/run.bat $tmp/leanote/bin/
 
 # views
 cp -r ./app/views $tmp/leanote/app
+# vendor
+cp -r ./vendor $tmp/leanote/
+
 # 可不要, 源码
 #cp -r ./app/service $tmp/leanote/app/service
 #cp -r ./app/controllers $tmp/leanote/app/controllers
@@ -145,6 +150,7 @@ tarRelease "linux" "arm";
 tarRelease "windows" "386";
 tarRelease "windows" "amd64";
 
+# tarRelease "darwin" "386";
 tarRelease "darwin" "amd64";
 
 # BLOCK'

bin/run.bat

@@ -4,13 +4,13 @@ cd..
 set SCRIPTPATH=%cd%
 
 : top src directory
-set leanotePath="%SCRIPTPATH%\bin\src\github.com\leanote"
+set path="%SCRIPTPATH%\bin\src\github.com\leanote"
 
-if not exist "%leanotePath%" mkdir "%leanotePath%"
+if not exist "%path%" mkdir "%path%"
 
 : create software link
-if exist "%leanotePath%\leanote" del /Q "%leanotePath%\leanote"
-mklink /D "%leanotePath%\leanote"  %SCRIPTPATH%
+if exist "%path%\leanote" del /Q "%path%\leanote"
+mklink /D "%path%\leanote"  %SCRIPTPATH%
 
 : set GOPATH
 set GOPATH="%SCRIPTPATH%\bin"

bin/src/github.com/revel/modules/README.md

@@ -1,7 +0,0 @@
-modules
-=======
-
-Set of officially supported modules for Revel applications
-
-### Caution
-this is a work in progress

bin/src/github.com/revel/modules/auth/README.md

@@ -1,6 +0,0 @@
-modules/auth
-===============
-
-Basic user/auth module
-
-This should be modeled after [flask-security](https://github.com/mattupstate/flask-security)

bin/src/github.com/revel/modules/auth/auth.go

@@ -1,78 +0,0 @@
-package auth
-
-import (
-// "errors"
-)
-
-var (
-	Store StorageDriver
-)
-
-// Store = gormauth.NewGormAuthDriver()
-
-type UserAuth interface {
-	// getters/setters implemented by the app-level model
-	UserId() string
-	Secret() string
-	HashedSecret() string
-	SetHashedSecret(string)
-
-	SecretDriver
-	// // implemented by secret driver
-	// Authenticate() (bool, error)
-}
-
-type SecretDriver interface {
-	Authenticate() (bool, error)
-	HashSecret(args ...interface{}) (string, error)
-
-	// stuff for documentation
-	// UserContext is expected in these?
-
-	// Secret expects 0 or non-0 arguments
-	// When no parameter is passed, it acts as a getter
-	// When one or more parameters are passed, it acts as a setter
-	// A driver should specify the expected arguments and their meanings
-
-	// Register()
-	// Login()
-	// Logout()
-}
-
-type StorageDriver interface {
-	Save(user interface{}) error
-	// Load should take a partially filled struct
-	// (with values needed to look up)
-	// and fills in the rest
-	Load(user interface{}) error
-}
-
-// func init() {
-// 	// auth.Store = gorm...
-// }
-
-// func (c App) Login(email, password string) {
-
-// 	u := User {
-// 		Email ...
-// 	}
-
-// 	good, err := auth.Authenticate(email, password)
-
-// 	user, err := user_info.GetUserByEmail(email)
-// }
-
-// Bycrypt Authenticate() expects a single string argument of the plaintext password
-// It returns true on success and false if error or password mismatch
-// func Authenticate(attemptedUser UserAuth) (bool, error) {
-// 	// check user in Store
-// 	loadedUser, err := Store.Load(attemptedUser.UserId())
-// 	if err != nil {
-// 		return false, errors.New("User Not Found")
-// 	}
-
-// 	loadedUser.Authenticate(attemptedUser.Secret())
-
-// 	// successfully authenticated
-// 	return true, nil
-// }

bin/src/github.com/revel/modules/auth/auth_test.go

@@ -1,134 +0,0 @@
-package auth_test
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/revel/modules/auth"
-	"github.com/revel/modules/auth/driver/secret"
-)
-
-type User struct {
-	email    string
-	password string
-	hashpass string
-
-	secret.BcryptAuth // SecurityDriver for testing
-}
-
-func NewUser(email, pass string) *User {
-	u := &User{
-		email:    email,
-		password: pass,
-	}
-	u.UserContext = u
-	return u
-}
-
-func (self *User) UserId() string {
-	return self.email
-}
-
-func (self *User) Secret() string {
-	return self.password
-}
-
-func (self *User) HashedSecret() string {
-	return self.hashpass
-}
-
-func (self *User) SetHashedSecret(hpass string) {
-	self.hashpass = hpass
-}
-
-// func (self *User) Load() string
-
-type TestStore struct {
-	data map[string]string
-}
-
-func (self *TestStore) Save(user interface{}) error {
-	u, ok := user.(*User)
-	if !ok {
-		return errors.New("TestStore.Save() expected arg of type User")
-	}
-
-	hPass, err := u.HashSecret(u.Secret())
-	if err != nil {
-		return err
-	}
-	self.data[u.UserId()] = hPass
-
-	return nil
-}
-func (self *TestStore) Load(user interface{}) error {
-	u, ok := user.(*User)
-	if !ok {
-		return errors.New("TestStore.Load() expected arg of type User")
-	}
-
-	hpass, ok := self.data[u.UserId()]
-	if !ok {
-		return errors.New("Record Not Found")
-	}
-	u.SetHashedSecret(hpass)
-	return nil
-}
-
-func TestPasswordHash(t *testing.T) {
-	auth.Store = &TestStore{
-		data: make(map[string]string),
-	}
-	u := NewUser("demo@domain.com", "demopass")
-	fail := NewUser("demo@domain.com", "")
-
-	var err error
-	u.hashpass, err = u.HashSecret(u.password)
-	if err != nil {
-		t.Errorf("Should have hashed password, get error: %v\n", err)
-	}
-	fail.hashpass, err = fail.HashSecret(fail.password)
-	if err == nil {
-		t.Errorf("Should have failed hashing\n")
-	}
-}
-
-func TestAuthenticate(t *testing.T) {
-	auth.Store = &TestStore{
-		data: make(map[string]string),
-	}
-
-	// user registered a long time ago
-	u := NewUser("demo@domain.com", "demopass")
-	err := auth.Store.Save(u)
-	if err != nil {
-		t.Errorf("Should have saved user: %v", err)
-	}
-
-	// users now logging in
-	pass := NewUser("demo@domain.com", "demopass")
-	fail := NewUser("demo@domain.com", "invalid")
-
-	// valid user is now trying to login
-	// check user in DB
-	err = auth.Store.Load(pass)
-	if err != nil {
-		t.Errorf("Should have loaded pass user: %v\n", err)
-	}
-	// check credentials
-	ok, err := pass.Authenticate()
-	if !ok || err != nil {
-		t.Errorf("Should have authenticated user")
-	}
-
-	// invalid user is now trying to login
-	err = auth.Store.Load(fail)
-	if err != nil {
-		t.Errorf("Should have loaded fail user")
-	}
-	// this should fail
-	ok, err = fail.Authenticate()
-	if ok || err != nil {
-		t.Errorf("Should have failed to authenticate user: %v\n", err)
-	}
-}

bin/src/github.com/revel/modules/auth/doc.go

@@ -1,27 +0,0 @@
-/*	A basic user authentication module for Revel
-
- list of concerns:
-- Separating out the interface and driver
-- Removing DB/Storage dependency
-- UUID as default identifier?
-- how to deal with password/secret or generally, method of authorization
-- default {views,controllers,routes} for register/login/logut ?
-- reset password in most basic ?
-- activation (and other features) in a second / more sophisticated driver
-- filter for checking that user is authenticated
-
-
-I think a driver is made up of 2 parts
-data prep and data storage
-register and password reset are part of data prep
-as is the auth hash method
-they don't care how the data is stored
-
-then there is the data store
-
-perhaps each auth user model should instantiate 2 drivers instead of 1?
-one for data prep components and one for storage
-so the security driver and the storage driver
-
-*/
-package auth

bin/src/github.com/revel/modules/auth/driver/secret/bcrypt.go

@@ -1,73 +0,0 @@
-package secret
-
-import (
-	"errors"
-
-	"golang.org/x/crypto/bcrypt"
-	"github.com/revel/modules/auth"
-)
-
-// example implementation of a Revel auth security driver
-// This driver should be embedded into your app-level User model
-// It expects your User model to have `Password` and `HashedPassword` string fields
-//
-// Your User model also needs to set itself as the UserContext for the BcryptAuth driver
-//
-// func NewUser(email, pass string) *User {
-// 	u := &User{
-// 		email:    email,
-// 		password: pass,
-// 	}
-// 	u.UserContext = u
-// }
-//
-type BcryptAuth struct {
-	UserContext auth.UserAuth
-}
-
-// Bcrypt Secret() returns the hashed version of the password.
-// It expects an argument of type string, which is the plain text password
-func (self *BcryptAuth) HashSecret(args ...interface{}) (string, error) {
-	if auth.Store == nil {
-		return "", errors.New("Auth module StorageDriver not set")
-	}
-	argLen := len(args)
-	if argLen == 0 {
-		// we are getting
-		return string(self.UserContext.HashedSecret()), nil
-	}
-
-	if argLen == 1 {
-		// we are setting
-		password, ok := args[0].(string)
-		if !ok {
-			return "", errors.New("Wrong argument type provided, expected plaintext password as string")
-		}
-		hPass, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-		if err != nil {
-			return "", err
-		}
-
-		self.UserContext.SetHashedSecret(string(hPass))
-		return self.UserContext.HashedSecret(), nil
-	}
-
-	// bad argument count
-	return "", errors.New("Too many arguments provided, expected one")
-}
-
-// Bycrypt Authenticate() expects a single string argument of the plaintext password
-// It returns true on success and false if error or password mismatch
-func (self *BcryptAuth) Authenticate() (bool, error) {
-	// check password
-	err := bcrypt.CompareHashAndPassword([]byte(self.UserContext.HashedSecret()), []byte(self.UserContext.Secret()))
-	if err == bcrypt.ErrMismatchedHashAndPassword {
-		return false, nil
-	}
-	if err != nil {
-		return false, err
-	}
-
-	// successfully authenticated
-	return true, nil
-}

bin/src/github.com/revel/modules/auth/driver/storage/mysql/README.md

@@ -1,3 +0,0 @@
-Mysql Auth driver
-==================
-

bin/src/github.com/revel/modules/auth/driver/storage/postgres/README.md

@@ -1,3 +0,0 @@
-Postgresql Auth driver
-==================
-

bin/src/github.com/revel/modules/auth/driver/storage/sqlite/README.md

@@ -1,3 +0,0 @@
-Sqlite Auth driver
-==================
-

bin/src/github.com/revel/modules/auth/user.go

@@ -1,17 +0,0 @@
-package auth
-
-// var storageDriver auth.StorageDriver // postgres in example
-
-// type AuthUserModel struct {
-// 	userId   string
-// 	security *SecurityDriver // bcrypt in example
-
-// }
-
-// func (self *AuthUserModel) UserId() string {
-// 	return self.userId
-// }
-
-// func (self *AuthUserModel) Secret() string {
-// 	return self.security.Secret()
-// }

bin/src/github.com/revel/modules/csrf/app/csrf.go

@@ -1,121 +0,0 @@
-package csrf
-
-import (
-	"crypto/rand"
-	"crypto/subtle"
-	"encoding/hex"
-	"html/template"
-	"io"
-	"math"
-	"net/url"
-
-	"github.com/revel/revel"
-)
-
-// allowMethods are HTTP methods that do NOT require a token
-var allowedMethods = map[string]bool{
-	"GET":     true,
-	"HEAD":    true,
-	"OPTIONS": true,
-	"TRACE":   true,
-}
-
-func RandomString(length int) (string, error) {
-	buffer := make([]byte, int(math.Ceil(float64(length)/2)))
-	if _, err := io.ReadFull(rand.Reader, buffer); err != nil {
-		return "", nil
-	}
-	str := hex.EncodeToString(buffer)
-	return str[:length], nil
-}
-
-func RefreshToken(c *revel.Controller) {
-	token, err := RandomString(64)
-	if err != nil {
-		panic(err)
-	}
-	c.Session["csrf_token"] = token
-}
-
-// CsrfFilter enables CSRF request token creation and verification.
-//
-// Usage:
-//  1) Add `csrf.CsrfFilter` to the app's filters (it must come after the revel.SessionFilter).
-//  2) Add CSRF fields to a form with the template tag `{{ csrftoken . }}`. The filter adds a function closure to the `RenderArgs` that can pull out the secret and make the token as-needed, caching the value in the request. Ajax support provided through the `X-CSRFToken` header.
-func CsrfFilter(c *revel.Controller, fc []revel.Filter) {
-	token, foundToken := c.Session["csrf_token"]
-
-	if !foundToken {
-		RefreshToken(c)
-	}
-
-	referer, refErr := url.Parse(c.Request.Header.Get("Referer"))
-	isSameOrigin := sameOrigin(c.Request.URL, referer)
-
-	// If the Request method isn't in the white listed methods
-	if !allowedMethods[c.Request.Method] && !IsExempt(c) {
-		// Token wasn't present at all
-		if !foundToken {
-			c.Result = c.Forbidden("REVEL CSRF: Session token missing.")
-			return
-		}
-
-		// Referer header is invalid
-		if refErr != nil {
-			c.Result = c.Forbidden("REVEL CSRF: HTTP Referer malformed.")
-			return
-		}
-
-		// Same origin
-		if !isSameOrigin {
-			c.Result = c.Forbidden("REVEL CSRF: Same origin mismatch.")
-			return
-		}
-
-		var requestToken string
-		// First check for token in post data
-		if c.Request.Method == "POST" {
-			requestToken = c.Request.FormValue("csrftoken")
-		}
-
-		// Then check for token in custom headers, as with AJAX
-		if requestToken == "" {
-			requestToken = c.Request.Header.Get("X-CSRFToken")
-		}
-
-		if requestToken == "" || !compareToken(requestToken, token) {
-			c.Result = c.Forbidden("REVEL CSRF: Invalid token.")
-			return
-		}
-	}
-
-	fc[0](c, fc[1:])
-
-	// Only add token to RenderArgs if the request is: not AJAX, not missing referer header, and is same origin.
-	if c.Request.Header.Get("X-CSRFToken") == "" && isSameOrigin {
-		c.RenderArgs["_csrftoken"] = token
-	}
-}
-
-func compareToken(requestToken, token string) bool {
-	// ConstantTimeCompare will panic if the []byte aren't the same length
-	if len(requestToken) != len(token) {
-		return false
-	}
-	return subtle.ConstantTimeCompare([]byte(requestToken), []byte(token)) == 1
-}
-
-// Validates same origin policy
-func sameOrigin(u1, u2 *url.URL) bool {
-	return u1.Scheme == u2.Scheme && u1.Host == u2.Host
-}
-
-func init() {
-	revel.TemplateFuncs["csrftoken"] = func(renderArgs map[string]interface{}) template.HTML {
-		if tokenFunc, ok := renderArgs["_csrftoken"]; !ok {
-			panic("REVEL CSRF: _csrftoken missing from RenderArgs.")
-		} else {
-			return template.HTML(tokenFunc.(func() string)())
-		}
-	}
-}

bin/src/github.com/revel/modules/csrf/app/csrf_test.go

@@ -1,169 +0,0 @@
-package csrf
-
-import (
-	"bytes"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"testing"
-
-	"github.com/revel/revel"
-)
-
-var testFilters = []revel.Filter{
-	CsrfFilter,
-	func(c *revel.Controller, fc []revel.Filter) {
-		c.RenderHtml("{{ csrftoken . }}")
-	},
-}
-
-func TestTokenInSession(t *testing.T) {
-	resp := httptest.NewRecorder()
-	getRequest, _ := http.NewRequest("GET", "http://www.example.com/", nil)
-	c := revel.NewController(revel.NewRequest(getRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	testFilters[0](c, testFilters)
-
-	if _, ok := c.Session["csrf_token"]; !ok {
-		t.Fatal("token should be present in session")
-	}
-}
-
-func TestPostWithoutToken(t *testing.T) {
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status != 403 {
-		t.Fatal("post without token should be forbidden")
-	}
-}
-
-func TestNoReferrer(t *testing.T) {
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	RefreshToken(c)
-	token := c.Session["csrf_token"]
-
-	// make a new request with the token
-	data := url.Values{}
-	data.Set("csrftoken", token)
-	formPostRequest, _ := http.NewRequest("POST", "http://www.example.com/", bytes.NewBufferString(data.Encode()))
-	formPostRequest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
-
-	// and replace the old request
-	c.Request = revel.NewRequest(formPostRequest)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status != 403 {
-		t.Fatal("post without referer should be forbidden")
-	}
-}
-
-func TestRefererHttps(t *testing.T) {
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-
-	c.Session = make(revel.Session)
-
-	RefreshToken(c)
-	token := c.Session["csrf_token"]
-
-	// make a new request with the token
-	data := url.Values{}
-	data.Set("csrftoken", token)
-	formPostRequest, _ := http.NewRequest("POST", "https://www.example.com/", bytes.NewBufferString(data.Encode()))
-	formPostRequest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
-	formPostRequest.Header.Add("Referer", "http://www.example.com/")
-
-	// and replace the old request
-	c.Request = revel.NewRequest(formPostRequest)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status != 403 {
-		t.Fatal("posts to https should have an https referer")
-	}
-}
-
-func TestHeaderWithToken(t *testing.T) {
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-
-	c.Session = make(revel.Session)
-
-	RefreshToken(c)
-	token := c.Session["csrf_token"]
-
-	// make a new request with the token
-	formPostRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	formPostRequest.Header.Add("X-CSRFToken", token)
-	formPostRequest.Header.Add("Referer", "http://www.example.com/")
-
-	// and replace the old request
-	c.Request = revel.NewRequest(formPostRequest)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status == 403 {
-		t.Fatal("post with http header token should be allowed")
-	}
-}
-
-func TestFormPostWithToken(t *testing.T) {
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-
-	c.Session = make(revel.Session)
-
-	RefreshToken(c)
-	token := c.Session["csrf_token"]
-
-	// make a new request with the token
-	data := url.Values{}
-	data.Set("csrftoken", token)
-	formPostRequest, _ := http.NewRequest("POST", "http://www.example.com/", bytes.NewBufferString(data.Encode()))
-	formPostRequest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
-	formPostRequest.Header.Add("Referer", "http://www.example.com/")
-
-	// and replace the old request
-	c.Request = revel.NewRequest(formPostRequest)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status == 403 {
-		t.Fatal("form post with token should be allowed")
-	}
-}
-
-func TestNoTokenInArgsWhenCORs(t *testing.T) {
-	resp := httptest.NewRecorder()
-
-	getRequest, _ := http.NewRequest("GET", "http://www.example1.com/", nil)
-	getRequest.Header.Add("Referer", "http://www.example2.com/")
-
-	c := revel.NewController(revel.NewRequest(getRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	testFilters[0](c, testFilters)
-
-	if _, ok := c.RenderArgs["_csrftoken"]; ok {
-		t.Fatal("RenderArgs should not contain token when not same origin")
-	}
-}

bin/src/github.com/revel/modules/csrf/app/exempt.go

@@ -1,36 +0,0 @@
-package csrf
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/revel/revel"
-)
-
-var (
-	exemptPath   = make(map[string]bool)
-	exemptAction = make(map[string]bool)
-)
-
-func MarkExempt(route string) {
-	if strings.HasPrefix(route, "/") {
-		// e.g. "/controller/action"
-		exemptPath[strings.ToLower(route)] = true
-	} else if routeParts := strings.Split(route, "."); len(routeParts) == 2 {
-		// e.g. "ControllerName.ActionName"
-		exemptAction[route] = true
-	} else {
-		err := fmt.Sprintf("csrf.MarkExempt() received invalid argument \"%v\". Either provide a path prefixed with \"/\" or controller action in the form of \"ControllerName.ActionName\".", route)
-		panic(err)
-	}
-}
-
-func IsExempt(c *revel.Controller) bool {
-	if _, ok := exemptPath[strings.ToLower(c.Request.Request.URL.Path)]; ok {
-		return true
-	} else if _, ok := exemptAction[c.Action]; ok {
-		return true
-	}
-
-	return false
-}

bin/src/github.com/revel/modules/csrf/app/exempt_test.go

@@ -1,55 +0,0 @@
-package csrf
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/revel/revel"
-)
-
-func TestExemptPath(t *testing.T) {
-	MarkExempt("/Controller/Action")
-
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/Controller/Action", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status == 403 {
-		t.Fatal("post to csrf exempt action should pass")
-	}
-}
-
-func TestExemptPathCaseInsensitive(t *testing.T) {
-	MarkExempt("/Controller/Action")
-
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/controller/action", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status == 403 {
-		t.Fatal("post to csrf exempt action should pass")
-	}
-}
-
-func TestExemptAction(t *testing.T) {
-	MarkExempt("Controller.Action")
-
-	resp := httptest.NewRecorder()
-	postRequest, _ := http.NewRequest("POST", "http://www.example.com/Controller/Action", nil)
-	c := revel.NewController(revel.NewRequest(postRequest), revel.NewResponse(resp))
-	c.Session = make(revel.Session)
-	c.Action = "Controller.Action"
-
-	testFilters[0](c, testFilters)
-
-	if c.Response.Status == 403 {
-		t.Fatal("post to csrf exempt action should pass")
-	}
-}

bin/src/github.com/revel/modules/db/app/db.go

@@ -1,86 +0,0 @@
-// This module configures a database connection for the application.
-//
-// Developers use this module by importing and calling db.Init().
-// A "Transactional" controller type is provided as a way to import interceptors
-// that manage the transaction
-//
-// In particular, a transaction is begun before each request and committed on
-// success.  If a panic occurred during the request, the transaction is rolled
-// back.  (The application may also roll the transaction back itself.)
-package db
-
-import (
-	"database/sql"
-	"github.com/revel/revel"
-)
-
-var (
-	Db     *sql.DB
-	Driver string
-	Spec   string
-)
-
-func Init() {
-	// Read configuration.
-	var found bool
-	if Driver, found = revel.Config.String("db.driver"); !found {
-		revel.ERROR.Fatal("No db.driver found.")
-	}
-	if Spec, found = revel.Config.String("db.spec"); !found {
-		revel.ERROR.Fatal("No db.spec found.")
-	}
-
-	// Open a connection.
-	var err error
-	Db, err = sql.Open(Driver, Spec)
-	if err != nil {
-		revel.ERROR.Fatal(err)
-	}
-}
-
-type Transactional struct {
-	*revel.Controller
-	Txn *sql.Tx
-}
-
-// Begin a transaction
-func (c *Transactional) Begin() revel.Result {
-	txn, err := Db.Begin()
-	if err != nil {
-		panic(err)
-	}
-	c.Txn = txn
-	return nil
-}
-
-// Rollback if it's still going (must have panicked).
-func (c *Transactional) Rollback() revel.Result {
-	if c.Txn != nil {
-		if err := c.Txn.Rollback(); err != nil {
-			if err != sql.ErrTxDone {
-				panic(err)
-			}
-		}
-		c.Txn = nil
-	}
-	return nil
-}
-
-// Commit the transaction.
-func (c *Transactional) Commit() revel.Result {
-	if c.Txn != nil {
-		if err := c.Txn.Commit(); err != nil {
-			if err != sql.ErrTxDone {
-				panic(err)
-			}
-		}
-		c.Txn = nil
-	}
-	return nil
-}
-
-func init() {
-	revel.InterceptMethod((*Transactional).Begin, revel.BEFORE)
-	revel.InterceptMethod((*Transactional).Commit, revel.AFTER)
-	revel.InterceptMethod((*Transactional).Rollback, revel.FINALLY)
-}

bin/src/github.com/revel/modules/jobs/app/controllers/status.go

@@ -1,32 +0,0 @@
-package controllers
-
-import (
-	"github.com/revel/revel"
-	"github.com/revel/modules/jobs/app/jobs"
-	"github.com/robfig/cron"
-	"strings"
-)
-
-type Jobs struct {
-	*revel.Controller
-}
-
-func (c Jobs) Status() revel.Result {
-	remoteAddress := c.Request.RemoteAddr
-	if revel.Config.BoolDefault("jobs.acceptproxyaddress", false) {
-		if proxiedAddress, isProxied := c.Request.Header["X-Forwarded-For"]; isProxied {
-			remoteAddress = proxiedAddress[0]
-		}
-	}
-	if !strings.HasPrefix(remoteAddress, "127.0.0.1") && !strings.HasPrefix(remoteAddress, "::1") {
-		return c.Forbidden("%s is not local", remoteAddress)
-	}
-	entries := jobs.MainCron.Entries()
-	return c.Render(entries)
-}
-
-func init() {
-	revel.TemplateFuncs["castjob"] = func(job cron.Job) *jobs.Job {
-		return job.(*jobs.Job)
-	}
-}

bin/src/github.com/revel/modules/jobs/app/jobs/job.go

@@ -1,66 +0,0 @@
-package jobs
-
-import (
-	"github.com/revel/revel"
-	"github.com/robfig/cron"
-	"reflect"
-	"runtime/debug"
-	"sync"
-	"sync/atomic"
-)
-
-type Job struct {
-	Name    string
-	inner   cron.Job
-	status  uint32
-	running sync.Mutex
-}
-
-const UNNAMED = "(unnamed)"
-
-func New(job cron.Job) *Job {
-	name := reflect.TypeOf(job).Name()
-	if name == "Func" {
-		name = UNNAMED
-	}
-	return &Job{
-		Name:  name,
-		inner: job,
-	}
-}
-
-func (j *Job) Status() string {
-	if atomic.LoadUint32(&j.status) > 0 {
-		return "RUNNING"
-	}
-	return "IDLE"
-}
-
-func (j *Job) Run() {
-	// If the job panics, just print a stack trace.
-	// Don't let the whole process die.
-	defer func() {
-		if err := recover(); err != nil {
-			if revelError := revel.NewErrorFromPanic(err); revelError != nil {
-				revel.ERROR.Print(err, "\n", revelError.Stack)
-			} else {
-				revel.ERROR.Print(err, "\n", string(debug.Stack()))
-			}
-		}
-	}()
-
-	if !selfConcurrent {
-		j.running.Lock()
-		defer j.running.Unlock()
-	}
-
-	if workPermits != nil {
-		workPermits <- struct{}{}
-		defer func() { <-workPermits }()
-	}
-
-	atomic.StoreUint32(&j.status, 1)
-	defer atomic.StoreUint32(&j.status, 0)
-
-	j.inner.Run()
-}

bin/src/github.com/revel/modules/jobs/app/jobs/jobrunner.go

@@ -1,64 +0,0 @@
-// A job runner for executing scheduled or ad-hoc tasks asynchronously from HTTP requests.
-//
-// It adds a couple of features on top of the cron package to make it play nicely with Revel:
-// 1. Protection against job panics.  (They print to ERROR instead of take down the process)
-// 2. (Optional) Limit on the number of jobs that may run simulatenously, to
-//    limit resource consumption.
-// 3. (Optional) Protection against multiple instances of a single job running
-//    concurrently.  If one execution runs into the next, the next will be queued.
-// 4. Cron expressions may be defined in app.conf and are reusable across jobs.
-// 5. Job status reporting.
-package jobs
-
-import (
-	"github.com/revel/revel"
-	"github.com/robfig/cron"
-	"strings"
-	"time"
-)
-
-// Callers can use jobs.Func to wrap a raw func.
-// (Copying the type to this package makes it more visible)
-//
-// For example:
-//    jobs.Schedule("cron.frequent", jobs.Func(myFunc))
-type Func func()
-
-func (r Func) Run() { r() }
-
-func Schedule(spec string, job cron.Job) error {
-	// Look to see if given spec is a key from the Config.
-	if strings.HasPrefix(spec, "cron.") {
-		confSpec, found := revel.Config.String(spec)
-		if !found {
-			panic("Cron spec not found: " + spec)
-		}
-		spec = confSpec
-	}
-	sched, err := cron.Parse(spec)
-	if err != nil {
-		return err
-	}
-	MainCron.Schedule(sched, New(job))
-	return nil
-}
-
-// Run the given job at a fixed interval.
-// The interval provided is the time between the job ending and the job being run again.
-// The time that the job takes to run is not included in the interval.
-func Every(duration time.Duration, job cron.Job) {
-	MainCron.Schedule(cron.Every(duration), New(job))
-}
-
-// Run the given job right now.
-func Now(job cron.Job) {
-	go New(job).Run()
-}
-
-// Run the given job once, after the given delay.
-func In(duration time.Duration, job cron.Job) {
-	go func() {
-		time.Sleep(duration)
-		New(job).Run()
-	}()
-}

bin/src/github.com/revel/modules/jobs/app/jobs/plugin.go

@@ -1,32 +0,0 @@
-package jobs
-
-import (
-	"fmt"
-	"github.com/revel/revel"
-	"github.com/robfig/cron"
-)
-
-const DEFAULT_JOB_POOL_SIZE = 10
-
-var (
-	// Singleton instance of the underlying job scheduler.
-	MainCron *cron.Cron
-
-	// This limits the number of jobs allowed to run concurrently.
-	workPermits chan struct{}
-
-	// Is a single job allowed to run concurrently with itself?
-	selfConcurrent bool
-)
-
-func init() {
-	MainCron = cron.New()
-	revel.OnAppStart(func() {
-		if size := revel.Config.IntDefault("jobs.pool", DEFAULT_JOB_POOL_SIZE); size > 0 {
-			workPermits = make(chan struct{}, size)
-		}
-		selfConcurrent = revel.Config.BoolDefault("jobs.selfconcurrent", false)
-		MainCron.Start()
-		fmt.Println("Go to /@jobs to see job status.")
-	})
-}

bin/src/github.com/revel/modules/jobs/app/views/Jobs/Status.html

@@ -1,39 +0,0 @@
-<html>
-	<head>
-		<style>
-body {
-  font-size: 12px;
-  font-family: sans-serif;
-}
-table {
-  border-collapse: collapse;
-  border: none;
-}
-table td, table th {
-  padding: 4 10px;
-  border: none;
-}
-table tr:nth-child(odd) {
-  background-color: #f0f0f0;
-}
-th {
-  text-align: left;
-}
-		</style>
-	</head>
-	<body>
-
-<h1>Scheduled Jobs</h1>
-
-<table>
-	<tr><th>Name</th><th>Status</th><th>Last run</th><th>Next run</th></tr>
-{{range .entries}}
-	{{$job := castjob .Job}}
-	<tr>
-		<td>{{$job.Name}}</td>
-		<td>{{$job.Status}}</td>
-		<td>{{if not .Prev.IsZero}}{{.Prev.Format "2006-01-02 15:04:05"}}{{end}}</td>
-		<td>{{if not .Next.IsZero}}{{.Next.Format "2006-01-02 15:04:05"}}{{end}}</td>
-	</tr>
-{{end}}
-</table>

bin/src/github.com/revel/modules/jobs/conf/routes

@@ -1 +0,0 @@
-GET     /@jobs      Jobs.Status

bin/src/github.com/revel/modules/pprof/README.md

@@ -1,19 +0,0 @@
-Revel pprof module
-============
-
-#### How to use:
-
-1. Open your app.conf file and add the following line:  
-`module.pprof=github.com/revel/modules/pprof`  
-This will enable the pprof module.
-
-2. Next, open your routes file and add:  
-`module:pprof` **Note:** Do not change these routes. The pprof command-line tool by default assumes these routes.
-
-Congrats! You can now profile your application. To use the web interface, visit `http://<host>:<port>/debug/pprof`. You can also use the `go tool pprof` command to profile your application and get a little deeper. Use the command by running `go tool pprof <binary> http://<host>:<port>`. For example, if you modified the booking sample, you would run: `go tool pprof $GOPATH/bin/booking http://localhost:9000` (assuming you used the default `revel run` arguments.
-
-The command-line tool will take a 30-second CPU profile, and save the results to a temporary file in your `$HOME/pprof` directory. You can reference this file at a later time by using the same command as above, but by specifying the filename instead of the server address.
-
-In order to fully utilize the command-line tool, you may need the graphviz utilities. If you're on OS X, you can install these easily using Homebrew: `brew install graphviz`.
-
-To read more about profiling Go programs, here is some reading material: [The Go Blog](http://blog.golang.org/profiling-go-programs) : [net/pprof package documentation](http://golang.org/pkg/net/http/pprof/)

bin/src/github.com/revel/modules/pprof/app/controllers/pprof.go

@@ -1,39 +0,0 @@
-package controllers
-
-import (
-	"github.com/revel/revel"
-	"net/http"
-	"net/http/pprof"
-)
-
-type Pprof struct {
-	*revel.Controller
-}
-
-// The PprofHandler type makes it easy to call the net/http/pprof handler methods
-// since they all have the same method signature
-type PprofHandler func(http.ResponseWriter, *http.Request)
-
-func (r PprofHandler) Apply(req *revel.Request, resp *revel.Response) {
-	r(resp.Out, req.Request)
-}
-
-func (c Pprof) Profile() revel.Result {
-	return PprofHandler(pprof.Profile)
-}
-
-func (c Pprof) Symbol() revel.Result {
-	return PprofHandler(pprof.Symbol)
-}
-
-func (c Pprof) Cmdline() revel.Result {
-	return PprofHandler(pprof.Cmdline)
-}
-
-func (c Pprof) Trace() revel.Result {
-	return PprofHandler(pprof.Trace)
-}
-
-func (c Pprof) Index() revel.Result {
-	return PprofHandler(pprof.Index)
-}

bin/src/github.com/revel/modules/pprof/conf/routes

@@ -1,6 +0,0 @@
-GET /pprof/profile       Pprof.Profile
-GET /pprof/symbol        Pprof.Symbol
-GET /debug/pprof/cmdline Pprof.Cmdline
-GET /debug/pprof/trace   Pprof.Trace
-GET /debug/pprof/*       Pprof.Index
-GET /debug/pprof/        Pprof.Index

bin/src/github.com/revel/modules/static/app/controllers/static.go

@@ -1,121 +0,0 @@
-package controllers
-
-import (
-	"github.com/revel/revel"
-	"os"
-	fpath "path/filepath"
-	"strings"
-	"syscall"
-)
-
-type Static struct {
-	*revel.Controller
-}
-
-// This method handles requests for files. The supplied prefix may be absolute
-// or relative. If the prefix is relative it is assumed to be relative to the
-// application directory. The filepath may either be just a file or an
-// additional filepath to search for the given file. This response may return
-// the following responses in the event of an error or invalid request;
-//   403(Forbidden): If the prefix filepath combination results in a directory.
-//   404(Not found): If the prefix and filepath combination results in a non-existent file.
-//   500(Internal Server Error): There are a few edge cases that would likely indicate some configuration error outside of revel.
-//
-// Note that when defining routes in routes/conf the parameters must not have
-// spaces around the comma.
-//   Bad:  Static.Serve("public/img", "favicon.png")
-//   Good: Static.Serve("public/img","favicon.png")
-//
-// Examples:
-// Serving a directory
-//   Route (conf/routes):
-//     GET /public/{<.*>filepath} Static.Serve("public")
-//   Request:
-//     public/js/sessvars.js
-//   Calls
-//     Static.Serve("public","js/sessvars.js")
-//
-// Serving a file
-//   Route (conf/routes):
-//     GET /favicon.ico Static.Serve("public/img","favicon.png")
-//   Request:
-//     favicon.ico
-//   Calls:
-//     Static.Serve("public/img", "favicon.png")
-func (c Static) Serve(prefix, filepath string) revel.Result {
-	// Fix for #503.
-	prefix = c.Params.Fixed.Get("prefix")
-	if prefix == "" {
-		return c.NotFound("")
-	}
-
-	return serve(c, prefix, filepath)
-}
-
-// This method allows modules to serve binary files. The parameters are the same
-// as Static.Serve with the additional module name pre-pended to the list of
-// arguments.
-func (c Static) ServeModule(moduleName, prefix, filepath string) revel.Result {
-	// Fix for #503.
-	prefix = c.Params.Fixed.Get("prefix")
-	if prefix == "" {
-		return c.NotFound("")
-	}
-
-	var basePath string
-	for _, module := range revel.Modules {
-		if module.Name == moduleName {
-			basePath = module.Path
-		}
-	}
-
-	absPath := fpath.Join(basePath, fpath.FromSlash(prefix))
-
-	return serve(c, absPath, filepath)
-}
-
-
-// This method allows static serving of application files in a verified manner.
-func serve(c Static, prefix, filepath string) revel.Result {
-	var basePath string
-	if !fpath.IsAbs(prefix) {
-		basePath = revel.BasePath
-	}
-
-	basePathPrefix := fpath.Join(basePath, fpath.FromSlash(prefix))
-	fname := fpath.Join(basePathPrefix, fpath.FromSlash(filepath))
-	// Verify the request file path is within the application's scope of access
-	if !strings.HasPrefix(fname, basePathPrefix) {
-		revel.WARN.Printf("Attempted to read file outside of base path: %s", fname)
-		return c.NotFound("")
-	}
-
-	// Verify file path is accessible
-	finfo, err := os.Stat(fname)
-	if err != nil {
-		if os.IsNotExist(err) || err.(*os.PathError).Err == syscall.ENOTDIR {
-			revel.WARN.Printf("File not found (%s): %s ", fname, err)
-			return c.NotFound("File not found")
-		}
-		revel.ERROR.Printf("Error trying to get fileinfo for '%s': %s", fname, err)
-		return c.RenderError(err)
-	}
-
-	// Disallow directory listing
-	if finfo.Mode().IsDir() {
-		revel.WARN.Printf("Attempted directory listing of %s", fname)
-		return c.Forbidden("Directory listing not allowed")
-	}
-
-	// Open request file path
-	file, err := os.Open(fname)
-	if err != nil {
-		if os.IsNotExist(err) {
-			revel.WARN.Printf("File not found (%s): %s ", fname, err)
-			return c.NotFound("File not found")
-		}
-		revel.ERROR.Printf("Error opening '%s': %s", fname, err)
-		return c.RenderError(err)
-	}
-	return c.RenderFile(file, revel.Inline)
-}

bin/src/github.com/revel/modules/testrunner/app/controllers/testrunner.go

@@ -1,248 +0,0 @@
-package controllers
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"html/template"
-	"reflect"
-	"strings"
-
-	"github.com/revel/revel"
-	"github.com/revel/revel/testing"
-)
-
-// TestRunner is a controller which is used for running application tests in browser.
-type TestRunner struct {
-	*revel.Controller
-}
-
-// TestSuiteDesc is used for storing information about a single test suite.
-// This structure is required by revel test cmd.
-type TestSuiteDesc struct {
-	Name  string
-	Tests []TestDesc
-
-	// Elem is reflect.Type which can be used for accessing methods
-	// of the test suite.
-	Elem reflect.Type
-}
-
-// TestDesc is used for describing a single test of some test suite.
-// This structure is required by revel test cmd.
-type TestDesc struct {
-	Name string
-}
-
-// TestSuiteResult stores the results the whole test suite.
-// This structure is required by revel test cmd.
-type TestSuiteResult struct {
-	Name    string
-	Passed  bool
-	Results []TestResult
-}
-
-// TestResult represents the results of running a single test of some test suite.
-// This structure is required by revel test cmd.
-type TestResult struct {
-	Name         string
-	Passed       bool
-	ErrorHTML    template.HTML
-	ErrorSummary string
-}
-
-var (
-	testSuites []TestSuiteDesc // A list of all available tests.
-
-	none = []reflect.Value{} // It is used as input for reflect call in a few places.
-
-	// registeredTests simplifies the search of test suites by their name.
-	// "TestSuite.TestName" is used as a key. Value represents index in testSuites.
-	registeredTests map[string]int
-)
-
-/*
-	Controller's action methods are below.
-*/
-
-// Index is an action which renders the full list of available test suites and their tests.
-func (c TestRunner) Index() revel.Result {
-	return c.Render(testSuites)
-}
-
-// Run runs a single test, given by the argument.
-func (c TestRunner) Run(suite, test string) revel.Result {
-	// Check whether requested test exists.
-	suiteIndex, ok := registeredTests[suite+"."+test]
-	if !ok {
-		return c.NotFound("Test %s.%s does not exist", suite, test)
-	}
-
-	result := TestResult{Name: test}
-
-	// Found the suite, create a new instance and run the named method.
-	t := testSuites[suiteIndex].Elem
-	v := reflect.New(t)
-	func() {
-		// When the function stops executing try to recover from panic.
-		defer func() {
-			if err := recover(); err != nil {
-				// If panic error is empty, exit.
-				panicErr := revel.NewErrorFromPanic(err)
-				if panicErr == nil {
-					return
-				}
-
-				// Otherwise, prepare and format the response of server if possible.
-				testSuite := v.Elem().FieldByName("TestSuite").Interface().(testing.TestSuite)
-				res := formatResponse(testSuite)
-
-				// Render the error and save to the result structure.
-				var buffer bytes.Buffer
-				tmpl, _ := revel.MainTemplateLoader.Template("TestRunner/FailureDetail.html")
-				tmpl.Render(&buffer, map[string]interface{}{
-					"error":    panicErr,
-					"response": res,
-					"postfix":  suite + "_" + test,
-				})
-				result.ErrorSummary = errorSummary(panicErr)
-				result.ErrorHTML = template.HTML(buffer.String())
-			}
-		}()
-
-		// Initialize the test suite with a NewTestSuite()
-		testSuiteInstance := v.Elem().FieldByName("TestSuite")
-		testSuiteInstance.Set(reflect.ValueOf(testing.NewTestSuite()))
-
-		// Make sure After method will be executed at the end.
-		if m := v.MethodByName("After"); m.IsValid() {
-			defer m.Call(none)
-		}
-
-		// Start from running Before method of test suite if exists.
-		if m := v.MethodByName("Before"); m.IsValid() {
-			m.Call(none)
-		}
-
-		// Start the test method itself.
-		v.MethodByName(test).Call(none)
-
-		// No panic means success.
-		result.Passed = true
-	}()
-
-	return c.RenderJson(result)
-}
-
-// List returns a JSON list of test suites and tests.
-// It is used by revel test command line tool.
-func (c TestRunner) List() revel.Result {
-	return c.RenderJson(testSuites)
-}
-
-/*
-	Below are helper functions.
-*/
-
-// describeSuite expects testsuite interface as input parameter
-// and returns its description in a form of TestSuiteDesc structure.
-func describeSuite(testSuite interface{}) TestSuiteDesc {
-	t := reflect.TypeOf(testSuite)
-
-	// Get a list of methods of the embedded test type.
-	// It will be used to make sure the same tests are not included in multiple test suites.
-	super := t.Elem().Field(0).Type
-	superMethods := map[string]bool{}
-	for i := 0; i < super.NumMethod(); i++ {
-		// Save the current method's name.
-		superMethods[super.Method(i).Name] = true
-	}
-
-	// Get a list of methods on the test suite that take no parameters, return
-	// no results, and were not part of the embedded type's method set.
-	var tests []TestDesc
-	for i := 0; i < t.NumMethod(); i++ {
-		m := t.Method(i)
-		mt := m.Type
-
-		// Make sure the test method meets the criterias:
-		// - method of testSuite without input parameters;
-		// - nothing is returned;
-		// - has "Test" prefix;
-		// - doesn't belong to the embedded structure.
-		methodWithoutParams := (mt.NumIn() == 1 && mt.In(0) == t)
-		nothingReturned := (mt.NumOut() == 0)
-		hasTestPrefix := (strings.HasPrefix(m.Name, "Test"))
-		if methodWithoutParams && nothingReturned && hasTestPrefix && !superMethods[m.Name] {
-			// Register the test suite's index so we can quickly find it by test's name later.
-			registeredTests[t.Elem().Name()+"."+m.Name] = len(testSuites)
-
-			// Add test to the list of tests.
-			tests = append(tests, TestDesc{m.Name})
-		}
-	}
-
-	return TestSuiteDesc{
-		Name:  t.Elem().Name(),
-		Tests: tests,
-		Elem:  t.Elem(),
-	}
-}
-
-// errorSummary gets an error and returns its summary in human readable format.
-func errorSummary(err *revel.Error) (message string) {
-	message = fmt.Sprintf("%4sStatus: %s\n%4sIn %s", "", err.Description, "", err.Path)
-
-	// If line of error isn't known return the message as is.
-	if err.Line == 0 {
-		return
-	}
-
-	// Otherwise, include info about the line number and the relevant
-	// source code lines.
-	message += fmt.Sprintf(" (around line %d): ", err.Line)
-	for _, line := range err.ContextSource() {
-		if line.IsError {
-			message += line.Source
-		}
-	}
-
-	return
-}
-
-// formatResponse gets *revel.TestSuite as input parameter and
-// transform response related info into a readable format.
-func formatResponse(t testing.TestSuite) map[string]string {
-	if t.Response == nil {
-		return map[string]string{}
-	}
-
-	// Beautify the response JSON to make it human readable.
-	resp, err := json.MarshalIndent(t.Response, "", "  ")
-	if err != nil {
-		revel.ERROR.Println(err)
-	}
-
-	// Remove extra new line symbols so they do not take too much space on a result page.
-	// Allow no more than 1 line break at a time.
-	body := strings.Replace(string(t.ResponseBody), "\n\n", "\n", -1)
-	body = strings.Replace(body, "\r\n\r\n", "\r\n", -1)
-
-	return map[string]string{
-		"Headers": string(resp),
-		"Body":    strings.TrimSpace(body),
-	}
-}
-
-func init() {
-	// Every time app is restarted convert the list of available test suites
-	// provided by the revel testing package into a format which will be used by
-	// the testrunner module and revel test cmd.
-	revel.OnAppStart(func() {
-		// Extracting info about available test suites from revel/testing package.
-		registeredTests = map[string]int{}
-		for _, testSuite := range testing.TestSuites {
-			testSuites = append(testSuites, describeSuite(testSuite))
-		}
-	})
-}

bin/src/github.com/revel/modules/testrunner/app/plugin.go

@@ -1,12 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"github.com/revel/revel"
-)
-
-func init() {
-	revel.OnAppStart(func() {
-		fmt.Println("Go to /@tests to run the tests.")
-	})
-}

bin/src/github.com/revel/modules/testrunner/app/views/TestRunner/FailureDetail.html

@@ -1,45 +0,0 @@
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<b>{{.error.Description}}</b>
-	</div>
-	<div class="panel-body">
-
-		<ul class="nav nav-tabs" role="tablist">
-			<li class="active"><a href="#error_{{.postfix}}" role="tab" data-toggle="tab">Error</a></li>
-			<li><a href="#stack_{{.postfix}}" role="tab" data-toggle="tab">Stack</a></li>
-			{{if .response}}
-				<li><a href="#headers_{{.postfix}}" role="tab" data-toggle="tab">Headers</a></li>
-				<li><a href="#body_{{.postfix}}" role="tab" data-toggle="tab">Response Body</a></li>
-			{{end}}
-		</ul>
-
-		<div class="tab-content" id="result_{{.postfix}}">
-			<div class="tab-pane active" id="error_{{.postfix}}">
-				<div class="panel panel-danger">
-					<div class="panel-heading">
-						In {{.error.Path}}{{if .error.Line}} (around {{if .error.Line}}line {{.error.Line}}{{end}}{{if .error.Column}} column {{.error.Column}}{{end}}){{end}}:
-					</div>
-					<div class="panel-body">
-						{{range .error.ContextSource}}
-							{{if .IsError}}
-								<pre><code class="go">{{.Source}}</code></pre>
-							{{end}}
-						{{end}}
-					</div>
-				</div>
-			</div>
-			<div class="tab-pane" id="stack_{{.postfix}}">
-				<pre><code class="bash">{{.error.Stack}}</code></pre>
-			</div>
-			{{if .response}}
-				<div class="tab-pane" id="headers_{{.postfix}}">
-					<pre><code class="json">{{.response.Headers}}</code></pre>
-				</div>
-				<div class="tab-pane" id="body_{{.postfix}}">
-					<pre><code class="html">{{.response.Body}}</code></pre>
-				</div>
-			{{end}}
-		</div>
-
-	</div>
-</div>

bin/src/github.com/revel/modules/testrunner/app/views/TestRunner/Index.html

@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Revel Test Runner</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<link href="{{url `Root`}}/@tests/public/css/bootstrap.min.css" type="text/css" rel="stylesheet"></link>
-		<link href="{{url `Root`}}/@tests/public/css/github.css" type="text/css" rel="stylesheet"></link>
-		<script src="{{url `Root`}}/@tests/public/js/jquery-1.9.1.min.js" type="text/javascript"></script>
-		<script src="{{url `Root`}}/@tests/public/js/bootstrap.min.js" type="text/javascript"></script>
-		<script src="{{url `Root`}}/@tests/public/js/highlight.pack.js" type="text/javascript"></script>
-		<style>
-		header { padding:20px 0; background-color:#ADD8E6 }
-		.passed td { background-color: #90EE90 !important; }
-		.failed td { background-color: #FFB6C1 !important; }
-		.tests td.name, .tests td.result { padding-top: 13px; }
-		pre { font-size:10px; white-space: pre; }
-		.name { width: 25%; }
-		.w100 { width: 100%; }
-		</style>
-	</head>
-	<body>
-		<header>
-			<div class="container">
-				<table class="w100"><tr><td>
-					<h1>Test Runner</h1>
-					<p class="lead">Run all of your application's tests from here.</p>
-				</td><td style="padding-left:150px;" class="text-right">
-					<button class="btn btn-lg btn-success" all-tests="">Run All Tests</button>
-				</td></tr></table>
-			</div>
-		</header>
-
-		<div class="container">
-			{{range .testSuites}}
-				<p class="lead" style="margin-top:20px;">{{.Name}}</p>
-				<table class="table table-striped tests" suite="{{.Name}}">
-					{{range .Tests}}
-						<tr>
-							<td class="name">{{.Name}}</td>
-							<td class="result">
-							</td>
-							<td class="text-right"><button test="{{.Name}}" class="btn btn-success">Run</button></td>
-						</tr>
-					{{end}}
-				</table>
-			{{end}}
-		</div>
-
-	<script>
-	var buttons = [];
-	var running;
-
-	$("button[test]").click(function() {
-		var button = $(this).addClass("disabled").text("Running");
-		addToQueue(button);
-	});
-
-	$("button[all-tests]").click(function() {
-		var button = $(this).addClass("disabled").text("Running");
-		$("button[test]").click();
-	});
-
-	function addToQueue(button) {
-		buttons.push(button);
-		if (!running) {
-			running = true;
-			nextTest();
-		}
-	}
-
-	function nextTest() {
-		if (buttons.length == 0) {
-			running = false;
-		} else {
-			var next = buttons.shift();
-			runTest(next);
-		}
-	}
-
-	function runTest(button) {
-		var suite = button.parents("table").attr("suite");
-		var test = button.attr("test");
-		var row = button.parents("tr");
-		var resultCell = row.children(".result");
-		$.ajax({
-			dataType: "json",
-			url: "{{url `Root`}}/@tests/"+suite+"/"+test,
-			success: function(result) {
-				row.attr("class", result.Passed ? "passed" : "failed");
-				if (result.Passed) {
-					resultCell.html("");
-				} else {
-					resultCell.html(result.ErrorHTML);
-
-					$("#result_" + suite + "_" + test + " pre code").each(function(i, block) {
-						hljs.highlightBlock(block);
-					});
-				}
-				button.removeClass("disabled").text("Run");
-				if (buttons.length == 0) {
-					$("button[all-tests]").removeClass("disabled").text("Run All Tests");
-				}
-				nextTest();
-			}
-		});
-	}
-	</script>
-
-	</body>
-</html>

bin/src/github.com/revel/modules/testrunner/app/views/TestRunner/SuiteResult.html

@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Revel Test Runner</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-<style>
-body {
-	margin: 0;
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-	font-size: 14px;
-	line-height: 20px;
-	color: #333333;
-	background-color: #ffffff;
-}
-header { padding:20px 0; }
-header.passed { background-color: #90EE90 !important; }
-header.failed { background-color: #FFB6C1 !important; }
-table { margin-top: 20px; padding: 8px; line-height: 20px; }
-td { vertical-align: top; padding-right:20px; }
-a { color: #0088cc; }
-.container { margin-left: auto; margin-right: auto; width: 940px; overflow: hidden; }
-.result h2 { font-size: 16px; border-bottom: 1px solid #f0f0f0; padding-bottom: 0.2em; }
-.result.failed b { font-weight:bold; color: #C00; font-size: 14px; }
-.result.failed h2 { color: #C00; }
-.result .info { font-size: 12px; }
-.result .info pre  { overflow: auto; background-color: #f0f0f0; width: 100%; max-height: 500px; }
-</style>
-
-	</head>
-	<body>
-		<header class="{{if .Passed}}passed{{else}}failed{{end}}">
-			<div class="container">
-				<h1>{{.Name}}</h1>
-				<p>{{if .Passed}}PASSED{{else}}FAILED{{end}}</p>
-			</div>
-		</header>
-
-		<div class="container">
-			{{range .Results}}
-				<div class="result {{if .Passed}}passed{{else}}failed{{end}}">
-					<div><h2>{{.Name}}</h2></div>
-					<div class="info">{{if .ErrorHTML}}{{.ErrorHTML}}{{else}}PASSED{{end}}</div>
-				</div>
-			{{end}}
-		</div>
-	</body>
-</html>

bin/src/github.com/revel/modules/testrunner/conf/routes

@@ -1,4 +0,0 @@
-GET /@tests                       TestRunner.Index
-GET /@tests.list                  TestRunner.List
-GET /@tests/public/*filepath      Static.ServeModule(testrunner,public)
-GET /@tests/:suite/:test          TestRunner.Run

bin/src/github.com/revel/modules/testrunner/public/css/bootstrap.min.css

@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-Line truncated

bin/src/github.com/revel/modules/testrunner/public/css/github.css

@@ -1,127 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #333;
-  background: #f8f8f8;
-  -webkit-text-size-adjust: none;
-}
-
-.hljs-comment,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-javadoc {
-  color: #998;
-  font-style: italic;
-}
-
-.hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
-.javascript .hljs-title,
-.nginx .hljs-title,
-.hljs-subst,
-.hljs-request,
-.hljs-status {
-  color: #333;
-  font-weight: bold;
-}
-
-.hljs-number,
-.hljs-hexcolor,
-.ruby .hljs-constant {
-  color: #008080;
-}
-
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-phpdoc,
-.hljs-dartdoc,
-.tex .hljs-formula {
-  color: #d14;
-}
-
-.hljs-title,
-.hljs-id,
-.scss .hljs-preprocessor {
-  color: #900;
-  font-weight: bold;
-}
-
-.javascript .hljs-title,
-.hljs-list .hljs-keyword,
-.hljs-subst {
-  font-weight: normal;
-}
-
-.hljs-class .hljs-title,
-.hljs-type,
-.vhdl .hljs-literal,
-.tex .hljs-command {
-  color: #458;
-  font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-tag .hljs-title,
-.hljs-rules .hljs-property,
-.django .hljs-tag .hljs-keyword {
-  color: #000080;
-  font-weight: normal;
-}
-
-.hljs-attribute,
-.hljs-variable,
-.lisp .hljs-body {
-  color: #008080;
-}
-
-.hljs-regexp {
-  color: #009926;
-}
-
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.lisp .hljs-keyword,
-.clojure .hljs-keyword,
-.scheme .hljs-keyword,
-.tex .hljs-special,
-.hljs-prompt {
-  color: #990073;
-}
-
-.hljs-built_in {
-  color: #0086b3;
-}
-
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
-  color: #999;
-  font-weight: bold;
-}
-
-.hljs-deletion {
-  background: #fdd;
-}
-
-.hljs-addition {
-  background: #dfd;
-}
-
-.diff .hljs-change {
-  background: #0086b3;
-}
-
-.hljs-chunk {
-  color: #aaa;
-}

bin/src/github.com/revel/modules/testrunner/public/js/bootstrap.min.js

@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.2.0",d.prototype.close=function(b){function c(){f.detach().trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",c).emulateTransitionEnd(150):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.2.0",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),d[e](null==f[b]?this.options[b]:f[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b).on("keydown.bs.carousel",a.proxy(this.keydown,this)),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.2.0",c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},c.prototype.keydown=function(a){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.to=function(b){var c=this,d=this.getItemIndex(this.$active=this.$element.find(".item.active"));return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.Line truncated

bin/src/github.com/revel/modules/testrunner/public/js/highlight.pack.js

@@ -1 +0,0 @@
-var hljs=new function(){function j(v){return v.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(v){return v.nodeName.toLowerCase()}function h(w,x){var v=w&&w.exec(x);return v&&v.index==0}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^lang(uage)?-/,"")});return v.filter(function(x){return i(x)||/no(-?)highlight/.test(x)})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);if(!t(A).match(/br|hr|img|input/)){v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset<y[0].offset)?w:y}return y[0].event=="start"?w:y}function A(H){function G(I){return" "+I.nodeName+'="'+j(I.value)+'"'}F+="<"+t(H)+Array.prototype.map.call(H.attributes,G).join("")+">"}function E(G){F+="</"+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=j(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+j(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};var E=function(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})};if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b="\\b("+D.bK.split(" ").join("|")+")\\b"}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?("+F.b+")\\.?":F.b}).concat([D.tE,D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}}}x(y)}function c(T,L,J,R){function v(V,W){for(var U=0;U<W.c.length;U++){if(h(W.c[U].bR,V)){return W.c[U]}}}function z(V,U){if(h(V.eR,U)){return V}if(V.eW){return z(V.parent,U)}}function A(U,V){return !J&&h(V.iR,U)}function E(W,U){var V=M.cI?U[0].toLowerCase():U[0];return W.k.hasOwnProperty(V)&&W.k[V]}function w(aa,Y,X,W){var U=W?"":b.classPrefix,V='<span class="'+U,Z=X?"":"</span>";V+=aa+'">';return V+Y+Z}function N(){if(!I.k){return j(C)}var U="";var X=0;I.lR.lastIndex=0;var V=I.lR.exec(C);while(V){U+=j(C.substr(X,V.index-X));var W=E(I,V);if(W){H+=W[1];U+=w(W[0],j(V[0]))}else{U+=j(V[0])}X=I.lR.lastIndex;V=I.lR.exec(C)}return U+j(C.substr(X))}function F(){if(I.sL&&!f[I.sL]){return j(C)}var U=I.sL?c(I.sL,C,true,S):e(C);if(I.r>0){H+=U.r}if(I.subLanguageMode=="continuous"){S=U.top}return w(U.language,U.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(W,V){var U=W.cN?w(W.cN,"",true):"";if(W.rB){D+=U;C=""}else{if(W.eB){D+=j(V)+U;C=""}else{D+=U;C=V}}I=Object.create(W,{parent:{value:I}})}function G(U,Y){C+=U;if(Y===undefined){D+=Q();return 0}var W=v(Y,I);if(W){D+=Q();P(W,Y);return W.rB?0:Y.length}var X=z(I,Y);if(X){var V=I;if(!(V.rE||V.eE)){C+=Y}D+=Q();do{if(I.cN){D+="</span>"}H+=I.r;I=I.parent}while(I!=X.parent);if(V.eE){D+=j(Y)}C="";if(X.starts){P(X.starts,"")}return V.rE?0:Y.length}if(A(Y,I)){throw new Error('Illegal lexeme "'+Y+'" for mode "'+(I.cN||"<unnamed>")+'"')}C+=Y;return Y.length||1}var M=i(T);if(!M){throw new Error('Unknown language: "'+T+'"')}m(M);var I=R||M;var S;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D=w(K.cN,"",true)+D}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+="</span>"}}return{r:H,value:D,language:T,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:j(L)}}else{throw O}}}function e(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:j(y)};var w=v;x.forEach(function(z){if(!i(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function g(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"<br>")}return v}function p(A){var B=r(A);if(/no(-?)highlight/.test(B)){retuLine truncated

bin/src/github.com/revel/modules/testrunner/public/js/jquery-1.9.1.min.js

@@ -1,5 +0,0 @@
-/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery.min.map
-*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(Line truncated
-return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+Line truncated
-}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}reLine truncated

bin/src/github.com/revel/revel/conf/mime-types.conf

@@ -1,545 +0,0 @@
-3dm=x-world/x-3dmf
-3dmf=x-world/x-3dmf
-7z=application/x-7z-compressed
-a=application/octet-stream
-aab=application/x-authorware-bin
-aam=application/x-authorware-map
-aas=application/x-authorware-seg
-abc=text/vndabc
-ace=application/x-ace-compressed
-acgi=text/html
-afl=video/animaflex
-ai=application/postscript
-aif=audio/aiff
-aifc=audio/aiff
-aiff=audio/aiff
-aim=application/x-aim
-aip=text/x-audiosoft-intra
-alz=application/x-alz-compressed
-ani=application/x-navi-animation
-aos=application/x-nokia-9000-communicator-add-on-software
-aps=application/mime
-arc=application/x-arc-compressed
-arj=application/arj
-art=image/x-jg
-asf=video/x-ms-asf
-asm=text/x-asm
-asp=text/asp
-asx=application/x-mplayer2
-au=audio/basic
-avi=video/x-msvideo
-avs=video/avs-video
-bcpio=application/x-bcpio
-bin=application/mac-binary
-bmp=image/bmp
-boo=application/book
-book=application/book
-boz=application/x-bzip2
-bsh=application/x-bsh
-bz2=application/x-bzip2
-bz=application/x-bzip
-c++=text/plain
-c=text/x-c
-cab=application/vnd.ms-cab-compressed
-cat=application/vndms-pkiseccat
-cc=text/x-c
-ccad=application/clariscad
-cco=application/x-cocoa
-cdf=application/cdf
-cer=application/pkix-cert
-cha=application/x-chat
-chat=application/x-chat
-chrt=application/vnd.kde.kchart
-class=application/java
-# ? class=application/java-vm
-com=text/plain
-conf=text/plain
-cpio=application/x-cpio
-cpp=text/x-c
-cpt=application/mac-compactpro
-crl=application/pkcs-crl
-crt=application/pkix-cert
-crx=application/x-chrome-extension
-csh=text/x-scriptcsh
-css=text/css
-csv=text/csv
-cxx=text/plain
-dar=application/x-dar
-dcr=application/x-director
-deb=application/x-debian-package
-deepv=application/x-deepv
-def=text/plain
-der=application/x-x509-ca-cert
-dif=video/x-dv
-dir=application/x-director
-divx=video/divx
-dl=video/dl
-dmg=application/x-apple-diskimage
-doc=application/msword
-dot=application/msword
-dp=application/commonground
-drw=application/drafting
-dump=application/octet-stream
-dv=video/x-dv
-dvi=application/x-dvi
-dwf=drawing/x-dwf=(old)
-dwg=application/acad
-dxf=application/dxf
-dxr=application/x-director
-el=text/x-scriptelisp
-elc=application/x-bytecodeelisp=(compiled=elisp)
-eml=message/rfc822
-env=application/x-envoy
-eps=application/postscript
-es=application/x-esrehber
-etx=text/x-setext
-evy=application/envoy
-exe=application/octet-stream
-f77=text/x-fortran
-f90=text/x-fortran
-f=text/x-fortran
-fdf=application/vndfdf
-fif=application/fractals
-fli=video/fli
-flo=image/florian
-flv=video/x-flv
-flx=text/vndfmiflexstor
-fmf=video/x-atomic3d-feature
-for=text/x-fortran
-fpx=image/vndfpx
-frl=application/freeloader
-funk=audio/make
-g3=image/g3fax
-g=text/plain
-gif=image/gif
-gl=video/gl
-gsd=audio/x-gsm
-gsm=audio/x-gsm
-gsp=application/x-gsp
-gss=application/x-gss
-gtar=application/x-gtar
-gz=application/x-compressed
-gzip=application/x-gzip
-h=text/x-h
-hdf=application/x-hdf
-help=application/x-helpfile
-hgl=application/vndhp-hpgl
-hh=text/x-h
-hlb=text/x-script
-hlp=application/hlp
-hpg=application/vndhp-hpgl
-hpgl=application/vndhp-hpgl
-hqx=application/binhex
-hta=application/hta
-htc=text/x-component
-htm=text/html
-html=text/html
-htmls=text/html
-htt=text/webviewhtml
-htx=text/html
-ice=x-conference/x-cooltalk
-ico=image/x-icon
-ics=text/calendar
-icz=text/calendar
-idc=text/plain
-ief=image/ief
-iefs=image/ief
-iges=application/iges
-igs=application/iges
-ima=application/x-ima
-imap=application/x-httpd-imap
-inf=application/inf
-ins=application/x-internett-signup
-ip=application/x-ip2
-isu=video/x-isvideo
-it=audio/it
-iv=application/x-inventor
-ivr=i-world/i-vrml
-ivy=application/x-livescreen
-jam=audio/x-jam
-jav=text/x-java-source
-java=text/x-java-source
-jcm=application/x-java-commerce
-jfif-tbnl=image/jpeg
-jfif=image/jpeg
-jnlp=application/x-java-jnlp-file
-jpe=image/jpeg
-jpeg=image/jpeg
-jpg=image/jpeg
-jps=image/x-jps
-js=application/javascript
-json=application/json
-jut=image/jutvision
-kar=audio/midi
-karbon=application/vnd.kde.karbon
-kfo=application/vnd.kde.kformula
-flw=application/vnd.kde.kivio
-kml=application/vnd.google-earth.kml+xml
-kmz=application/vnd.google-earth.kmz
-kon=application/vnd.kde.kontour
-kpr=application/vnd.kde.kpresenter
-kpt=application/vnd.kde.kpresenter
-ksp=application/vnd.kde.kspread
-kwd=application/vnd.kde.kword
-kwt=application/vnd.kde.kword
-ksh=text/x-scriptksh
-la=audio/nspaudio
-lam=audio/x-liveaudio
-latex=application/x-latex
-lha=application/lha
-lhx=application/octet-stream
-list=text/plain
-lma=audio/nspaudio
-log=text/plain
-lsp=text/x-scriptlisp
-lst=text/plain
-lsx=text/x-la-asf
-ltx=application/x-latex
-lzh=application/octet-stream
-lzx=application/lzx
-m1v=video/mpeg
-m2a=audio/mpeg
-m2v=video/mpeg
-m3u=audio/x-mpegurl
-m=text/x-m
-man=application/x-troff-man
-manifest=text/cache-manifest
-map=application/x-navimap
-mar=text/plain
-mbd=application/mbedlet
-mc$=application/x-magic-cap-package-10
-mcd=application/mcad
-mcf=text/mcf
-mcp=application/netmc
-me=application/x-troff-me
-mht=message/rfc822
-mhtml=message/rfc822
-mid=application/x-midi
-midi=application/x-midi
-mif=application/x-frame
-mime=message/rfc822
-mjf=audio/x-vndaudioexplosionmjuicemediafile
-mjpg=video/x-motion-jpeg
-mm=application/base64
-mme=application/base64
-mod=audio/mod
-moov=video/quicktime
-mov=video/quicktime
-movie=video/x-sgi-movie
-mp2=audio/mpeg
-mp3=audio/mpeg3
-mp4=video/mp4
-mpa=audio/mpeg
-mpc=application/x-project
-mpe=video/mpeg
-mpeg=video/mpeg
-mpg=video/mpeg
-mpga=audio/mpeg
-mpp=application/vndms-project
-mpt=application/x-project
-mpv=application/x-project
-mpx=application/x-project
-mrc=application/marc
-ms=application/x-troff-ms
-mv=video/x-sgi-movie
-my=audio/make
-mzz=application/x-vndaudioexplosionmzz
-nap=image/naplps
-naplps=image/naplps
-nc=application/x-netcdf
-ncm=application/vndnokiaconfiguration-message
-nif=image/x-niff
-niff=image/x-niff
-nix=application/x-mix-transfer
-nsc=application/x-conference
-nvd=application/x-navidoc
-o=application/octet-stream
-oda=application/oda
-odb=application/vnd.oasis.opendocument.database
-odc=application/vnd.oasis.opendocument.chart
-odf=application/vnd.oasis.opendocument.formula
-odg=application/vnd.oasis.opendocument.graphics
-odi=application/vnd.oasis.opendocument.image
-odm=application/vnd.oasis.opendocument.text-master
-odp=application/vnd.oasis.opendocument.presentation
-ods=application/vnd.oasis.opendocument.spreadsheet
-odt=application/vnd.oasis.opendocument.text
-oga=audio/ogg
-ogg=audio/ogg
-ogv=video/ogg
-omc=application/x-omc
-omcd=application/x-omcdatamaker
-omcr=application/x-omcregerator
-otc=application/vnd.oasis.opendocument.chart-template
-otf=application/vnd.oasis.opendocument.formula-template
-otg=application/vnd.oasis.opendocument.graphics-template
-oth=application/vnd.oasis.opendocument.text-web
-oti=application/vnd.oasis.opendocument.image-template
-otm=application/vnd.oasis.opendocument.text-master
-otp=application/vnd.oasis.opendocument.presentation-template
-ots=application/vnd.oasis.opendocument.spreadsheet-template
-ott=application/vnd.oasis.opendocument.text-template
-p10=application/pkcs10
-p12=application/pkcs-12
-p7a=application/x-pkcs7-signature
-p7c=application/pkcs7-mime
-p7m=application/pkcs7-mime
-p7r=application/x-pkcs7-certreqresp
-p7s=application/pkcs7-signature
-p=text/x-pascal
-part=application/pro_eng
-pas=text/pascal
-pbm=image/x-portable-bitmap
-pcl=application/vndhp-pcl
-pct=image/x-pict
-pcx=image/x-pcx
-pdb=chemical/x-pdb
-pdf=application/pdf
-pfunk=audio/make
-pgm=image/x-portable-graymap
-pic=image/pict
-pict=image/pict
-pkg=application/x-newton-compatible-pkg
-pko=application/vndms-pkipko
-pl=text/x-scriptperl
-plx=application/x-pixclscript
-pm4=application/x-pagemaker
-pm5=application/x-pagemaker
-pm=text/x-scriptperl-module
-png=image/png
-pnm=application/x-portable-anymap
-pot=application/mspowerpoint
-pov=model/x-pov
-ppa=application/vndms-powerpoint
-ppm=image/x-portable-pixmap
-pps=application/mspowerpoint
-ppt=application/mspowerpoint
-ppz=application/mspowerpoint
-pre=application/x-freelance
-prt=application/pro_eng
-ps=application/postscript
-psd=application/octet-stream
-pvu=paleovu/x-pv
-pwz=application/vndms-powerpoint
-py=text/x-scriptphyton
-pyc=applicaiton/x-bytecodepython
-qcp=audio/vndqcelp
-qd3=x-world/x-3dmf
-qd3d=x-world/x-3dmf
-qif=image/x-quicktime
-qt=video/quicktime
-qtc=video/x-qtc
-qti=image/x-quicktime
-qtif=image/x-quicktime
-ra=audio/x-pn-realaudio
-ram=audio/x-pn-realaudio
-rar=application/x-rar-compressed
-ras=application/x-cmu-raster
-rast=image/cmu-raster
-rexx=text/x-scriptrexx
-rf=image/vndrn-realflash
-rgb=image/x-rgb
-rm=application/vndrn-realmedia
-rmi=audio/mid
-rmm=audio/x-pn-realaudio
-rmp=audio/x-pn-realaudio
-rng=application/ringing-tones
-rnx=application/vndrn-realplayer
-roff=application/x-troff
-rp=image/vndrn-realpix
-rpm=audio/x-pn-realaudio-plugin
-rt=text/vndrn-realtext
-rtf=text/richtext
-rtx=text/richtext
-rv=video/vndrn-realvideo
-s=text/x-asm
-s3m=audio/s3m
-s7z=application/x-7z-compressed
-saveme=application/octet-stream
-sbk=application/x-tbook
-scm=text/x-scriptscheme
-sdml=text/plain
-sdp=application/sdp
-sdr=application/sounder
-sea=application/sea
-set=application/set
-sgm=text/x-sgml
-sgml=text/x-sgml
-sh=text/x-scriptsh
-shar=application/x-bsh
-shtml=text/x-server-parsed-html
-sid=audio/x-psid
-skd=application/x-koan
-skm=application/x-koan
-skp=application/x-koan
-skt=application/x-koan
-sit=application/x-stuffit
-sitx=application/x-stuffitx
-sl=application/x-seelogo
-smi=application/smil
-smil=application/smil
-snd=audio/basic
-sol=application/solids
-spc=text/x-speech
-spl=application/futuresplash
-spr=application/x-sprite
-sprite=application/x-sprite
-spx=audio/ogg
-src=application/x-wais-source
-ssi=text/x-server-parsed-html
-ssm=application/streamingmedia
-sst=application/vndms-pkicertstore
-step=application/step
-stl=application/sla
-stp=application/step
-sv4cpio=application/x-sv4cpio
-sv4crc=application/x-sv4crc
-svf=image/vnddwg
-svg=image/svg+xml
-svr=application/x-world
-swf=application/x-shockwave-flash
-t=application/x-troff
-talk=text/x-speech
-tar=application/x-tar
-tbk=application/toolbook
-tcl=text/x-scripttcl
-tcsh=text/x-scripttcsh
-tex=application/x-tex
-texi=application/x-texinfo
-texinfo=application/x-texinfo
-text=text/plain
-tgz=application/gnutar
-tif=image/tiff
-tiff=image/tiff
-tr=application/x-troff
-tsi=audio/tsp-audio
-tsp=application/dsptype
-tsv=text/tab-separated-values
-turbot=image/florian
-txt=text/plain
-uil=text/x-uil
-uni=text/uri-list
-unis=text/uri-list
-unv=application/i-deas
-uri=text/uri-list
-uris=text/uri-list
-ustar=application/x-ustar
-uu=text/x-uuencode
-uue=text/x-uuencode
-vcd=application/x-cdlink
-vcf=text/x-vcard
-vcard=text/x-vcard
-vcs=text/x-vcalendar
-vda=application/vda
-vdo=video/vdo
-vew=application/groupwise
-viv=video/vivo
-vivo=video/vivo
-vmd=application/vocaltec-media-desc
-vmf=application/vocaltec-media-file
-voc=audio/voc
-vos=video/vosaic
-vox=audio/voxware
-vqe=audio/x-twinvq-plugin
-vqf=audio/x-twinvq
-vql=audio/x-twinvq-plugin
-vrml=application/x-vrml
-vrt=x-world/x-vrt
-vsd=application/x-visio
-vst=application/x-visio
-vsw=application/x-visio
-w60=application/wordperfect60
-w61=application/wordperfect61
-w6w=application/msword
-wav=audio/wav
-wb1=application/x-qpro
-wbmp=image/vnd.wap.wbmp
-web=application/vndxara
-wiz=application/msword
-wk1=application/x-123
-wmf=windows/metafile
-wml=text/vnd.wap.wml
-wmlc=application/vnd.wap.wmlc
-wmls=text/vnd.wap.wmlscript
-wmlsc=application/vnd.wap.wmlscriptc
-word=application/msword
-wp5=application/wordperfect
-wp6=application/wordperfect
-wp=application/wordperfect
-wpd=application/wordperfect
-wq1=application/x-lotus
-wri=application/mswrite
-wrl=application/x-world
-wrz=model/vrml
-wsc=text/scriplet
-wsrc=application/x-wais-source
-wtk=application/x-wintalk
-x-png=image/png
-xbm=image/x-xbitmap
-xdr=video/x-amt-demorun
-xgz=xgl/drawing
-xif=image/vndxiff
-xl=application/excel
-xla=application/excel
-xlb=application/excel
-xlc=application/excel
-xld=application/excel
-xlk=application/excel
-xll=application/excel
-xlm=application/excel
-xls=application/excel
-xlt=application/excel
-xlv=application/excel
-xlw=application/excel
-xm=audio/xm
-xml=text/xml
-xmz=xgl/movie
-xpix=application/x-vndls-xpix
-xpm=image/x-xpixmap
-xsr=video/x-amt-showrun
-xwd=image/x-xwd
-xyz=chemical/x-pdb
-z=application/x-compress
-zip=application/zip
-zoo=application/octet-stream
-zsh=text/x-scriptzsh
-# Office 2007 mess - http://wdg.uncc.edu/Microsoft_Office_2007_MIME_Types_for_Apache_and_IIS
-docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document
-docm=application/vnd.ms-word.document.macroEnabled.12
-dotx=application/vnd.openxmlformats-officedocument.wordprocessingml.template
-dotm=application/vnd.ms-word.template.macroEnabled.12
-xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-xlsm=application/vnd.ms-excel.sheet.macroEnabled.12
-xltx=application/vnd.openxmlformats-officedocument.spreadsheetml.template
-xltm=application/vnd.ms-excel.template.macroEnabled.12
-xlsb=application/vnd.ms-excel.sheet.binary.macroEnabled.12
-xlam=application/vnd.ms-excel.addin.macroEnabled.12
-pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation
-pptm=application/vnd.ms-powerpoint.presentation.macroEnabled.12
-ppsx=application/vnd.openxmlformats-officedocument.presentationml.slideshow
-ppsm=application/vnd.ms-powerpoint.slideshow.macroEnabled.12
-potx=application/vnd.openxmlformats-officedocument.presentationml.template
-potm=application/vnd.ms-powerpoint.template.macroEnabled.12
-ppam=application/vnd.ms-powerpoint.addin.macroEnabled.12
-sldx=application/vnd.openxmlformats-officedocument.presentationml.slide
-sldm=application/vnd.ms-powerpoint.slide.macroEnabled.12
-thmx=application/vnd.ms-officetheme
-onetoc=application/onenote
-onetoc2=application/onenote
-onetmp=application/onenote
-onepkg=application/onenote
-# koffice
-
-# iWork
-key=application/x-iwork-keynote-sffkey
-kth=application/x-iwork-keynote-sffkth
-nmbtemplate=application/x-iwork-numbers-sfftemplate
-numbers=application/x-iwork-numbers-sffnumbers
-pages=application/x-iwork-pages-sffpages
-template=application/x-iwork-pages-sfftemplate
-
-# Extensions for Mozilla apps (Firefox and friends)
-xpi=application/x-xpinstall
-
-# Opera extensions
-oex=application/x-opera-extension

bin/src/github.com/revel/revel/templates/errors/403.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>Forbidden</title>
-	</head>
-	<body>
-	{{with .Error}}
-	<h1>
-		{{.Title}}
-	</h1>
-	<p>
-		{{.Description}}
-	</p>
-	{{end}}
-	</body>
-</html>

bin/src/github.com/revel/revel/templates/errors/403.json

@@ -1,4 +0,0 @@
-{
-    "title": "{{js .Error.Title}}",
-    "description": "{{js .Error.Description}}"
-}

bin/src/github.com/revel/revel/templates/errors/403.txt

@@ -1,3 +0,0 @@
-{{.Error.Title}}
-
-{{.Error.Description}}

bin/src/github.com/revel/revel/templates/errors/403.xml

@@ -1 +0,0 @@
-<forbidden>{{.Error.Description}}</forbidden>

bin/src/github.com/revel/revel/templates/errors/404-dev.html

@@ -1,63 +0,0 @@
-<style type="text/css">
-	html, body {
-		margin: 0;
-		padding: 0;
-		font-family: Helvetica, Arial, Sans;
-		background: #EEEEEE;
-	}
-	.block {
-		padding: 20px;
-		border-bottom: 1px solid #aaa;
-	}
-	#header h1 {
-		font-weight: normal;
-		font-size: 28px;
-		margin: 0;
-	}
-	#more {
-		color: #666;
-		font-size: 80%;
-		border: none;
-	}
-	#header {
-		background: #FFFFCC;
-	}
-	#header p {
-		color: #333;
-	}
-	#routes {
-		background: #f6f6f6;
-	}
-	#routes h2 {
-		font-weight: normal;
-		font-size: 18px;
-		margin: 0 0 10px 0;
-	}
-	#routes ol {
-
-	}
-	#routes li {
-		font-size: 14px;
-		font-family: monospace;
-		color: #333;
-	}
-</style>
-
-<div id="header" class="block">
-	{{with .Error}}
-	<h1>
-		{{.Title}}
-	</h1>
-	<p>
-		{{.Description}}
-	</p>
-	{{end}}
-</div>
-<div id="routes" class="block">
-	<h2>These routes have been tried, in this order :</h2>
-	<ol>
-		{{range .Router.Routes}}
-			<li>{{pad .Method 10}}{{pad .Path 50}}{{.Action}}</li>
-		{{end}}
-	</ol>
-</div>

bin/src/github.com/revel/revel/templates/errors/404.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>Not found</title>
-	</head>
-	<body>
-
-{{if .DevMode}}
-
-{{template "errors/404-dev.html" .}}
-
-{{else}}
-
-	{{with .Error}}
-	<h1>
-		{{.Title}}
-	</h1>
-	<p>
-		{{.Description}}
-	</p>
-	{{end}}
-
-{{end}}
-
-	</body>
-</html>

bin/src/github.com/revel/revel/templates/errors/404.json

@@ -1,4 +0,0 @@
-{
-    "title": "{{js .Error.Title}}",
-    "description": "{{js .Error.Description}}"
-}

bin/src/github.com/revel/revel/templates/errors/404.txt

@@ -1,3 +0,0 @@
-{{.Error.Title}}
-
-{{.Error.Description}}

bin/src/github.com/revel/revel/templates/errors/404.xml

@@ -1 +0,0 @@
-<notfound>{{.Error.Description}}</notfound>

bin/src/github.com/revel/revel/templates/errors/500-dev.html

@@ -1,118 +0,0 @@
-		<style type="text/css">
-		html, body {
-			margin: 0;
-			padding: 0;
-			font-family: Helvetica, Arial, Sans;
-			background: #EEEEEE;
-		}
-		.block {
-			padding: 20px;
-			border-bottom: 1px solid #aaa;
-		}
-		#header h1 {
-			font-weight: normal;
-			font-size: 28px;
-			margin: 0;
-		}
-		#more {
-			color: #666;
-			font-size: 80%;
-			border: none;
-		}
-		#header {
-			background: #fcd2da;
-		}
-		#header p {
-			color: #333;
-		}
-		#source {
-			background: #f6f6f6;
-		}
-		#source h2 {
-			font-weight: normal;
-			font-size: 18px;
-			margin: 0 0 10px 0;
-		}
-		#source .lineNumber {
-			float: left;
-			display: block;
-			width: 40px;
-			text-align: right;
-			margin-right: 10px;
-			font-size: 14px;
-			font-family: monospace;
-			background: #333;
-			color: #fff;
-		}
-		#source .line {
-			clear: both;
-			color: #333;
-			margin-bottom: 1px;
-		}
-		#source pre {
-			font-size: 14px;
-			margin: 0;
-			overflow-x: hidden;
-		}
-		#source .error {
-			color: #c00 !important;
-		}
-		#source .error .lineNumber {
-			background: #c00;
-		}
-		#source a {
-			text-decoration: none;
-		}
-		#source a:hover * {
-			cursor: pointer !important;
-		}
-		#source a:hover pre {
-			background: #FAFFCF !important;
-		}
-		#source em {
-			font-style: normal;
-			text-decoration: underline;
-			font-weight: bold;
-		}
-		#source strong {
-			font-style: normal;
-			font-weight: bold;
-		}
-		</style>
-		{{with .Error}}
-		<div id="header" class="block">
-			<h1>
-				{{.Title}}
-			</h1>
-			<p>
-				{{if .SourceType}}
-					The {{.SourceType}} <strong>{{.Path}}</strong> does not compile: <strong>{{.Description}}</strong>
-				{{else}}
-					{{.Description}}
-				{{end}}
-			</p>
-		</div>
-		{{if .Path}}
-		<div id="source" class="block">
-			<h2>In {{.Path}}
-				{{if .Line}}
-					(around {{if .Line}}line {{.Line}}{{end}}{{if .Column}} column {{.Column}}{{end}})
-				{{end}}
-			</h2>
-			{{range .ContextSource}}
-				<div class="line {{if .IsError}}error{{end}}">
-					<span class="lineNumber">{{.Line}}:</span>
-					<pre>{{.Source}}</pre>
-				</div>
-			{{end}}
-		</div>
-		{{end}}
-		{{if .MetaError}}
-			<div id="source" class="block">
-				<h2>Additionally, an error occurred while handling this error.</h2>
-				<div class="line error">
-					{{.MetaError}}
-				</div>
-			</div>
-		{{end}}
-		{{end}}

bin/src/github.com/revel/revel/templates/errors/500.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Application error</title>
-	</head>
-	<body>
-		{{if .DevMode}}
-		{{template "errors/500-dev.html" .}}
-		{{else}}
-		<h1>Oops, an error occured</h1>
-		<p>
-			This exception has been logged.
-		</p>
-		{{end}}
-	</body>
-</html>

bin/src/github.com/revel/revel/templates/errors/500.json

@@ -1,4 +0,0 @@
-{
-    "title": "{{js .Error.Title}}",
-    "description": "{{js .Error.Description}}"
-}

bin/src/github.com/revel/revel/templates/errors/500.txt

@@ -1,15 +0,0 @@
-{{.Error.Title}}
-{{.Error.Description}}
-
-{{if eq .RunMode "dev"}}
-{{with .Error}}
-{{if .Path}}
-----------
-In {{.Path}} {{if .Line}}(around line {{.Line}}){{end}}
-
-{{range .ContextSource}}
-{{if .IsError}}>{{else}} {{end}} {{.Line}}: {{.Source}}{{end}}
-
-{{end}}
-{{end}}
-{{end}}

bin/src/github.com/revel/revel/templates/errors/500.xml

@@ -1,4 +0,0 @@
-<error>
-	<title>{{.Error.Title}}</title>
-	<description>{{.Error.Description}}</description>
-</error>

cmd/harness/app.go

@@ -58,11 +58,11 @@ func NewAppCmd(binPath string, port int) AppCmd {
 
 // Start the app server, and wait until it is ready to serve requests.
 func (cmd AppCmd) Start() error {
-	listeningWriter := &startupListeningWriter{os.Stdout, make(chan bool)}
+	listeningWriter := startupListeningWriter{os.Stdout, make(chan bool)}
 	cmd.Stdout = listeningWriter
-	revel.RevelLog.Debug("Exec app:", "path", cmd.Path, "args", cmd.Args)
+	revel.TRACE.Println("Exec app:", cmd.Path, cmd.Args)
 	if err := cmd.Cmd.Start(); err != nil {
-		revel.RevelLog.Fatal("Error running:", "error", err)
+		revel.ERROR.Fatalln("Error running:", err)
 	}
 
 	select {
@@ -70,7 +70,6 @@ func (cmd AppCmd) Start() error {
 		return errors.New("revel/harness: app died")
 
 	case <-time.After(30 * time.Second):
-		revel.RevelLog.Debug("Killing revel server process did not respond after wait timeout", "processid", cmd.Process.Pid)
 		cmd.Kill()
 		return errors.New("revel/harness: app timed out")
 
@@ -84,19 +83,19 @@ func (cmd AppCmd) Start() error {
 
 // Run the app server inline.  Never returns.
 func (cmd AppCmd) Run() {
-	revel.RevelLog.Debug("Exec app:", "path", cmd.Path, "args", cmd.Args)
+	revel.TRACE.Println("Exec app:", cmd.Path, cmd.Args)
 	if err := cmd.Cmd.Run(); err != nil {
-		revel.RevelLog.Fatal("Error running:", "error", err)
+		revel.ERROR.Fatalln("Error running:", err)
 	}
 }
 
 // Kill terminates the app server if it's running.
 func (cmd AppCmd) Kill() {
 	if cmd.Cmd != nil && (cmd.ProcessState == nil || !cmd.ProcessState.Exited()) {
-		revel.RevelLog.Debug("Killing revel server pid", "pid", cmd.Process.Pid)
+		revel.TRACE.Println("Killing revel server pid", cmd.Process.Pid)
 		err := cmd.Process.Kill()
 		if err != nil {
-			revel.RevelLog.Fatal("Failed to kill revel server:", "error", err)
+			revel.ERROR.Fatalln("Failed to kill revel server:", err)
 		}
 	}
 }
@@ -119,7 +118,7 @@ type startupListeningWriter struct {
 	notifyReady chan bool
 }
 
-func (w *startupListeningWriter) Write(p []byte) (n int, err error) {
+func (w startupListeningWriter) Write(p []byte) (n int, err error) {
 	if w.notifyReady != nil && bytes.Contains(p, []byte("Listening")) {
 		w.notifyReady <- true
 		w.notifyReady = nil

cmd/harness/build.go

@@ -39,7 +39,7 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 
 	// Add the db.import to the import paths.
 	if dbImportPath, found := revel.Config.String("db.import"); found {
-		sourceInfo.InitImportPaths = append(sourceInfo.InitImportPaths, strings.Split(dbImportPath,",")...)
+		sourceInfo.InitImportPaths = append(sourceInfo.InitImportPaths, dbImportPath)
 	}
 
 	// Generate two source files.
@@ -49,7 +49,10 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 		"ImportPaths":    calcImportAliases(sourceInfo),
 		"TestSuites":     sourceInfo.TestSuites(),
 	}
+	// fmt.Println("revel.CodePaths", revel.CodePaths)
+	// fmt.Println("----genSource tmp")
 	genSource("tmp", "main.go", RevelMainTemplate, templateArgs)
+	// fmt.Println("-----genSource routes", templateArgs)
 	genSource("routes", "routes.go", RevelRoutesTemplate, templateArgs)
 
 	// Read build config.
@@ -59,46 +62,12 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 	// It relies on the user having "go" installed.
 	goPath, err := exec.LookPath("go")
 	if err != nil {
-		revel.RevelLog.Fatalf("Go executable not found in PATH.")
-	}
-
-	// Detect if deps tool should be used (is there a vendor folder ?)
-	useVendor := revel.DirExists(filepath.Join(revel.BasePath, "vendor"))
-	basePath := revel.BasePath
-	for !useVendor {
-		basePath = filepath.Dir(basePath)
-		found := false
-		// Check to see if we are still in the GOPATH
-		for _, path := range filepath.SplitList(build.Default.GOPATH) {
-			if strings.HasPrefix(basePath, path) {
-				found = true
-				break
-			}
-		}
-		if !found {
-			break
-		} else {
-			useVendor = revel.DirExists(filepath.Join(basePath, "vendor"))
-		}
-	}
-
-	var depPath string
-	if useVendor {
-		revel.RevelLog.Info("Vendor folder detected, scanning for deps in path")
-		depPath, err = exec.LookPath("dep")
-		if err != nil {
-			// Do not halt build unless a new package needs to be imported
-			revel.RevelLog.Warn("Build: `dep` executable not found in PATH, but vendor folder detected." +
-				"Packages can only be added automatically to the vendor folder using the `dep` tool. " +
-				"You can install the `dep` tool by doing a `go get -u github.com/golang/dep/cmd/dep`")
-		}
-	} else {
-		revel.RevelLog.Info("No vendor folder detected, not using dependency manager to import files")
+		revel.ERROR.Fatalf("Go executable not found in PATH.")
 	}
 
 	pkg, err := build.Default.Import(revel.ImportPath, "", build.FindOnly)
 	if err != nil {
-		revel.RevelLog.Fatal("Failure importing", "path", revel.ImportPath)
+		revel.ERROR.Fatalln("Failure importing", revel.ImportPath)
 	}
 
 	// Binary path is a combination of $GOBIN/revel.d directory, app's import path and its name.
@@ -121,6 +90,13 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 		versionLinkerFlags := fmt.Sprintf("-X %s/app.AppVersion=%s -X %s/app.BuildTime=%s",
 			revel.ImportPath, appVersion, revel.ImportPath, buildTime)
 
+		// TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5
+		goVersion, err := strconv.ParseFloat(runtime.Version()[2:5], 64)
+		// runtime.Version() may return commit hash, we assume it is above 1.5
+		if goVersion < 1.5 && err == nil {
+			versionLinkerFlags = fmt.Sprintf("-X %s/app.AppVersion \"%s\" -X %s/app.BuildTime \"%s\"",
+				revel.ImportPath, appVersion, revel.ImportPath, buildTime)
+		}
 		flags := []string{
 			"build",
 			"-i",
@@ -136,58 +112,42 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 		flags = append(flags, path.Join(revel.ImportPath, "app", "tmp"))
 
 		buildCmd := exec.Command(goPath, flags...)
-		revel.RevelLog.Debug("Exec:", "args", buildCmd.Args)
+		revel.TRACE.Println("Exec:", buildCmd.Args)
 		output, err := buildCmd.CombinedOutput()
 
 		// If the build succeeded, we're done.
 		if err == nil {
 			return NewApp(binName), nil
 		}
-		revel.RevelLog.Error(string(output))
+		revel.ERROR.Println(string(output))
 
 		// See if it was an import error that we can go get.
-		matches := importErrorPattern.FindAllStringSubmatch(string(output), -1)
+		matches := importErrorPattern.FindStringSubmatch(string(output))
 		if matches == nil {
 			return nil, newCompileError(output)
 		}
-		for _, match := range matches {
-			// Ensure we haven't already tried to go get it.
-			pkgName := match[1]
-			if _, alreadyTried := gotten[pkgName]; alreadyTried {
-				return nil, newCompileError(output)
-			}
-			gotten[pkgName] = struct{}{}
 
-			// Execute "go get <pkg>"
-			// Or dep `dep ensure -add <pkg>` if it is there
-			var getCmd *exec.Cmd
-			if useVendor {
-				if depPath == "" {
-					revel.RevelLog.Error("Build: Vendor folder found, but the `dep` tool was not found, " +
-						"if you use a different vendoring (package management) tool please add the following packages by hand, " +
-						"or install the `dep` tool into your gopath by doing a `go get -u github.com/golang/dep/cmd/dep`. " +
-						"For more information and usage of the tool please see http://github.com/golang/dep")
-					for _, pkg := range matches {
-						revel.RevelLog.Error("Missing package", "package", pkg[1])
-					}
-				}
-				getCmd = exec.Command(depPath, "ensure", "-add", pkgName)
-			} else {
-				getCmd = exec.Command(goPath, "get", pkgName)
-			}
-			revel.RevelLog.Debug("Exec:", "args", getCmd.Args)
-			getOutput, err := getCmd.CombinedOutput()
-			if err != nil {
-				revel.RevelLog.Error(string(getOutput))
-				return nil, newCompileError(output)
-			}
+		// Ensure we haven't already tried to go get it.
+		pkgName := matches[1]
+		if _, alreadyTried := gotten[pkgName]; alreadyTried {
+			return nil, newCompileError(output)
+		}
+		gotten[pkgName] = struct{}{}
+
+		// Execute "go get <pkg>"
+		getCmd := exec.Command(goPath, "get", pkgName)
+		revel.TRACE.Println("Exec:", getCmd.Args)
+		getOutput, err := getCmd.CombinedOutput()
+		if err != nil {
+			revel.ERROR.Println(string(getOutput))
+			return nil, newCompileError(output)
 		}
 
 		// Success getting the import, attempt to build again.
 	}
 
 	// TODO remove this unreachable code and document it
-	revel.RevelLog.Fatalf("Not reachable")
+	revel.ERROR.Fatalf("Not reachable")
 	return nil, nil
 }
 
@@ -211,11 +171,11 @@ func getAppVersion() string {
 			return ""
 		}
 		gitCmd := exec.Command(gitPath, "--git-dir="+gitDir, "describe", "--always", "--dirty")
-		revel.RevelLog.Debug("Exec:", "args", gitCmd.Args)
+		revel.TRACE.Println("Exec:", gitCmd.Args)
 		output, err := gitCmd.Output()
 
 		if err != nil {
-			revel.RevelLog.Warn("Cannot determine git repository version:", "error", err)
+			revel.WARN.Println("Cannot determine git repository version:", err)
 			return ""
 		}
 
@@ -232,12 +192,12 @@ func cleanSource(dirs ...string) {
 }
 
 func cleanDir(dir string) {
-	revel.RevelLog.Info("Cleaning dir " + dir)
+	revel.INFO.Println("Cleaning dir " + dir)
 	tmpPath := filepath.Join(revel.AppPath, dir)
 	f, err := os.Open(tmpPath)
 	if err != nil {
 		if !os.IsNotExist(err) {
-			revel.RevelLog.Error("Failed to clean dir:", "error", err)
+			revel.ERROR.Println("Failed to clean dir:", err)
 		}
 	} else {
 		defer func() {
@@ -247,20 +207,20 @@ func cleanDir(dir string) {
 		infos, err := f.Readdir(0)
 		if err != nil {
 			if !os.IsNotExist(err) {
-				revel.RevelLog.Error("Failed to clean dir:", "error", err)
+				revel.ERROR.Println("Failed to clean dir:", err)
 			}
 		} else {
 			for _, info := range infos {
-				pathName := filepath.Join(tmpPath, info.Name())
+				path := filepath.Join(tmpPath, info.Name())
 				if info.IsDir() {
-					err := os.RemoveAll(pathName)
+					err := os.RemoveAll(path)
 					if err != nil {
-						revel.RevelLog.Error("Failed to remove dir:", "error", err)
+						revel.ERROR.Println("Failed to remove dir:", err)
 					}
 				} else {
-					err := os.Remove(pathName)
+					err := os.Remove(path)
 					if err != nil {
-						revel.RevelLog.Error("Failed to remove file:", "error", err)
+						revel.ERROR.Println("Failed to remove file:", err)
 					}
 				}
 			}
@@ -280,20 +240,20 @@ func genSource(dir, filename, templateSource string, args map[string]interface{}
 	tmpPath := filepath.Join(revel.AppPath, dir)
 	err := os.Mkdir(tmpPath, 0777)
 	if err != nil && !os.IsExist(err) {
-		revel.RevelLog.Fatalf("Failed to make '%v' directory: %v", dir, err)
+		revel.ERROR.Fatalf("Failed to make '%v' directory: %v", dir, err)
 	}
 
 	// Create the file
 	file, err := os.Create(filepath.Join(tmpPath, filename))
 	if err != nil {
-		revel.RevelLog.Fatalf("Failed to create file: %v", err)
+		revel.ERROR.Fatalf("Failed to create file: %v", err)
 	}
 	defer func() {
 		_ = file.Close()
 	}()
 
 	if _, err = file.WriteString(sourceCode); err != nil {
-		revel.RevelLog.Fatalf("Failed to write to file: %v", err)
+		revel.ERROR.Fatalf("Failed to write to file: %v", err)
 	}
 }
 
@@ -330,7 +290,7 @@ func calcImportAliases(src *SourceInfo) map[string]string {
 }
 
 func addAlias(aliases map[string]string, importPath, pkgName string) {
-	alias, ok := aliases[importPath]
+    alias, ok := aliases[importPath]
 	if ok {
 		return
 	}
@@ -341,7 +301,7 @@ func addAlias(aliases map[string]string, importPath, pkgName string) {
 func makePackageAlias(aliases map[string]string, pkgName string) string {
 	i := 0
 	alias := pkgName
-	for containsValue(aliases, alias) || alias == "revel" {
+	for containsValue(aliases, alias) || alias=="revel" {
 		alias = fmt.Sprintf("%s%d", pkgName, i)
 		i++
 	}
@@ -366,7 +326,7 @@ func newCompileError(output []byte) *revel.Error {
 		errorMatch = regexp.MustCompile(`(?m)^(.*?)\:(\d+)\:\s(.*?)$`).FindSubmatch(output)
 
 		if errorMatch == nil {
-			revel.RevelLog.Error("Failed to parse build errors", "error", string(output))
+			revel.ERROR.Println("Failed to parse build errors:\n", string(output))
 			return &revel.Error{
 				SourceType:  "Go code",
 				Title:       "Go Compilation Error",
@@ -376,7 +336,7 @@ func newCompileError(output []byte) *revel.Error {
 
 		errorMatch = append(errorMatch, errorMatch[3])
 
-		revel.RevelLog.Error("Build errors", "errors", string(output))
+		revel.ERROR.Println("Build errors:\n", string(output))
 	}
 
 	// Read the source for the offending file.
@@ -403,7 +363,7 @@ func newCompileError(output []byte) *revel.Error {
 	fileStr, err := revel.ReadLines(absFilename)
 	if err != nil {
 		compileError.MetaError = absFilename + ": " + err.Error()
-		revel.RevelLog.Error(compileError.MetaError)
+		revel.ERROR.Println(compileError.MetaError)
 		return compileError
 	}
 
@@ -436,7 +396,7 @@ var (
 func main() {
 	flag.Parse()
 	revel.Init(*runMode, *importPath, *srcPath)
-	revel.AppLog.Info("Running revel server")
+	revel.INFO.Println("Running revel server")
 	{{range $i, $c := .Controllers}}
 	revel.RegisterController((*{{index $.ImportPaths .ImportPath}}.{{.StructName}})(nil),
 		[]*revel.MethodType{

cmd/harness/harness.go

@@ -29,10 +29,10 @@ import (
 	"sync/atomic"
 
 	"github.com/revel/revel"
-	"sync"
 )
 
 var (
+	watcher    *revel.Watcher
 	doNotWatch = []string{"tmp", "views", "routes"}
 
 	lastRequestHadError int32
@@ -45,16 +45,12 @@ type Harness struct {
 	serverHost string
 	port       int
 	proxy      *httputil.ReverseProxy
-	watcher    *revel.Watcher
-	mutex      *sync.Mutex
 }
 
-func renderError(iw http.ResponseWriter, ir *http.Request, err error) {
-	context := revel.NewGoContext(nil)
-	context.Request.SetRequest(ir)
-	context.Response.SetResponse(iw)
-	c := revel.NewController(context)
-	c.RenderError(err).Apply(c.Request, c.Response)
+func renderError(w http.ResponseWriter, r *http.Request, err error) {
+	req, resp := revel.NewRequest(r), revel.NewResponse(w)
+	c := revel.NewController(req, resp)
+	c.RenderError(err).Apply(req, resp)
 }
 
 // ServeHTTP handles all requests.
@@ -67,17 +63,12 @@ func (h *Harness) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// Flush any change events and rebuild app if necessary.
 	// Render an error page if the rebuild / restart failed.
-	err := h.watcher.Notify()
+	err := watcher.Notify()
 	if err != nil {
-		// In a thread safe manner update the flag so that a request for
-		// /favicon.ico does not trigger a rebuild
 		atomic.CompareAndSwapInt32(&lastRequestHadError, 0, 1)
 		renderError(w, r, err)
 		return
 	}
-
-	// In a thread safe manner update the flag so that a request for
-	// /favicon.ico is allowed
 	atomic.CompareAndSwapInt32(&lastRequestHadError, 1, 0)
 
 	// Reverse proxy the request.
@@ -97,8 +88,9 @@ func NewHarness() *Harness {
 	revel.MainTemplateLoader = revel.NewTemplateLoader(
 		[]string{filepath.Join(revel.RevelPath, "templates")})
 	if err := revel.MainTemplateLoader.Refresh(); err != nil {
-		revel.RevelLog.Error("Template loader error", "error", err)
+		revel.ERROR.Println(err)
 	}
+	// fmt.Println("-----revel.RevelPath", revel.RevelPath)
 
 	addr := revel.HTTPAddr
 	port := revel.Config.IntDefault("harness.port", 0)
@@ -118,32 +110,27 @@ func NewHarness() *Harness {
 
 	serverURL, _ := url.ParseRequestURI(fmt.Sprintf(scheme+"://%s:%d", addr, port))
 
-	serverHarness := &Harness{
+	harness := &Harness{
 		port:       port,
 		serverHost: serverURL.String()[len(scheme+"://"):],
 		proxy:      httputil.NewSingleHostReverseProxy(serverURL),
-		mutex:      &sync.Mutex{},
 	}
 
 	if revel.HTTPSsl {
-		serverHarness.proxy.Transport = &http.Transport{
+		harness.proxy.Transport = &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		}
 	}
-	return serverHarness
+	return harness
 }
 
 // Refresh method rebuilds the Revel application and run it on the given port.
 func (h *Harness) Refresh() (err *revel.Error) {
-	// Allow only one thread to rebuild the process
-	h.mutex.Lock()
-	defer h.mutex.Unlock()
-
 	if h.app != nil {
 		h.app.Kill()
 	}
 
-	revel.RevelLog.Debug("Rebuild Called")
+	revel.TRACE.Println("Rebuild")
 	h.app, err = Build()
 	if err != nil {
 		return
@@ -167,7 +154,7 @@ func (h *Harness) WatchDir(info os.FileInfo) bool {
 }
 
 // WatchFile method returns true given filename HasSuffix of ".go"
-// otheriwse false - implements revel.DiscerningListener
+// otheriwse false
 func (h *Harness) WatchFile(filename string) bool {
 	return strings.HasSuffix(filename, ".go")
 }
@@ -181,13 +168,12 @@ func (h *Harness) Run() {
 		paths = append(paths, gopaths...)
 	}
 	paths = append(paths, revel.CodePaths...)
-	h.watcher = revel.NewWatcher()
-	h.watcher.Listen(h, paths...)
-	h.watcher.Notify()
+	watcher = revel.NewWatcher()
+	watcher.Listen(h, paths...)
 
 	go func() {
 		addr := fmt.Sprintf("%s:%d", revel.HTTPAddr, revel.HTTPPort)
-		revel.RevelLog.Infof("Listening on %s", addr)
+		revel.INFO.Printf("Listening on %s", addr)
 
 		var err error
 		if revel.HTTPSsl {
@@ -200,7 +186,7 @@ func (h *Harness) Run() {
 			err = http.ListenAndServe(addr, h)
 		}
 		if err != nil {
-			revel.RevelLog.Error("Failed to start reverse proxy:", "error", err)
+			revel.ERROR.Fatalln("Failed to start reverse proxy:", err)
 		}
 	}()
 
@@ -218,13 +204,13 @@ func (h *Harness) Run() {
 func getFreePort() (port int) {
 	conn, err := net.Listen("tcp", ":0")
 	if err != nil {
-		revel.RevelLog.Fatal("Unable to fetch a freee port address", "error", err)
+		revel.ERROR.Fatal(err)
 	}
 
 	port = conn.Addr().(*net.TCPAddr).Port
 	err = conn.Close()
 	if err != nil {
-		revel.RevelLog.Fatal("Unable to close port", "error", err)
+		revel.ERROR.Fatal(err)
 	}
 	return port
 }
@@ -246,7 +232,7 @@ func proxyWebsocket(w http.ResponseWriter, r *http.Request, host string) {
 	}
 	if err != nil {
 		http.Error(w, "Error contacting backend server.", 500)
-		revel.RevelLog.Error("Error dialing websocket backend ", "host", host, "error", err)
+		revel.ERROR.Printf("Error dialing websocket backend %s: %v", host, err)
 		return
 	}
 	hj, ok := w.(http.Hijacker)
@@ -256,21 +242,21 @@ func proxyWebsocket(w http.ResponseWriter, r *http.Request, host string) {
 	}
 	nc, _, err := hj.Hijack()
 	if err != nil {
-		revel.RevelLog.Error("Hijack error", "error", err)
+		revel.ERROR.Printf("Hijack error: %v", err)
 		return
 	}
 	defer func() {
 		if err = nc.Close(); err != nil {
-			revel.RevelLog.Error("Connection close error", "error", err)
+			revel.ERROR.Println(err)
 		}
 		if err = d.Close(); err != nil {
-			revel.RevelLog.Error("Dial close error", "error", err)
+			revel.ERROR.Println(err)
 		}
 	}()
 
 	err = r.Write(d)
 	if err != nil {
-		revel.RevelLog.Error("Error copying request to target", "error", err)
+		revel.ERROR.Printf("Error copying request to target: %v", err)
 		return
 	}
 

cmd/harness/reflect.go

@@ -13,14 +13,18 @@ import (
 	"go/parser"
 	"go/scanner"
 	"go/token"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/revel/revel"
-	"unicode"
+	// "fmt"
 )
 
+// life
+var MRevelImportPath = "github.com/revel/revel"
+
 // SourceInfo is the top-level struct containing all extracted information
 // about the app source code, used to generate main.go.
 type SourceInfo struct {
@@ -95,17 +99,19 @@ func ProcessSource(roots []string) (*SourceInfo, *revel.Error) {
 		compileError *revel.Error
 	)
 
+	// fmt.Println("****roots", roots)
+
 	for _, root := range roots {
 		rootImportPath := importPathFromPath(root)
 		if rootImportPath == "" {
-			revel.RevelLog.Warn("Skipping empty code path", "path", root)
+			revel.WARN.Println("Skipping code path", root)
 			continue
 		}
 
 		// Start walking the directory tree.
 		_ = revel.Walk(root, func(path string, info os.FileInfo, err error) error {
 			if err != nil {
-				revel.RevelLog.Error("Error scanning app source:", "error", err)
+				log.Println("Error scanning app source:", err)
 				return nil
 			}
 
@@ -149,7 +155,7 @@ func ProcessSource(roots []string) (*SourceInfo, *revel.Error) {
 
 				// This is exception, err alredy checked above. Here just a print
 				ast.Print(nil, err)
-				revel.RevelLog.Fatal("Failed to parse dir", "error", err)
+				log.Fatalf("Failed to parse dir: %s", err)
 			}
 
 			// Skip "main" packages.
@@ -160,21 +166,9 @@ func ProcessSource(roots []string) (*SourceInfo, *revel.Error) {
 				return nil
 			}
 
-			// Ignore packages that end with _test
-			for i := range pkgs {
-				if len(i) > 6 {
-					if string(i[len(i)-5:]) == "_test" {
-						delete(pkgs, i)
-					}
-				}
-			}
-
 			// There should be only one package in this directory.
 			if len(pkgs) > 1 {
-				for i := range pkgs {
-					println("Found package ", i)
-				}
-				revel.RevelLog.Error("Most unexpected! Multiple packages in a single directory:", "packages", pkgs)
+				log.Println("Most unexpected! Multiple packages in a single directory:", pkgs)
 			}
 
 			var pkg *ast.Package
@@ -199,7 +193,7 @@ func appendSourceInfo(srcInfo1, srcInfo2 *SourceInfo) *SourceInfo {
 	srcInfo1.InitImportPaths = append(srcInfo1.InitImportPaths, srcInfo2.InitImportPaths...)
 	for k, v := range srcInfo2.ValidationKeys {
 		if _, ok := srcInfo1.ValidationKeys[k]; ok {
-			revel.RevelLog.Warn("Key conflict when scanning validation calls:", "key", k)
+			log.Println("Key conflict when scanning validation calls:", k)
 			continue
 		}
 		srcInfo1.ValidationKeys[k] = v
@@ -317,7 +311,7 @@ func addImports(imports map[string]string, decl ast.Decl, srcDir string) {
 				// We expect this to happen for apps using reverse routing (since we
 				// have not yet generated the routes).  Don't log that.
 				if !strings.HasSuffix(fullPath, "/app/routes") {
-					revel.RevelLog.Debug("Could not find import:", "path", fullPath)
+					revel.TRACE.Println("Could not find import:", fullPath)
 				}
 				continue
 			}
@@ -336,7 +330,6 @@ func appendStruct(specs []*TypeInfo, pkgImportPath string, pkg *ast.Package, dec
 	if !found {
 		return specs
 	}
-
 	structType := spec.Type.(*ast.StructType)
 
 	// At this point we know it's a type declaration for a struct.
@@ -396,7 +389,7 @@ func appendStruct(specs []*TypeInfo, pkgImportPath string, pkg *ast.Package, dec
 		} else {
 			var ok bool
 			if importPath, ok = imports[pkgName]; !ok {
-				revel.RevelLog.Error("Failed to find import path for ", "package", pkgName, "type", typeName)
+				log.Print("Failed to find import path for ", pkgName, ".", typeName)
 				continue
 			}
 		}
@@ -441,7 +434,7 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
 	if selExpr.Sel.Name != "Result" {
 		return
 	}
-	if pkgIdent, ok := selExpr.X.(*ast.Ident); !ok || imports[pkgIdent.Name] != revel.RevelImportPath {
+	if pkgIdent, ok := selExpr.X.(*ast.Ident); !ok || imports[pkgIdent.Name] != MRevelImportPath {
 		return
 	}
 
@@ -455,16 +448,13 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
 			var importPath string
 			typeExpr := NewTypeExpr(pkgName, field.Type)
 			if !typeExpr.Valid {
-				revel.RevelLog.Warnf("Didn't understand argument '%s' of action %s. Ignoring.", name, getFuncName(funcDecl))
+				log.Printf("Didn't understand argument '%s' of action %s. Ignoring.\n", name, getFuncName(funcDecl))
 				return // We didn't understand one of the args.  Ignore this action.
 			}
-			// Local object
-			if typeExpr.PkgName == pkgName {
-				importPath = pkgImportPath
-			} else if typeExpr.PkgName != "" {
+			if typeExpr.PkgName != "" {
 				var ok bool
 				if importPath, ok = imports[typeExpr.PkgName]; !ok {
-					revel.RevelLog.Errorf("Failed to find import for arg of type: %s , %s", typeExpr.PkgName, typeExpr.TypeName(""))
+					log.Println("Failed to find import for arg of type:", typeExpr.TypeName(""))
 				}
 			}
 			method.Args = append(method.Args, &MethodArg{
@@ -498,7 +488,7 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
 		}
 
 		// Add this call's args to the renderArgs.
-		pos := fset.Position(callExpr.Lparen)
+		pos := fset.Position(callExpr.Rparen)
 		methodCall := &methodCall{
 			Line:  pos.Line,
 			Names: []string{},
@@ -622,7 +612,7 @@ func getValidationParameter(funcDecl *ast.FuncDecl, imports map[string]string) *
 			continue
 		}
 
-		if selExpr.Sel.Name == "Validation" && imports[xIdent.Name] == revel.RevelImportPath {
+		if selExpr.Sel.Name == "Validation" && imports[xIdent.Name] == MRevelImportPath {
 			return field.Names[0].Obj
 		}
 	}
@@ -650,7 +640,7 @@ func getStructTypeDecl(decl ast.Decl, fset *token.FileSet) (spec *ast.TypeSpec,
 	}
 
 	if len(genDecl.Specs) == 0 {
-		revel.RevelLog.Warnf("Surprising: %s:%d Decl contains no specifications", fset.Position(decl.Pos()).Filename, fset.Position(decl.Pos()).Line)
+		revel.WARN.Printf("Surprising: %s:%d Decl contains no specifications", fset.Position(decl.Pos()).Filename, fset.Position(decl.Pos()).Line)
 		return
 	}
 
@@ -663,7 +653,7 @@ func getStructTypeDecl(decl ast.Decl, fset *token.FileSet) (spec *ast.TypeSpec,
 // TypesThatEmbed returns all types that (directly or indirectly) embed the
 // target type, which must be a fully qualified type name,
 // e.g. "github.com/revel/revel.Controller"
-func (s *SourceInfo) TypesThatEmbed(targetType, packageFilter string) (filtered []*TypeInfo) {
+func (s *SourceInfo) TypesThatEmbed(targetType string) (filtered []*TypeInfo) {
 	// Do a search in the "embedded type graph", starting with the target type.
 	var (
 		nodeQueue = []string{targetType}
@@ -695,45 +685,16 @@ func (s *SourceInfo) TypesThatEmbed(targetType, packageFilter string) (filtered
 			}
 		}
 	}
-	// Strip out any specifications that contain a lower case
-	for exit := false; !exit; exit = true {
-		for i, filteredItem := range filtered {
-			if unicode.IsLower([]rune(filteredItem.StructName)[0]) {
-				revel.RevelLog.Debug("Skipping adding spec for unexported type",
-					"type", filteredItem.StructName,
-					"package", filteredItem.ImportPath)
-				filtered = append(filtered[:i], filtered[i+1:]...)
-				exit = false
-				break
-			}
-		}
-	}
-
-	// Check for any missed types that where from expected packages
-	for _, spec := range s.StructSpecs {
-		if spec.PackageName == packageFilter {
-			found := false
-			for _, filteredItem := range filtered {
-				if filteredItem.StructName == spec.StructName {
-					found = true
-					break
-				}
-			}
-			if !found {
-				revel.RevelLog.Warn("Type found in package: "+packageFilter+
-					", but did not embed from: "+filepath.Base(targetType),
-					"name", spec.StructName, "path", spec.ImportPath)
-			}
-		}
-	}
 	return
 }
 
 // ControllerSpecs returns the all the contollers that embeds
 // `revel.Controller`
 func (s *SourceInfo) ControllerSpecs() []*TypeInfo {
+	// fmt.Println("_____RevelImportPath", MRevelImportPath)
 	if s.controllerSpecs == nil {
-		s.controllerSpecs = s.TypesThatEmbed(revel.RevelImportPath+".Controller", "controllers")
+		// fmt.Println("_____RevelImportPath", MRevelImportPath)
+		s.controllerSpecs = s.TypesThatEmbed(MRevelImportPath + ".Controller")
 	}
 	return s.controllerSpecs
 }
@@ -742,7 +703,7 @@ func (s *SourceInfo) ControllerSpecs() []*TypeInfo {
 // `testing.TestSuite`
 func (s *SourceInfo) TestSuites() []*TypeInfo {
 	if s.testSuites == nil {
-		s.testSuites = s.TypesThatEmbed(revel.RevelImportPath+"/testing.TestSuite", "testsuite")
+		s.testSuites = s.TypesThatEmbed(MRevelImportPath + "/testing.TestSuite")
 	}
 	return s.testSuites
 }
@@ -786,7 +747,7 @@ func NewTypeExpr(pkgName string, expr ast.Expr) TypeExpr {
 		e := NewTypeExpr(pkgName, t.Elt)
 		return TypeExpr{"[]" + e.Expr, e.PkgName, e.pkgIndex + 2, e.Valid}
 	default:
-		revel.RevelLog.Error("Failed to generate name for field. Make sure the field name is valid.")
+		log.Println("Failed to generate name for field. Make sure the field name is valid.")
 	}
 	return TypeExpr{Valid: false}
 }
@@ -834,10 +795,10 @@ func importPathFromPath(root string) string {
 
 	srcPath := filepath.Join(build.Default.GOROOT, "src", "pkg")
 	if strings.HasPrefix(root, srcPath) {
-		revel.RevelLog.Warn("Code path should be in GOPATH, but is in GOROOT:", "path", root)
+		revel.WARN.Println("Code path should be in GOPATH, but is in GOROOT:", root)
 		return filepath.ToSlash(root[len(srcPath)+1:])
 	}
 
-	revel.RevelLog.Error("Unexpected! Code path is not in GOPATH:", "path", root)
+	revel.ERROR.Println("Unexpected! Code path is not in GOPATH:", root)
 	return ""
 }

cmd/harness/reflect_test.go

@@ -8,6 +8,8 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"io/ioutil"
+	"log"
 	"reflect"
 	"strings"
 	"testing"
@@ -181,7 +183,7 @@ NEXT_TEST:
 
 func BenchmarkProcessBookingSource(b *testing.B) {
 	revel.Init("", "github.com/revel/examples/booking", "")
-	revel.GetRootLogHandler().Disable()
+	revel.TRACE = log.New(ioutil.Discard, "", 0)
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {

cmd/leanote_revel/build.go

@@ -60,11 +60,11 @@ func buildApp(args []string) {
 	}
 
 	if err := os.RemoveAll(destPath); err != nil && !os.IsNotExist(err) {
-		revel.RevelLog.Fatal("Remove all error","error", err)
+		revel.ERROR.Fatalln(err)
 	}
 
 	if err := os.MkdirAll(destPath, 0777); err != nil {
-		revel.RevelLog.Fatal("makedir error","error",err)
+		revel.ERROR.Fatalln(err)
 	}
 
 	app, reverr := harness.Build()
@@ -101,7 +101,7 @@ func buildApp(args []string) {
 			}
 			modulePath, err := revel.ResolveImportPath(moduleImportPath)
 			if err != nil {
-				revel.RevelLog.Fatalf("Failed to load module %s: %s", key[len("module."):], err)
+				revel.ERROR.Fatalln("Failed to load module %s: %s", key[len("module."):], err)
 			}
 			modulePaths[moduleImportPath] = modulePath
 		}

cmd/leanote_revel/new.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"fmt"
 	"go/build"
+	"log"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -66,6 +67,8 @@ func newApp(args []string) {
 		errorf("Too many arguments provided.\nRun 'revel help new' for usage.\n")
 	}
 
+	revel.ERROR.SetFlags(log.LstdFlags)
+
 	// checking and setting go paths
 	initGoPaths()
 
@@ -126,7 +129,7 @@ func initGoPaths() {
 	}
 
 	if len(srcRoot) == 0 {
-		revel.RevelLog.Fatal("Abort: could not create a Revel application outside of GOPATH.")
+		revel.ERROR.Fatalln("Abort: could not create a Revel application outside of GOPATH.")
 	}
 
 	// set go src path
@@ -145,10 +148,8 @@ func setApplicationPath(args []string) {
 			importPath)
 	}
 
-	appPath = filepath.Join(srcRoot, filepath.FromSlash(importPath))
-
 	_, err = build.Import(importPath, "", build.FindOnly)
-	if err == nil && !empty(appPath) {
+	if err == nil {
 		errorf("Abort: Import path %s already exists.\n", importPath)
 	}
 
@@ -157,6 +158,7 @@ func setApplicationPath(args []string) {
 		errorf("Abort: Could not find Revel source code: %s\n", err)
 	}
 
+	appPath = filepath.Join(srcRoot, filepath.FromSlash(importPath))
 	appName = filepath.Base(appPath)
 	basePath = filepath.ToSlash(filepath.Dir(importPath))
 

cmd/leanote_revel/package.go

@@ -53,7 +53,7 @@ func packageApp(args []string) {
 	// Remove the archive if it already exists.
 	destFile := filepath.Base(revel.BasePath) + ".tar.gz"
 	if err := os.Remove(destFile); err != nil && !os.IsNotExist(err) {
-		revel.RevelLog.Fatal("Unable to remove target file","error",err,"file",destFile)
+		revel.ERROR.Fatal(err)
 	}
 
 	// Collect stuff in a temp directory.

cmd/leanote_revel/run.go

@@ -10,6 +10,9 @@ import (
 
 	"github.com/leanote/leanote/cmd/harness"
 	"github.com/revel/revel"
+	// "fmt"
+
+	"path/filepath"
 )
 
 var cmdRun = &Command{
@@ -51,7 +54,7 @@ func parseRunArgs(args []string) *RunArgs {
 	}
 	switch len(args) {
 	case 3:
-		// Possible combinations
+		// Possibile combinations
 		// revel run [import-path] [run-mode] [port]
 		port, err := strconv.Atoi(args[2])
 		if err != nil {
@@ -61,7 +64,7 @@ func parseRunArgs(args []string) *RunArgs {
 		inputArgs.Mode = args[1]
 		inputArgs.Port = port
 	case 2:
-		// Possible combinations
+		// Possibile combinations
 		// 1. revel run [import-path] [run-mode]
 		// 2. revel run [import-path] [port]
 		// 3. revel run [run-mode] [port]
@@ -85,16 +88,11 @@ func parseRunArgs(args []string) *RunArgs {
 			inputArgs.Port = port
 		}
 	case 1:
-		// Possible combinations
+		// Possibile combinations
 		// 1. revel run [import-path]
 		// 2. revel run [port]
 		// 3. revel run [run-mode]
-		_, err := build.Import(args[0], "", build.FindOnly)
-		if err != nil {
-			revel.RevelLog.Warn("Unable to run using an import path, assuming import path is working directory %s %s", "Argument", args[0], "error", err.Error())
-		}
-		println("Trying to build with", args[0], err)
-		if err == nil {
+		if _, err := build.Import(args[0], "", build.FindOnly); err == nil {
 			// 1st arg is the import path
 			inputArgs.ImportPath = args[0]
 		} else if port, err := strconv.Atoi(args[0]); err == nil {
@@ -109,11 +107,43 @@ func parseRunArgs(args []string) *RunArgs {
 	return &inputArgs
 }
 
+
+// findSrcPaths uses the "go/build" package to find the source root for Revel
+// and the app.
+func findSrcPaths(importPath string) (appSourcePath string) {
+	var (
+		gopaths = filepath.SplitList(build.Default.GOPATH)
+		goroot  = build.Default.GOROOT
+	)
+
+	if len(gopaths) == 0 {
+		revel.ERROR.Fatalln("GOPATH environment variable is not set. ",
+			"Please refer to http://golang.org/doc/code.html to configure your Go environment.")
+	}
+
+	if revel.ContainsString(gopaths, goroot) {
+		revel.ERROR.Fatalf("GOPATH (%s) must not include your GOROOT (%s). "+
+			"Please refer to http://golang.org/doc/code.html to configure your Go environment.",
+			gopaths, goroot)
+	}
+
+	appPkg, err := build.Import(importPath, "", build.FindOnly)
+	if err != nil {
+		revel.ERROR.Fatalln("Failed to import", importPath, "with error:", err)
+	}
+
+	return appPkg.SrcRoot
+}
+
 func runApp(args []string) {
 	runArgs := parseRunArgs(args)
 
 	// Find and parse app.conf
-	revel.Init(runArgs.Mode, runArgs.ImportPath, "")
+	// fmt.Println(runArgs.ImportPath + "/vendor")
+	// revel.Init(runArgs.Mode, runArgs.ImportPath, runArgs.ImportPath + "/vendor")
+	srcPath := findSrcPaths(runArgs.ImportPath)
+	srcPath = ""
+	revel.Init(runArgs.Mode, runArgs.ImportPath, srcPath)
 	revel.LoadMimeConfig()
 
 	// fallback to default port
@@ -121,18 +151,18 @@ func runApp(args []string) {
 		runArgs.Port = revel.HTTPPort
 	}
 
-	revel.RevelLog.Infof("Running %s (%s) in %s mode\n", revel.AppName, revel.ImportPath, runArgs.Mode)
-	revel.RevelLog.Debug("Base path:", "path", revel.BasePath)
+	revel.INFO.Printf("Running %s (%s) in %s mode\n", revel.AppName, revel.ImportPath, runArgs.Mode)
+	revel.TRACE.Println("Base path:", revel.BasePath)
 
 	// If the app is run in "watched" mode, use the harness to run it.
 	if revel.Config.BoolDefault("watch", true) && revel.Config.BoolDefault("watch.code", true) {
-		revel.RevelLog.Debug("Running in watched mode.")
+		revel.TRACE.Println("Running in watched mode.")
 		revel.HTTPPort = runArgs.Port
 		harness.NewHarness().Run() // Never returns.
 	}
 
 	// Else, just build and run the app.
-	revel.RevelLog.Debug("Running in live build mode.")
+	revel.TRACE.Println("Running in live build mode.")
 	app, err := harness.Build()
 	if err != nil {
 		errorf("Failed to build app: %s", err)

cmd/leanote_revel/skeleton/app/init.go

@@ -29,7 +29,8 @@ func init() {
 		revel.ActionInvoker,           // Invoke the action.
 	}
 
-	// Register startup functions with OnAppStart
+
+	// register startup functions with OnAppStart
 	// revel.DevMode and revel.RunMode only work inside of OnAppStart. See Example Startup Script
 	// ( order dependent )
 	// revel.OnAppStart(ExampleStartupScript)
@@ -38,8 +39,9 @@ func init() {
 }
 
 // HeaderFilter adds common security headers
-// There is a full implementation of a CSRF filter in
-// https://github.com/revel/modules/tree/master/csrf
+// TODO turn this into revel.HeaderFilter
+// should probably also have a filter for CSRF
+// not sure if it can go in the same filter or not
 var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) {
 	c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN")
 	c.Response.Out.Header().Add("X-XSS-Protection", "1; mode=block")

cmd/leanote_revel/skeleton/conf/app.conf.template

@@ -84,6 +84,15 @@ format.datetime = 2006-01-02 15:04
 results.chunked = false
 
 
+# Prefixes for each log message line.
+# User can override these prefix values within any section
+# For e.g: [dev], [prod], etc
+log.trace.prefix = "TRACE "
+log.info.prefix  = "INFO  "
+log.warn.prefix  = "WARN  "
+log.error.prefix = "ERROR "
+
+
 # The default language of this application.
 i18n.default_language = en
 
@@ -95,7 +104,7 @@ i18n.default_language = en
 # Module to serve static content such as CSS, JavaScript and Media files
 # Allows Routes like this:
 #  `Static.ServeModule("modulename","public")`
-module.static = github.com/revel/modules/static
+module.static=github.com/revel/modules/static
 
 
 
@@ -170,14 +179,37 @@ module.testrunner = github.com/revel/modules/testrunner
 #   Log to Os's standard error output. Default value.
 # "relative/path/to/log"
 #   Log to file.
-log.all.filter.module.app = stdout    # Log all loggers for the application to the stdout
-log.error.nfilter.module.app = stderr # Everything else that logs an error to stderr
-log.crit.output = stderr              # Everything that logs something as critical goes to this
+log.trace.output = off
+log.info.output  = stderr
+log.warn.output  = stderr
+log.error.output = stderr
+
+
+# Revel log flags. Possible flags defined by the Go `log` package. Go log is
+# "Bits OR'ed together to control what's printed
+# See:
+#   https://golang.org/pkg/log/#pkg-constants
+# Values:
+# "0"
+#   Just log the message, turn off the flags.
+# "3"
+#   log.LstdFlags (log.Ldate|log.Ltime)
+# "19"
+#   log.Ldate|log.Ltime|log.Lshortfile
+# "23"
+#   log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile
+log.trace.flags = 19
+log.info.flags  = 19
+log.warn.flags  = 19
+log.error.flags = 19
+
 
 # Revel request access log
 # Access log line format:
-# INFO  21:53:55 static server-engine.go:169: Request Stats                             ip=127.0.0.1 path=/public/vendors/datatables.net-buttons/js/buttons.html5.min.js method=GET start=2017/08/31 21:53:55 status=200 duration_seconds=0.0002583 section=requestlog
-log.request.output = stdout
+# RequestStartTime ClientIP ResponseStatus RequestLatency HTTPMethod URLPath
+# Sample format:
+# 2016/05/25 17:46:37.112 127.0.0.1 200  270.157µs GET /
+log.request.output = stderr
 
 
 
@@ -197,11 +229,30 @@ watch = false
 
 module.testrunner =
 
-log.warn.output  = log/%(app.name)-warn.json    # Log all warn messages to file
-log.error.output = log/%(app.name)-error.json   # Log all errors to file
-log.crit.output = log/%(app.name)-critical.json # Log all critical to file
+log.trace.output = off
+log.info.output  = off
+log.warn.output  = log/%(app.name)s.log
+log.error.output = log/%(app.name)s.log
 
-# Revel request access log (json format)
+# Revel log flags. Possible flags defined by the Go `log` package,
+# please refer https://golang.org/pkg/log/#pkg-constants
+# Go log is "Bits or'ed together to control what's printed"
+# Examples:
+#   0  => just log the message, turn off the flags
+#   3  => log.LstdFlags (log.Ldate|log.Ltime)
+#   19 => log.Ldate|log.Ltime|log.Lshortfile
+#   23 => log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile
+log.trace.flags = 3
+log.info.flags  = 3
+log.warn.flags  = 3
+log.error.flags = 3
+
+
+# Revel request access log
+# Access log line format:
+# RequestStartTime ClientIP ResponseStatus RequestLatency HTTPMethod URLPath
+# Sample format:
+# 2016/05/25 17:46:37.112 127.0.0.1 200  270.157µs GET /
 # Example:
-#   log.request.output = %(app.name)s-request.json
-log.request.output = log/%(app.name)s-requests.json
+#   log.request.output = %(app.name)s-request.log
+log.request.output = off

cmd/leanote_revel/skeleton/conf/routes

@@ -15,12 +15,5 @@ GET     /favicon.ico                            404
 # Map static resources from the /app/public folder to the /public path
 GET     /public/*filepath                       Static.Serve("public")
 
-# Catch all, this will route any request into the controller path
-#
-#                    **** WARNING ****
-# Enabling this exposes any controller and function to the web.
-# ** This is a serious security issue if used online **
-#
-# For rapid development uncomment the following to add new controller.action endpoints
-# without having to add them to the routes table.
-# *       /:controller/:action                    :controller.:action
+# Catch all
+*       /:controller/:action                    :controller.:action

conf/app.conf

@@ -2,7 +2,6 @@
 # leanote config
 #------------------------
 
-http.addr=0.0.0.0 # listen on all ip addresses
 http.port=9000
 
 site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
@@ -29,6 +28,7 @@ app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y #
 # for dev
 #--------------------------------
 app.name=leanote
+http.addr=
 http.ssl=false
 cookie.httponly=false
 cookie.prefix=LEANOTE
@@ -47,7 +47,8 @@ log.error.prefix = "ERROR "
 # The default language of this application.
 i18n.default_language=en-us
 
-module.static=github.com/revel/modules/static
+# module.static=github.com/revel/modules/static
+module.static=github.com/leanote/leanote/vendor/github.com/revel/modules/static
 
 [dev]
 mode.dev=true

conf/app.conf-default

@@ -1,7 +1,7 @@
 #------------------------
 # leanote config
 #------------------------
-http.addr=0.0.0.0 # listen on all ip addresses
+
 http.port=9000
 
 site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
@@ -29,6 +29,7 @@ app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y
 # for dev
 #--------------------------------
 app.name=leanote
+http.addr=
 http.ssl=false
 cookie.httponly=false
 cookie.prefix=LEANOTE
@@ -47,6 +48,7 @@ log.error.prefix = "ERROR "
 i18n.default_language=en-us
 
 module.static=github.com/revel/modules/static
+module.static=github.com/leanote/leanote/vendor/github.com/revel/modules/static
 
 [dev]
 mode.dev=true

conf/routes

@@ -129,14 +129,6 @@ GET     /upload/*filepath                       Static.Serve("public/upload")
 *       /member               	MemberIndex.Index
 *       /member/index           MemberIndex.Index
 
-# 不知道为什么, group就是不行 member/blog可以
-*       /member/group/index           MemberGroup.Index
-*       /member/group/addGroup           MemberGroup.AddGroup
-*       /member/group/updateGroupTitle           MemberGroup.UpdateGroupTitle
-*       /member/group/deleteGroup           MemberGroup.DeleteGroup
-*       /member/group/addUser           MemberGroup.AddUser
-*       /member/group/deleteUser           MemberGroup.DeleteUser
-
 # common
 *       /:controller/:action                    :controller.:action
 *       /api/:controller/:action                :controller.:action

public/blog/js/common.js

@@ -248,7 +248,7 @@ function genNav() {
 		var text = $(hs[i]).text(); 
 		var tagName = hs[i].tagName.toLowerCase();
 		// scrollTo在page.js中定义
-		titles += '<li class="nav-' + tagName + '"><a data-a="' + tagName + '-' + encodeURI(text)+'" onclick="window.scrollTo(this, \'' + tagName + '\', \'' + text + '\')">' + text + '</a></li>';
+		titles += '<li class="nav-' + tagName + '"><a data-a="' + tagName + '-' + encodeURI(text)+'" onclick="scrollTo(this, \'' + tagName + '\', \'' + text + '\')">' + text + '</a></li>';
 	}
 	titles += "</ul>";
 	$("#blogNavContent").html(titles);