rename infrastructure to core

pkg/server/web/admin.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // BeeAdminApp is the default adminApp used by admin module.

pkg/server/web/admin_controller.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/astaxie/beego/pkg/infrastructure/governor"
+	"github.com/astaxie/beego/pkg/core/governor"
 )
 
 type adminController struct {

pkg/server/web/admin_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/governor"
+	"github.com/astaxie/beego/pkg/core/governor"
 )
 
 type SampleDatabaseCheck struct {

pkg/server/web/captcha/captcha.go

@@ -67,9 +67,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 	"github.com/astaxie/beego/pkg/server/web"
 	"github.com/astaxie/beego/pkg/server/web/context"
 )

pkg/server/web/captcha/image_test.go

@@ -17,7 +17,7 @@ package captcha
 import (
 	"testing"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 type byteCounter struct {

pkg/server/web/config.go

@@ -25,11 +25,11 @@ import (
 	"strings"
 
 	"github.com/astaxie/beego/pkg"
-	"github.com/astaxie/beego/pkg/infrastructure/config"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/config"
+	"github.com/astaxie/beego/pkg/core/logs"
+	"github.com/astaxie/beego/pkg/core/session"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 	"github.com/astaxie/beego/pkg/server/web/context"
 )
 

pkg/server/web/config_test.go

@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	beeJson "github.com/astaxie/beego/pkg/infrastructure/config/json"
+	beeJson "github.com/astaxie/beego/pkg/core/config/json"
 )
 
 func TestDefaults(t *testing.T) {

pkg/server/web/context/context.go

@@ -35,7 +35,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // Commonly used mime-types

pkg/server/web/context/input.go

@@ -29,7 +29,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // Regexes for checking the accept headers

pkg/server/web/context/param/conv.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 	beecontext "github.com/astaxie/beego/pkg/server/web/context"
 )
 

pkg/server/web/controller.go

@@ -28,7 +28,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 
 	"github.com/astaxie/beego/pkg/server/web/context"
 	"github.com/astaxie/beego/pkg/server/web/context/param"

pkg/server/web/error.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/astaxie/beego/pkg"
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 
 	"github.com/astaxie/beego/pkg/server/web/context"
 )

pkg/server/web/hooks.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"path/filepath"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/logs"
+	"github.com/astaxie/beego/pkg/core/session"
 	"github.com/astaxie/beego/pkg/server/web/context"
 )
 

pkg/server/web/pagination/controller.go

@@ -15,7 +15,7 @@
 package pagination
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils/pagination"
+	"github.com/astaxie/beego/pkg/core/utils/pagination"
 	"github.com/astaxie/beego/pkg/server/web/context"
 )
 

pkg/server/web/parser.go

@@ -31,9 +31,9 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 	"github.com/astaxie/beego/pkg/server/web/context/param"
 )
 

pkg/server/web/router.go

@@ -25,9 +25,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 	beecontext "github.com/astaxie/beego/pkg/server/web/context"
 	"github.com/astaxie/beego/pkg/server/web/context/param"
 )

pkg/server/web/router_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
 	"github.com/astaxie/beego/pkg/server/web/context"
 )

pkg/server/web/server.go

@@ -31,10 +31,10 @@ import (
 
 	"golang.org/x/crypto/acme/autocert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 	beecontext "github.com/astaxie/beego/pkg/server/web/context"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 	"github.com/astaxie/beego/pkg/server/web/grace"
 )
 

pkg/server/web/staticfile.go

@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 	lru "github.com/hashicorp/golang-lru"
 
 	"github.com/astaxie/beego/pkg/server/web/context"

pkg/server/web/statistics.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // Statistics struct

pkg/server/web/template.go

@@ -27,8 +27,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/logs"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 var (

pkg/server/web/tree.go

@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 
 	"github.com/astaxie/beego/pkg/server/web/context"
 )