ken.lj
e4ab908753
upgrade version manually after merge 2.6.2-release
2018-06-06 09:44:52 +08:00
ken.lj
d6faa92be1
Merge branch '2.6.2-release'
...
# Conflicts:
# all/pom.xml
# bom/pom.xml
# dependencies-bom/pom.xml
# dubbo-cluster/pom.xml
# dubbo-common/pom.xml
# dubbo-config/dubbo-config-api/pom.xml
# dubbo-config/dubbo-config-spring/pom.xml
# dubbo-config/pom.xml
# dubbo-container/dubbo-container-api/pom.xml
# dubbo-container/dubbo-container-log4j/pom.xml
# dubbo-container/dubbo-container-logback/pom.xml
# dubbo-container/dubbo-container-spring/pom.xml
# dubbo-container/pom.xml
# dubbo-demo/dubbo-demo-api/pom.xml
# dubbo-demo/dubbo-demo-consumer/pom.xml
# dubbo-demo/dubbo-demo-provider/pom.xml
# dubbo-demo/pom.xml
# dubbo-filter/dubbo-filter-cache/pom.xml
# dubbo-filter/dubbo-filter-validation/pom.xml
# dubbo-filter/pom.xml
# dubbo-monitor/dubbo-monitor-api/pom.xml
# dubbo-monitor/dubbo-monitor-default/pom.xml
# dubbo-monitor/pom.xml
# dubbo-plugin/dubbo-qos/pom.xml
# dubbo-plugin/pom.xml
# dubbo-registry/dubbo-registry-api/pom.xml
# dubbo-registry/dubbo-registry-default/pom.xml
# dubbo-registry/dubbo-registry-multicast/pom.xml
# dubbo-registry/dubbo-registry-redis/pom.xml
# dubbo-registry/dubbo-registry-zookeeper/pom.xml
# dubbo-registry/pom.xml
# dubbo-remoting/dubbo-remoting-api/pom.xml
# dubbo-remoting/dubbo-remoting-grizzly/pom.xml
# dubbo-remoting/dubbo-remoting-http/pom.xml
# dubbo-remoting/dubbo-remoting-mina/pom.xml
# dubbo-remoting/dubbo-remoting-netty/pom.xml
# dubbo-remoting/dubbo-remoting-netty4/pom.xml
# dubbo-remoting/dubbo-remoting-p2p/pom.xml
# dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
# dubbo-remoting/pom.xml
# dubbo-rpc/dubbo-rpc-api/pom.xml
# dubbo-rpc/dubbo-rpc-dubbo/pom.xml
# dubbo-rpc/dubbo-rpc-hessian/pom.xml
# dubbo-rpc/dubbo-rpc-http/pom.xml
# dubbo-rpc/dubbo-rpc-injvm/pom.xml
# dubbo-rpc/dubbo-rpc-memcached/pom.xml
# dubbo-rpc/dubbo-rpc-redis/pom.xml
# dubbo-rpc/dubbo-rpc-rest/pom.xml
# dubbo-rpc/dubbo-rpc-rmi/pom.xml
# dubbo-rpc/dubbo-rpc-thrift/pom.xml
# dubbo-rpc/dubbo-rpc-webservice/pom.xml
# dubbo-rpc/pom.xml
# dubbo-serialization/dubbo-serialization-api/pom.xml
# dubbo-serialization/dubbo-serialization-fastjson/pom.xml
# dubbo-serialization/dubbo-serialization-fst/pom.xml
# dubbo-serialization/dubbo-serialization-hessian2/pom.xml
# dubbo-serialization/dubbo-serialization-jdk/pom.xml
# dubbo-serialization/dubbo-serialization-kryo/pom.xml
# dubbo-serialization/pom.xml
# dubbo-test/dubbo-test-benchmark/pom.xml
# dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
# dubbo-test/dubbo-test-compatibility/pom.xml
# dubbo-test/dubbo-test-examples/pom.xml
# dubbo-test/dubbo-test-integration/pom.xml
# dubbo-test/pom.xml
# hessian-lite/pom.xml
# pom.xml
2018-06-06 09:29:31 +08:00
ken.lj
5856d4f063
remove author info from #1453
2018-06-05 16:02:55 +08:00
yizhenqiang
42ba20ed43
Merge pull request #1453 , restore the bug that attachment has not been updated in the RpcContext when the Dubbo built-in retry mechanism is triggered.
2018-06-05 15:59:29 +08:00
时无两丶
7df5eb6a3b
Adding maven wrapper to Dubbo project ( #1887 )
...
* 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
* 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
* 补全单元测试,测试扩展是否生效
* 增加@Override注解
long 初始化赋值时,小写l改为大写L防止误读
* remove enhanced
* remove enhanced
* feat: 增加maven-wrapper,用户可以使用自己的maven,应用工程构建时将会使用工程的maven版本
* use mvnw to ci.
2018-06-05 14:09:20 +08:00
ken.lj
a144d287bd
Merge #1740 manually, fix typo.
2018-06-01 20:13:39 +08:00
Jerrick Zhu
f4c210b6d6
Merge pull request #1873 , support proxy for provider side.
...
fixes #67
2018-06-01 17:18:25 +08:00
Block
e1171fa00d
Merge pull request #348 , AtomicPositiveInteger less memory used & provides better perf.
2018-06-01 16:50:02 +08:00
ken.lj
e255f54be0
Merge pull request #1872 , get the real methodname to support consistenthash for generic invoke.
2018-06-01 15:32:55 +08:00
Jerrick Zhu
286fb12b01
Merge pull request #1827 , support generic invoke and attachment for http/hessian protocol.
...
fixes #1768 , #19
2018-06-01 15:02:53 +08:00
Huang YunKun
b7dde7236f
[Dubbo-1684] add unit test for dubbo spring config ( #1809 )
...
* add test for config spring module
* add more test for serviceBean and refBean
2018-06-01 13:07:03 +08:00
Huang YunKun
301bc34f66
Merge pull request #1868 , add test for rpc modules.
...
fixes #1697
2018-06-01 12:29:34 +08:00
ken.lj
e5063679ab
Merge pull request #1843 , support implicit delivery of attachments from provider to consumer.
...
Fixes #889 , #1466 , #1834 , #1466 , #1524
2018-05-31 16:21:55 +08:00
ken.lj
5f5fecd68e
Merge pull request #1837 , spring spi support inject by type.
2018-05-31 16:11:00 +08:00
Huxing Zhang
1b553fd811
Merge pull request #1820 , improve graceful shutdown.
2018-05-31 16:07:20 +08:00
时无两丶
fd7bab3cdf
Merge pull request #1866 , clarify license for codes referencing thirdparty repositories.
...
Clarify netty License.
2018-05-31 11:16:54 +08:00
Jasper Zhong
900ab0b28c
[Dubbo-1693] Enhance the test coverage part-14 ( #1859 )
...
* add testcase
* remove useless code
2018-05-31 10:23:11 +08:00
Ian Luo
61727e1e65
#1682 : Enhance the test coverage part-4 ( #1862 )
2018-05-30 10:10:06 +08:00
kimmking
259c07228c
update CXF to latest version and add test case for webservice protocol ( #1564 )
...
* update cxf version and add test cases
* support jdk7
* add profile for dependency in jdk9
* modify profile location
* fix jaxb version
* add dependency for jdk9
* extract dependencies to dependencies bom project
2018-05-28 14:46:09 +08:00
lzj
22624508bb
fix #1845 ( #1851 )
2018-05-28 10:21:15 +08:00
whanice
db03f8c42b
optimize_zk_create ( #1833 )
2018-05-25 10:28:21 +08:00
时无两丶
0bf6910b67
Use InternalThreadLocal in consumer side ( #1825 )
...
* SerializerFactory 获取Serializer时,锁住整个hashmap,导致整个过程被block
* 单元测试。保证一个class只有一个serializer和deserializer。单线程和多线程测试
* 增加线程数 50 模拟多个线程来获取serializer和deserializer
* 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
* 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
* 补全单元测试,测试扩展是否生效
* 错误命名
* 增加@Override注解
long 初始化赋值时,小写l改为大写L防止误读
* 修复单元测试
* remove enhanced
* remove enhanced
* Change ThreadFactory for consumer side which is to use InternalThreadLocal in RpcContext.
2018-05-25 10:14:03 +08:00
Ian Luo
47adfd047b
Merge pull request #1836 , there is a potential deadlock in DubboProtocol#getSharedClient.
...
Fixes #677 .
2018-05-25 10:11:07 +08:00
ken.lj
1e729afa0a
[maven-release-plugin] prepare for next development iteration
2018-05-24 17:52:17 +08:00
ken.lj
5eeb240337
[maven-release-plugin] prepare release dubbo-2.6.2
2018-05-24 17:51:14 +08:00
ken.lj
9e003d67fc
Add profile for distribution module
2018-05-24 16:26:34 +08:00
nzomkxia
c0f44e0879
Merge pull request #1839 , remove validation key from provider url registered to registry.
...
Fixes #1386 .
2018-05-24 14:44:13 +08:00
Ian Luo
300f9c9fe1
#1830 : dbindex support in redis ( #1831 )
2018-05-23 10:10:46 +08:00
Ian Luo
a6d8f1c5b2
#1597 : CacheFilter,when value is null,it will throw NPE(if use ehcache for jcache),why not check null here ( #1828 )
2018-05-22 15:25:35 +08:00
ken.lj
aa63752ae5
Exclude release temp files
2018-05-22 14:02:59 +08:00
ken.lj
d4d8a508c8
Exclude release temp files
2018-05-22 13:07:09 +08:00
ken.lj
b4705d0ea6
Merge checkstyle-plugin configuration
2018-05-22 10:16:32 +08:00
ken.lj
63f63611ce
Skip rat by default
2018-05-22 09:39:03 +08:00
ken.lj
81c3c0d0e2
Skip checkstyle by default
2018-05-22 09:30:07 +08:00
ken.lj
d11ddc05a7
Add *.log exclude pattern for source-release assembly
2018-05-22 08:23:41 +08:00
ken.lj
c968c09245
Fix minor issues reported in 2.6.2 RC1
2018-05-22 08:20:10 +08:00
beiwei30
b09e7a4854
#1816 : dubbo schema compatibility
2018-05-22 07:57:22 +08:00
ken.lj
472e62c831
Add arguments for release-plugin
2018-05-21 22:58:41 +08:00
ken.lj
7c07339c55
Add source-release assembly config
2018-05-21 22:33:28 +08:00
ken.lj
d7b3eaffd9
Go back to 2.6.2-SNAPSHOT to prepare for the next release.
2018-05-21 21:20:46 +08:00
beiwei30
d03ff27bd0
#1816 : dubbo schema compatibility
2018-05-21 16:21:42 +08:00
Huxing Zhang
5a3b1553dd
Remove .orig file and update gitigonre.
2018-05-20 14:41:34 +08:00
hengyunabc
7c216278a9
Merge pull request #1643 , ChannelState branch prediction optimization.
2018-05-18 14:49:35 +08:00
Huxing Zhang
2354c1612f
Ensure merger is specified to true to demonstrate the merger feature.
2018-05-17 18:06:50 +08:00
Huxing Zhang
00b6311913
Remove unnecessary null check.
2018-05-17 17:53:16 +08:00
Huxing Zhang
6db0cd152a
Simplify code, no function change.
2018-05-17 17:33:35 +08:00
Lei Wei
3c55c802ac
Merge pull request #1808 , fix URL parsing problem when user filed contains '@' characters.
...
Fixed #1470
2018-05-17 16:21:30 +08:00
Huxing Zhang
b48e8bac04
Merge branch 'ralf0131-graceful-shutdown-in-tomcat'
2018-05-17 16:19:17 +08:00
Huxing Zhang
48f34fe968
Merge branch 'graceful-shutdown-in-tomcat' of https://github.com/ralf0131/dubbo into ralf0131-graceful-shutdown-in-tomcat
2018-05-17 16:16:20 +08:00
Huxing Zhang
a45206c64f
Merge pull request #1811 , fix unstable hessian protocol unit test by adding overload.
...
Fixed #1667 , fixed #1727
2018-05-17 16:04:19 +08:00