Merge pull request #306 from fangyincheng/develop

modify filter dir

.gitignore

@@ -30,3 +30,4 @@ coverage.txt
 remoting/zookeeper/zookeeper-4unittest/
 config_center/zookeeper/zookeeper-4unittest/
 registry/zookeeper/zookeeper-4unittest/
+registry/consul/agent*
\ No newline at end of file

common/constant/version.go

@@ -18,7 +18,7 @@
 package constant
 
 const (
-	Version = "2.6.0"
+	Version = "1.3.0"
 	Name    = "dubbogo"
-	DATE    = "2019/05/06"
+	DATE    = "2020/01/12"
 )

filter/filter/access_log_filter.go → filter/filter_impl/access_log_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"os"

filter/filter/access_log_filter_test.go → filter/filter_impl/access_log_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"context"

filter/filter/active_filter.go → filter/filter_impl/active_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"github.com/apache/dubbo-go/common/extension"

filter/filter/echo_filter.go → filter/filter_impl/echo_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"github.com/apache/dubbo-go/common/constant"

filter/filter/echo_filter_test.go → filter/filter_impl/echo_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"testing"

filter/filter/execute_limit_filter.go → filter/filter_impl/execute_limit_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"strconv"
@@ -32,7 +32,7 @@ import (
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/filter"
-	_ "github.com/apache/dubbo-go/filter/common"
+	_ "github.com/apache/dubbo-go/filter/handler"
 	"github.com/apache/dubbo-go/protocol"
 )
 

filter/filter/execute_limit_filter_test.go → filter/filter_impl/execute_limit_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"net/url"

filter/filter/generic_filter.go → filter/filter_impl/generic_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"reflect"

filter/filter/generic_filter_test.go → filter/filter_impl/generic_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"reflect"

filter/filter/generic_service_filter.go → filter/filter_impl/generic_service_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"reflect"

filter/filter/generic_service_filter_test.go → filter/filter_impl/generic_service_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"context"

filter/filter/graceful_shutdown_filter.go → filter/filter_impl/graceful_shutdown_filter.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"sync/atomic"

filter/filter/graceful_shutdown_filter_test.go → filter/filter_impl/graceful_shutdown_filter_test.go

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package filter
+package filter_impl
 
 import (
 	"net/url"
@@ -32,7 +32,7 @@ import (
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/config"
 	"github.com/apache/dubbo-go/filter"
-	common2 "github.com/apache/dubbo-go/filter/common"
+	common2 "github.com/apache/dubbo-go/filter/handler"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
 )

filter/filter/hystrix_filter.go → filter/filter_impl/hystrix_filter.go

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package filter
+package filter_impl
 
 import (
 	"fmt"

filter/filter/hystrix_filter_test.go → filter/filter_impl/hystrix_filter_test.go

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package filter
+package filter_impl
 
 import (
 	"regexp"

filter/filter/token_filter.go → filter/filter_impl/token_filter.go

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package filter
+package filter_impl
 
 import (
 	"strings"

filter/filter/token_filter_test.go → filter/filter_impl/token_filter_test.go

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package filter
+package filter_impl
 
 import (
 	"net/url"