Merge pull request #1986 from methane/fix/revels

fix revel-jet and revel-qbs

frameworks/Go/revel-jet/setup.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
-
 fw_depends go
 
-go get -u github.com/robfig/revel/revel github.com/eaigner/jet
-go build -o bin/revel github.com/robfig/revel/revel
+sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
+
+go get -u github.com/revel/cmd/revel github.com/eaigner/jet
 bin/revel run benchmark prod &

frameworks/Go/revel-jet/src/benchmark/app/controllers/app.go

@@ -1,11 +1,12 @@
 package controllers
 
 import (
-	"benchmark/app/db"
-	"github.com/robfig/revel"
 	"math/rand"
 	"runtime"
 	"sort"
+
+	"benchmark/app/db"
+	"github.com/revel/revel"
 )
 
 type MessageStruct struct {

frameworks/Go/revel-jet/src/benchmark/app/db/jet.go

@@ -2,8 +2,7 @@ package db
 
 import (
 	"github.com/eaigner/jet"
-	"github.com/robfig/revel"
-	// "os"
+	"github.com/revel/revel"
 )
 
 var (

frameworks/Go/revel-qbs/setup.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
-
 fw_depends go
 
-go get -u github.com/robfig/revel/revel github.com/coocood/qbs
-go build -o bin/revel github.com/robfig/revel/revel
+sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
+
+go get -u github.com/revel/cmd/revel github.com/coocood/qbs
 bin/revel run benchmark prod &

frameworks/Go/revel-qbs/src/benchmark/app/controllers/app.go

@@ -1,12 +1,14 @@
 package controllers
 
 import (
-	"benchmark/app/db"
-	"github.com/coocood/qbs"
-	"github.com/robfig/revel"
 	"math/rand"
 	"runtime"
 	"sort"
+
+	"benchmark/app/db"
+
+	"github.com/coocood/qbs"
+	"github.com/revel/revel"
 )
 
 type MessageStruct struct {

frameworks/Go/revel-qbs/src/benchmark/app/db/qbs.go

@@ -2,7 +2,7 @@ package db
 
 import (
 	"github.com/coocood/qbs"
-	"github.com/robfig/revel"
+	"github.com/revel/revel"
 )
 
 var (