revel#1061 - revel/config referred across

jeevatkm · jeevatkm · commit ddae92c29f4d · 2016-05-28T18:36:37.000-07:00
diff --git a/cache/redis_test.go b/cache/redis_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/revel/config"
 	"github.com/revel/revel"
-	"github.com/revel/revel/config"
 )
 
 // These tests require redis server running on localhost:6379 (the default)
diff --git a/config/config.go b/config/config.go
diff --git a/i18n.go b/i18n.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/robfig/config"
+	"github.com/revel/config"
 )
 
 const (
diff --git a/i18n_test.go b/i18n_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/revel/revel/config"
+	"github.com/revel/config"
 )
 
 const (
diff --git a/revel.go b/revel.go
@@ -11,10 +11,8 @@ import (
 	"runtime"
 	"strings"
 
-	revConfig "github.com/revel/revel/config"
-
 	"github.com/agtorre/gocolorize"
-	"github.com/robfig/config"
+	"github.com/revel/config"
 )
 
 const (
@@ -40,7 +38,7 @@ var (
 	ImportPath string // e.g. "corp/sample"
 	SourcePath string // e.g. "/Users/robfig/gocode/src"
 
-	Config  *revConfig.Context
+	Config  *config.Context
 	RunMode string // Application-defined (by default, "dev" or "prod")
 	DevMode bool   // if true, RunMode is a development mode.
 
@@ -160,7 +158,7 @@ func Init(mode, importPath, srcPath string) {
 
 	// Load app.conf
 	var err error
-	Config, err = revConfig.LoadContext("app.conf", ConfPaths)
+	Config, err = config.LoadContext("app.conf", ConfPaths)
 	if err != nil || Config == nil {
 		log.Fatalln("Failed to load app.conf:", err)
 	}
diff --git a/util.go b/util.go
@@ -14,7 +14,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/revel/revel/config"
+	"github.com/revel/config"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`	`"time"`
`7`	`7`
	`8`	`+ "github.com/revel/config"`
`8`	`9`	`"github.com/revel/revel"`
`9`		`- "github.com/revel/revel/config"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// These tests require redis server running on localhost:6379 (the default)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"regexp"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/robfig/config"`
	`10`	`+ "github.com/revel/config"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"regexp"`
`15`	`15`	`"strings"`
`16`	`16`
`17`		`- "github.com/revel/revel/config"`
	`17`	`+ "github.com/revel/config"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`const (`