You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2018/03/30 09:28:38 UTC
[incubator-dubbo] branch 2.5.x updated (6e38481 -> 4f34540)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
omit 6e38481 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
omit 661ca74 Polish alibaba/dubbo #1317
omit a95b118 Polish alibaba/dubbo #1317
omit b5f7afe Merge remote-tracking branch 'origin/2.5.11' into 2.5.11
omit 51c29ba Test
omit c2ae82a Polish alibaba/dubbo #1277
omit 8681ad7 Update version to be 2.5.11
omit 8a0ce5e Polish alibaba/dubbo #1464
omit bb4651e Merge upstream/2.5.x
omit 3364f42 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
omit 562ce4f Merge branch 'master' of https://github.com/mercyblitz/dubbo
omit b9b1f15 Upgrade spring xsd version from 2.5 to 4.3
omit 5dd8ddc Fix typo (#1424)
omit 6a5281e fix heartbeat spelling error (#1451)
omit 1f22f56 Add unit test for ExtensionLoader
omit 2308427 Add .script route rules back for UT
omit c94198b Fix UT problems after structure change
omit 4a5c5e2 Merge pull request #1389, refactor dubbo deployment process
omit b626432 clean up imports for CacheTest
omit d770d92 [Dubbo-#1362] cache provider always lru cache (#1396)
omit 3d4f2fc Remove author info and add apache license
omit 6dff137 Fix "promoteTransitiveDependencies=false" of maven-shade-plugin
omit 0423219 #1411: Locale deserialize 'zh-hant_CN'
omit 3be23d9 update README format
omit 8bd9e9d update readme to add some details (#1403)
omit 91f9250 fix number type is lost in yaml config file (#1401)
omit 84124c4 Merge branch '2.5.x' of https://github.com/alibaba/dubbo
omit 7faa3f0 Merge pull request #1391, fix typo of method name in qos module.
omit d47d22b Fix time unit problem related with FutureAdapter in UT
omit d7a78c3 Fix time unit problem in UT
omit 5d7b316 Fixed #1398, revert bugs introduced from #1375
omit d8f3dd3 Change Mailing list address
omit 4bbc0dd Merge pull request #1242, remove redundant null check.
omit b52879c Merge pull request #1040, refactor: replace some deprecated methods related with jedis.
omit c7170d5 Merge pull request #1384, fix build string bug.
omit c7197b0 Merge pull request #1376, do not instantiate load balance if there is no invokers
omit ace2f4f Merge pull request #1331, add optional parameter to support hessian protocol method overload and request protocol version.
omit ddb677b Merge pull request #1375, remove unnecessary boxing.
omit fddedf6 Merge pull request #1378, replace StringBuider with simple string concatenation in log.
omit 59ca32a Merge branch '2.5.x'
omit a582764 Merge pull request #1377, remove redundant arguments for StatItem.isAllowable()
omit 2c20d99 fixed travis-ci failed because of test cases. (#1370)
omit 16bac78 Merge pull request #1353, fix oninvoke injection failure
omit 8b352ef update README
omit 25dfe1c Merge pull request #912, reducing search times in selectForKey(hash)
omit 9c2e2fa add javadoc for setAttachments in order to clarify issue#1166
omit c56d192 Merge pull request #1249, channel.close() in netty4 is async, so reconnect() don't connected
omit 61ba25b Merge pull request #1291, allow @Reference to support custom annotations
omit d129f10 Collection.isEmpty() should be used to test for emptiness (#1315)
omit d388735 [Dubbo-1283] Ensure we can build Dubbo on Java 9 (#1345)
omit 720dff8 Merge pull request #1319, add unit test for jetty http binder and tomcat http binder
omit 456edf1 [Dubbo-1284] Fix UT warning message when running on Java 9 (#1323)
omit 61d7178 Merge pull request #1333, remove unnecessary maven wrapper(fixes #1167)
omit 98c548a add config for travis ci fail when test case fail (#1264)
omit daac568 Remove slf4j-log4j12 dependency
omit 9ca9bb0 Fix typo #1260
omit 2f7f91c Remove unnecessary transitive dependencies
omit d1292c2 Add "source" configuration to JdkCompiler
omit a4632da Merge branch '2.5.x'
omit 5b0ab11 remove hot symbol
omit 74f7074 add dubbo-ops link
omit 2108d8f Update README.md
omit 8eb0d6f Remove useless dependencies
omit c7cd889 Merge pull request #1236, fix typo in FailbackRegistry.
omit 09722e3 Remove unnecessary dependencies
omit 9cb9426 Add comment
omit 6160d3e Fixed #1226, enhance netty support for rest protocol
omit 267292e Fixed #1186, change the default ZK client from `zkclient` to `curator`
omit 77f03a5 add javadoc.opts to adapt java7 and java 8
omit 5c3c29b recover -Xdoclint:none temperary
omit 4a5b189 Merge branch 'master' of https://github.com/alibaba/dubbo
omit 8031ba6 获取Serializer和Deserializer时，高并发情况下线程block (#1196)
omit 7cfa205 Merge pull request from #1170, fix typo of SUFFIXES.
omit 926a719 Remove useless readme.md
omit ca11537 Remove dubbo-admin, why it appears?
omit 4413886 Remove maven "provided" config in pom.xml of sub-modules
omit 9871e6a Upgrade version to 2.6.1
omit e62d3ff Remove classes related with "dubbo-monitor"
omit da3783e Upgrade version to 2.6.1
omit 9893bd6 Change module name
omit 26f39d5 Refactor project structure using maven
omit 22bb9cb Fix typo of resteasy version in dubbo-maven
omit 7e59712 Fix typo
omit 5f02aa6 Degrade the resteasy and netty version for jdk1.7 compatibility.
omit eae1367 Add version for resteasy dependency
omit 739a61e Upgrade version to 2.6.0
omit 8ad8757 Upgrade netty4 version
omit e0a9cbf Adjust dependencies in pom.xml relating with rest
omit 75ed5f5 Delete OptimizedSerialization
omit 12e4d1c Add service level `serialization` config
omit cf3a54e Add test example for rest
omit c805904 Remove useless container integration
omit 0602317 Add apache license and remove author info
omit 17aa99e Upgrade rest integration
omit f4dfc6e Revert modification of core dubbo RPC protocol
omit 20fff01 Upgrade serialization integration of kryo and fst
omit ab8af67 Merge pull request from #1001, merge dubbox branch
omit 926baab Merge remote-tracking branch 'upstream/master'
omit 562a126 Merge pull request #15 from alibaba/master
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/2.5.x (4f34540)
\
O -- O -- O (6e38481)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47774 bytes
.mvn/wrapper/maven-wrapper.properties | 1 +
dubbo-admin/pom.xml | 340 ++++-----
dubbo-admin/src/test/assembly/bin/setup.bat | 166 ++---
dubbo-cluster/pom.xml | 2 +-
dubbo-common/pom.xml | 2 +-
.../dubbo/common/serialize/Serialization.java | 136 ++--
.../support/dubbo/DubboSerialization.java | 90 +--
.../support/hessian/Hessian2Serialization.java | 94 +--
.../support/hessian/Hessian2SerializerFactory.java | 66 +-
.../support/java/CompactedJavaSerialization.java | 90 +--
.../serialize/support/java/JavaSerialization.java | 90 +--
.../support/json/FastJsonObjectInput.java | 270 +++----
.../support/json/FastJsonObjectOutput.java | 198 ++---
.../support/json/FastJsonSerialization.java | 96 +--
.../serialize/support/json/JsonObjectInput.java | 310 ++++----
.../serialize/support/json/JsonObjectOutput.java | 208 +++---
.../serialize/support/json/JsonSerialization.java | 98 +--
...om.alibaba.dubbo.common.serialize.Serialization | 10 +-
.../CompactedJavaSerializationTest.java | 48 +-
.../serialization/JavaSerializationTest.java | 48 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../AnnotationPropertyValuesAdapter.java | 92 ---
.../DubboConfigBindingBeanPostProcessor.java | 115 +--
.../ReferenceAnnotationBeanPostProcessor.java | 161 +----
.../factory/annotation/ReferenceBeanBuilder.java | 26 +-
.../ServiceAnnotationBeanPostProcessor.java | 49 +-
.../annotation/DubboConfigBindingRegistrar.java | 64 +-
.../properties/AbstractDubboConfigBinder.java | 69 --
.../properties/DefaultDubboConfigBinder.java | 46 --
.../context/properties/DubboConfigBinder.java | 58 --
.../converter/StringArrayToMapConverter.java | 38 -
.../converter/StringArrayToStringConverter.java | 37 -
.../dubbo/config/spring/util/AnnotationUtils.java | 89 ---
.../dubbo/config/spring/util/ObjectUtils.java | 37 -
.../config/spring/util/PropertySourcesUtils.java | 18 +-
.../annotation/provider/AnnotationServiceImpl.java | 2 +-
.../AnnotationPropertyValuesAdapterTest.java | 158 ----
.../DubboConfigBindingBeanPostProcessorTest.java | 66 --
.../ReferenceAnnotationBeanPostProcessorTest.java | 95 +--
.../ServiceAnnotationBeanPostProcessorTest.java | 3 +-
.../properties/DefaultDubboConfigBinderTest.java | 56 --
.../converter/StringArrayToMapConverterTest.java | 52 --
.../StringArrayToStringConverterTest.java | 46 --
dubbo-config/pom.xml | 2 +-
dubbo-container/dubbo-container-api/pom.xml | 2 +-
.../com/alibaba/dubbo/container/page/Menu.java | 76 +-
.../dubbo/container/page/MenuComparator.java | 84 +--
.../com/alibaba/dubbo/container/page/Page.java | 162 ++---
.../alibaba/dubbo/container/page/PageHandler.java | 70 +-
.../alibaba/dubbo/container/page/PageServlet.java | 556 +++++++-------
.../dubbo/container/page/ResourceFilter.java | 300 ++++----
.../container/page/pages/HomePageHandler.java | 94 +--
.../dubbo/container/page/pages/LogPageHandler.java | 210 +++---
.../container/page/pages/StatusPageHandler.java | 166 ++---
.../container/page/pages/SystemPageHandler.java | 272 +++----
.../com.alibaba.dubbo.container.page.PageHandler | 6 +-
dubbo-container/dubbo-container-jetty/pom.xml | 76 +-
.../dubbo/container/jetty/JettyContainer.java | 176 ++---
.../dubbo/container/jetty/JettyContainerTest.java | 74 +-
dubbo-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-container/dubbo-container-spring/pom.xml | 2 +-
dubbo-container/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
dubbo-demo/pom.xml | 2 +-
dubbo-filter/dubbo-filter-cache/pom.xml | 2 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 2 +-
dubbo-filter/pom.xml | 2 +-
dubbo-maven/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +-
dubbo-monitor/pom.xml | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 2 +-
dubbo-plugin/pom.xml | 2 +-
dubbo-registry/dubbo-registry-api/pom.xml | 2 +-
.../registry/pages/RegisteredPageHandler.java | 156 ++--
.../registry/pages/RegistriesPageHandler.java | 140 ++--
.../registry/pages/SubscribedPageHandler.java | 156 ++--
.../com.alibaba.dubbo.container.page.PageHandler | 4 +-
dubbo-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +-
dubbo-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +-
dubbo-registry/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
dubbo-remoting/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-default/pom.xml | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboExporter.java | 90 +--
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 292 ++++----
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 162 ++---
.../dubbo/ReferenceCountExchangeClient.java | 344 ++++-----
.../rpc/protocol/dubbo/filter/FutureFilter.java | 410 +++++------
.../rpc/protocol/dubbo/filter/TraceFilter.java | 252 +++----
.../protocol/dubbo/page/ClientsPageHandler.java | 152 ++--
.../protocol/dubbo/page/ServersPageHandler.java | 108 +--
.../protocol/dubbo/status/ServerStatusChecker.java | 114 +--
.../dubbo/status/ThreadPoolStatusChecker.java | 138 ++--
.../protocol/dubbo/telnet/ChangeTelnetHandler.java | 126 ++--
.../protocol/dubbo/telnet/CountTelnetHandler.java | 328 ++++-----
.../dubbo/telnet/CurrentTelnetHandler.java | 88 +--
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 316 ++++----
.../protocol/dubbo/telnet/ListTelnetHandler.java | 196 ++---
.../protocol/dubbo/telnet/PortTelnetHandler.java | 184 ++---
.../protocol/dubbo/telnet/TraceTelnetHandler.java | 180 ++---
.../com.alibaba.dubbo.common.status.StatusChecker | 2 +-
.../com.alibaba.dubbo.container.page.PageHandler | 2 +-
...com.alibaba.dubbo.remoting.telnet.TelnetHandler | 12 +-
.../dubbo/internal/com.alibaba.dubbo.rpc.Filter | 2 +-
.../dubbo/rpc/protocol/dubbo/FutureFilterTest.java | 160 ++---
.../rpc/protocol/dubbo/support/NonSerialized.java | 48 +-
.../dubbo/rpc/protocol/dubbo/support/Person.java | 88 +--
.../rpc/protocol/dubbo/support/ProtocolUtils.java | 128 ++--
.../rpc/protocol/dubbo/support/RemoteService.java | 50 +-
.../dubbo/rpc/protocol/dubbo/support/Type.java | 40 +-
.../dubbo/telnet/ChangeTelnetHandlerTest.java | 238 +++---
.../dubbo/telnet/CurrentTelnetHandlerTest.java | 134 ++--
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 214 +++---
.../dubbo/telnet/ListTelnetHandlerTest.java | 336 ++++-----
.../dubbo/telnet/LogTelnetHandlerTest.java | 110 +--
.../dubbo/telnet/PortTelnetHandlerTest.java | 208 +++---
.../dubbo-rpc-default/src/test/resources/log4j.xml | 90 +--
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-rpc/pom.xml | 2 +-
dubbo-simple/dubbo-monitor-simple/pom.xml | 360 +++++-----
.../src/main/assembly/assembly.xml | 78 +-
.../src/main/assembly/conf/dubbo.properties | 56 +-
.../alibaba/dubbo/monitor/simple/CountUtils.java | 184 ++---
.../dubbo/monitor/simple/RegistryContainer.java | 584 +++++++--------
.../dubbo/monitor/simple/SimpleMonitorService.java | 796 ++++++++++-----------
.../simple/pages/ApplicationsPageHandler.java | 162 ++---
.../monitor/simple/pages/ChartsPageHandler.java | 188 ++---
.../monitor/simple/pages/ConsumersPageHandler.java | 174 ++---
.../simple/pages/DependenciesPageHandler.java | 174 ++---
.../monitor/simple/pages/HostsPageHandler.java | 148 ++--
.../monitor/simple/pages/ProvidersPageHandler.java | 174 ++---
.../monitor/simple/pages/ServicesPageHandler.java | 142 ++--
.../simple/pages/StatisticsPageHandler.java | 332 ++++-----
.../simple/pages/UnregisterPageHandler.java | 98 +--
.../simple/pages/UnsubscribePageHandler.java | 128 ++--
.../com.alibaba.dubbo.container.page.PageHandler | 18 +-
.../META-INF/spring/dubbo-monitor-simple.xml | 80 +--
.../dubbo/monitor/simple/SimpleMonitor.java | 48 +-
.../monitor/simple/SimpleMonitorServiceTest.java | 66 +-
.../src/test/resources/dubbo.properties | 56 +-
.../src/test/resources/log4j.xml | 56 +-
dubbo-simple/dubbo-registry-simple/pom.xml | 168 ++---
.../src/main/assembly/assembly.xml | 78 +-
.../src/main/assembly/conf/dubbo.properties | 40 +-
.../registry/simple/SimpleRegistryService.java | 416 +++++------
.../META-INF/spring/dubbo-registry-simple.xml | 88 +--
.../dubbo/registry/simple/SimpleRegistry.java | 48 +-
.../registry/simple/SimpleRegistryServiceTest.java | 60 +-
.../src/test/resources/dubbo.properties | 40 +-
.../src/test/resources/log4j.xml | 56 +-
dubbo-simple/pom.xml | 72 +-
dubbo-test/dubbo-test-benchmark/pom.xml | 2 +-
.../src/test/backup/Dubbo.java | 128 ++--
.../client/DemoBenchmarkClientRunnable.java | 88 +--
.../dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 2 +-
dubbo-test/dubbo-test-examples/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 2 +-
dubbo/pom.xml | 2 +-
hessian-lite/pom.xml | 2 +-
pom.xml | 3 +-
185 files changed, 8126 insertions(+), 9231 deletions(-)
create mode 100755 .mvn/wrapper/maven-wrapper.jar
create mode 100755 .mvn/wrapper/maven-wrapper.properties
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/AbstractDubboConfigBinder.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DubboConfigBinder.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverter.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/ObjectUtils.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java
--
To stop receiving notification emails like this one, please contact
mercyblitz@apache.org.