Merge branch 'changeimports' into 'dev'

update imports See merge request !121
mosn · Jul 12, 2018 · 049270d · 049270d
2 parents a8c09ad + 8ee967b
commit 049270d
Show file tree

Hide file tree

Showing 141 changed files with 568 additions and 702 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@ SHELL = /bin/bash
 
 TARGET       = mosnd
 CONFIG_FILE  = mosn_config.json
-GIT_USER     = afe
-PROJECT_NAME = gitlab.alipay-inc.com/${GIT_USER}/mosn
+GIT_USER     = alipay
+PROJECT_NAME = github.com/${GIT_USER}/sofamosn
 
 MAJOR_VERSION = $(shell cat VERSION)
 GIT_VERSION   = $(shell git log -1 --pretty=format:%h)
@@ -21,7 +21,7 @@ RPM_SRC_DIR     = ${RPM_TAR_NAME}-${RPM_VERSION}
 RPM_TAR_FILE    = ${RPM_SRC_DIR}.tar.gz
 
 ut-local:
-	go test ./...
+	go test ./pkg/...
 
 unit-test:
 	docker build --rm -t ${BUILD_IMAGE} contrib/builder/binary

diff --git a/contrib/builder/image/Dockerfile b/contrib/builder/image/Dockerfile
@@ -2,7 +2,7 @@ FROM acs-reg.alipay.com/alipay/alios6u2:1.0.1-4165050
 MAINTAINER  xiaodong.dxd@alibaba-inc.com
 
 ENV TMP_FOLDER      /tmp
-ENV GIT_USER        afe
+ENV GIT_USER        alipay
 ENV MOSN_PREFIX     /home/admin/mosn
 ENV PATH            $MOSN_PREFIX/sbin:$PATH
 

diff --git a/contrib/builder/rpm/mosnd.spec b/contrib/builder/rpm/mosnd.spec
@@ -6,7 +6,7 @@ License:    MIT
 Group:      Tools/Docker
 Packager:   ant-frontend <o_dept_55122@list.alibaba-inc.com>
 Vendor:     Alipay.com
-Summary:    afe mosn agent
+Summary:    alipay sofamosn
 
 %define _homedir /home/admin/mosn
 

diff --git a/pkg/config/callback.go b/pkg/config/callback.go
@@ -20,12 +20,12 @@ import (
 	"errors"
 
 	pb "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/server"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/server/config/proxy"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
-	clusterAdapter "gitlab.alipay-inc.com/afe/mosn/pkg/upstream/cluster"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/server"
+	"github.com/alipay/sofamosn/pkg/server/config/proxy"
+	"github.com/alipay/sofamosn/pkg/types"
+	clusterAdapter "github.com/alipay/sofamosn/pkg/upstream/cluster"
 )
 
 func SetGlobalStreamFilter(globalStreamFilters []types.StreamFilterChainFactory) {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/api/v2"
 )
 
 //global instance for load & dump

diff --git a/pkg/config/configmanager.go b/pkg/config/configmanager.go
@@ -17,8 +17,8 @@
 package config
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/log"
 )
 
 // dumper provides basic operation with mosn elements, like 'cluster', to write back the config file with dynamic changes

diff --git a/pkg/config/configmanager_test.go b/pkg/config/configmanager_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/api/v2"
 )
 
 func Test_convertClusterHealthCheck(t *testing.T) {

diff --git a/pkg/config/convertxds.go b/pkg/config/convertxds.go
@@ -35,10 +35,10 @@ import (
 	xdsutil "github.com/envoyproxy/go-control-plane/pkg/util"
 	"github.com/fatih/structs"
 	"github.com/gogo/protobuf/types"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/protocol"
-	xdsxproxy "gitlab.alipay-inc.com/afe/mosn/pkg/xds-config-model/filter/network/x_proxy/v2"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/protocol"
+	xdsxproxy "github.com/alipay/sofamosn/pkg/xds-config-model/filter/network/x_proxy/v2"
 )
 
 var supportFilter map[string]bool = map[string]bool{

diff --git a/pkg/config/dump_test.go b/pkg/config/dump_test.go
diff --git a/pkg/config/dumper.go b/pkg/config/dumper.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/log"
 
 	"io/ioutil"
 	"sync"

diff --git a/pkg/config/parser.go b/pkg/config/parser.go
@@ -21,10 +21,10 @@ import (
 	"net"
 	"strings"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/server"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/protocol"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/server"
+	"github.com/alipay/sofamosn/pkg/protocol"
 
 	"time"
 )

diff --git a/pkg/config/parser_test.go b/pkg/config/parser_test.go
@@ -23,7 +23,7 @@ import (
 
 	"encoding/json"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/api/v2"
 )
 
 func TestParseClusterHealthCheckConf(t *testing.T) {

diff --git a/pkg/filter/accept/original_dst/original_dst.go b/pkg/filter/accept/original_dst/original_dst.go
@@ -3,8 +3,8 @@ package original_dst
 import (
 	"errors"
 	"fmt"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/types"
 	__tl "log"
 	"net"
 	"syscall"

diff --git a/pkg/filter/accept/original_dst/types.go b/pkg/filter/accept/original_dst/types.go
@@ -1,7 +1,7 @@
 package original_dst
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/types"
 )
 
 type Original_Dst interface {

diff --git a/pkg/filter/factory.go b/pkg/filter/factory.go
@@ -17,10 +17,10 @@
 package filter
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/filter/stream/faultinject"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/filter/stream/healthcheck/sofarpc"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/filter/stream/faultinject"
+	"github.com/alipay/sofamosn/pkg/filter/stream/healthcheck/sofarpc"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/types"
 )
 
 var creatorFactory map[string]StreamFilterFactoryCreator

diff --git a/pkg/filter/network/faultinject/faultinject.go b/pkg/filter/network/faultinject/faultinject.go
@@ -17,8 +17,8 @@
 package faultinject
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/types"
 	"math/rand"
 	"sync/atomic"
 	"time"

diff --git a/pkg/filter/network/faultinject/types.go b/pkg/filter/network/faultinject/types.go
@@ -17,7 +17,7 @@
 package faultinject
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/types"
 )
 
 type FaultInjecter interface {

diff --git a/pkg/filter/network/tcpproxy/proxy.go b/pkg/filter/network/tcpproxy/proxy.go
@@ -18,10 +18,10 @@ package tcpproxy
 
 import (
 	"context"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/network"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/network"
+	"github.com/alipay/sofamosn/pkg/types"
 	"reflect"
 )
 

diff --git a/pkg/filter/network/tcpproxy/types.go b/pkg/filter/network/tcpproxy/types.go
@@ -17,7 +17,7 @@
 package tcpproxy
 
 import (
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/types"
 )
 
 // ReadFilter

diff --git a/pkg/filter/stream/faultinject/faultinject.go b/pkg/filter/stream/faultinject/faultinject.go
@@ -24,10 +24,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/config"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/config"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/types"
 )
 
 type faultInjectFilter struct {

diff --git a/pkg/filter/stream/healthcheck/sofarpc/healthcheck.go b/pkg/filter/stream/healthcheck/sofarpc/healthcheck.go
@@ -18,12 +18,12 @@ package sofarpc
 
 import (
 	"context"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/api/v2"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/config"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/log"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/protocol/sofarpc"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/protocol/sofarpc/codec"
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/api/v2"
+	"github.com/alipay/sofamosn/pkg/config"
+	"github.com/alipay/sofamosn/pkg/log"
+	"github.com/alipay/sofamosn/pkg/protocol/sofarpc"
+	"github.com/alipay/sofamosn/pkg/protocol/sofarpc/codec"
+	"github.com/alipay/sofamosn/pkg/types"
 	"reflect"
 	"time"
 )

diff --git a/pkg/filter/types.go b/pkg/filter/types.go
@@ -16,6 +16,6 @@
  */
 package filter
 
-import "gitlab.alipay-inc.com/afe/mosn/pkg/types"
+import "github.com/alipay/sofamosn/pkg/types"
 
 type StreamFilterFactoryCreator func(config map[string]interface{}) (types.StreamFilterChainFactory, error)
diff --git a/pkg/log/accesslog.go b/pkg/log/accesslog.go
@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.alipay-inc.com/afe/mosn/pkg/types"
+	"github.com/alipay/sofamosn/pkg/types"
 	"github.com/valyala/bytebufferpool"
 )