svn commit: r27295 - in /release/incubator/dubbo: ./ 2.6.2/
Author: liujun Date: Thu Jun 7 04:53:17 2018 New Revision: 27295 Log: first release Added: release/incubator/dubbo/2.6.2/ release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip (with props) release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.asc release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.sha512 release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip (with props) release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.asc release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.sha512 release/incubator/dubbo/KEYS Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip == Binary file - no diff available. Propchange: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.asc == --- release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.asc (added) +++ release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.asc Thu Jun 7 04:53:17 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbBp21AAoJEFLmEDMoaByxV+EP/iK672oZl3eR8okOdoN+LAPN +2ylLBg6K1n9FV6PnfQTnRE9A0EvWS8miqyYWfGRz0lwNLUX7N67Rii9lQn7HW79j +gwmjGvMOCO2L0iP8OZwIvX36uZwZpiwCUQG+0k+iDMbTqzXaevH5UvOKyqxP9Hvo +bsgI85db6Ax/yJ+q2VSTm3304Lznw8ili4I7fBa49SnpeIiQiSNIPZ+HotAsCw1H +uvzaTTkfpzOoupGDxa8jH+nZ6Goj05dS8lKKWGV6jhLQ2G3ezTAgKtbZLnXXhLD7 +0X9CDMWdNn57Iy2iPf3lPxJbpv6+fl2v0++NPCrDRW1By7lkhIaEhsqQImh6uHSb +eiuHGJtSABlS//WQmuhGjew+YRgPqRcTem5GPS3J6gGfEumL+CAS/lYvKmDx52vq +D/inTku7rQeLKzvFmNWb/9sPwhW/Wabo4UqyjeTNd87eFvUBaURnrN0B33ntpMnq +aSszjaR6uOGKuNSd8hlaqnBX0NIWWEsLxkQHydsbbFUZskErcS7DYd1ySuI22K3s +04mVgdXJMRaFDQB+KVzxyZ7A2NzMuWFQqy1VLE8N0bPuNCXJo70EJ2v9TjI7WeW5 +uKP4jOX2s8C4qonhPU6h5etKuW4dKmxeH1loMiASJC5SYsKpuEyFdhPWPnGx8DGa +GfJXeRFbiI3MWfWeRvbc +=7Iw1 +-END PGP SIGNATURE- Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.sha512 == --- release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.sha512 (added) +++ release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-bin-release.zip.sha512 Thu Jun 7 04:53:17 2018 @@ -0,0 +1 @@ +e9cbed45f2e6bb4eeb2826b60938e241bafacf68c0f7f7924fa117ba3097deb567df1953c46525f3068c7f289e904ef23ed7491617ce7c94ea9490636f204215 dubbo-incubating-2.6.2-bin-release.zip Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip == Binary file - no diff available. Propchange: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.asc == --- release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.asc (added) +++ release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.asc Thu Jun 7 04:53:17 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbBp21AAoJEFLmEDMoaByx1moQAJSCU3ueMsoYap/RfG6wQJuT +KQBL/Jy/SDirIxjiYq0M1//DcXsyM4muOF8Kvh53F5H+cD3o2BE2Z07aPclqV72J +KvERRGMwubLGP0YcBy2uH4T+X8egBSWhiHRusjZAkOtXsWOUjBoVzttEtmS7jk3L +L3MjKDUROIwDY6NJNyd6ly+rCXXy0UY5q/yCvxZKuq+6aRxgbnV7kV8catliMhha +GvaaotyOrBNK5lRCuKNStUQ2Ee3kYv57M4/xn/FVJn8augln9vBLoY97mp5yzIMj +QvxRrvdg3HNiqB5lGLu/xA4irYabT261wr2NhRJLIkBrnRzQjfC28yLvOzlsCCAO +R5cG7O/lr95GbMyiyWqBHgTH72MKY8OQL3FQwUdq2CyCxzzR1uchbmlDwHyCTMzJ +A2BREl8Uc9DtnP3XRPZm8cY2dwewDJlUcOT8c+kZ8zf9261WEeefSwGNl92nu/pW +YcS7XnkLKAu0ZJAykjOot1GGxzqorGJUnqgx4d7jQu8ff2PU3j+srvj5ytaEG94N +/ZpEbAvPnzWP/oQz87zNTeP/ZGOPGxdB6UFsRr/sUGXGX4WU11fMyCs6OIgxp5k6 +v9Y0jmi/2u6U8rhEsvcTC/JlPZ3BoJ9Jj4EUGlgwRBPdEODkffEMhpacDiFXR8AY +OYtPLijw3WLuqe4CWmqw +=mMK5 +-END PGP SIGNATURE- Added: release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.sha512 == --- release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.sha512 (added) +++ release/incubator/dubbo/2.6.2/dubbo-incubating-2.6.2-source-release.zip.sha512 Thu Jun 7 04:53:17 2018 @@ -0,0 +1 @@ +c91ab868705eae47d581bc7e26cf07cdab00f520297c1625b09251e796ef5658e77cb0ad0a64b897a1842d4dcf7624bd3b825dfe00e919adf3de8cd572512867 dubbo-incubating-2.6.2-source-release.zip Added:
svn commit: r27294 - /release/incubator/dubbo/
Author: liujun Date: Thu Jun 7 04:50:20 2018 New Revision: 27294 Log: Add dubbo project to incubator Added: release/incubator/dubbo/
[incubator-dubbo-spring-boot-project] branch master updated (8c7bd1e -> 94c13ff)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 8c7bd1e Merge pull request #160 from apache/0.2.0 add 022278e Polish apache/incubator-dubbo-spring-boot-project#161 add d1d2537 Update Document add 577bacb Merge pull request #164 from mercyblitz/0.2.0 new 94c13ff Merge pull request #165 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 +- README_CN.md | 3 +- .../{README.md => README_CN.md}| 181 +++-- dubbo-spring-boot-parent/pom.xml | 2 +- 4 files changed, 94 insertions(+), 95 deletions(-) copy dubbo-spring-boot-actuator/{README.md => README_CN.md} (61%) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #165 from apache/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 94c13ffb4afe1c6685586aac5c6a08974ac1169d Merge: 8c7bd1e 577bacb Author: 小马哥 AuthorDate: Thu Jun 7 11:28:49 2018 +0800 Merge pull request #165 from apache/0.2.0 0.2.0 README.md | 3 +- README_CN.md| 3 +- dubbo-spring-boot-actuator/README_CN.md | 513 dubbo-spring-boot-parent/pom.xml| 2 +- 4 files changed, 516 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #164 from mercyblitz/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 577bacb8cf812d9bfbee435c9e580960f5c06a56 Merge: 6340b52 d1d2537 Author: 小马哥 AuthorDate: Thu Jun 7 11:28:28 2018 +0800 Merge pull request #164 from mercyblitz/0.2.0 0.2.0 README.md | 3 +- README_CN.md| 7 +- dubbo-spring-boot-actuator/README_CN.md | 513 dubbo-spring-boot-parent/pom.xml| 2 +- pom.xml | 49 +-- 5 files changed, 543 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (6340b52 -> 577bacb)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 6340b52 Merge pull request #159 from mercyblitz/0.2.0 add 67c5ac4 Merge pull request #83 from apache/0.2.0 add 53b9ff0 Sync pom.xml with ASF info. add e950bbf Update README_CN.md add b84278c Merge pull request #156 from boliuxyz/master add 8c7bd1e Merge pull request #160 from apache/0.2.0 add 022278e Polish apache/incubator-dubbo-spring-boot-project#161 add d1d2537 Update Document new 577bacb Merge pull request #164 from mercyblitz/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 +- README_CN.md | 7 +- .../{README.md => README_CN.md}| 181 +++-- dubbo-spring-boot-parent/pom.xml | 2 +- pom.xml| 49 +++--- 5 files changed, 121 insertions(+), 121 deletions(-) copy dubbo-spring-boot-actuator/{README.md => README_CN.md} (61%) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #163 from mercyblitz/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 9c3bc92f15b043b4cb30e040b05a4672107c9ae5 Merge: c99dc17 1dca14a Author: 小马哥 AuthorDate: Thu Jun 7 11:27:41 2018 +0800 Merge pull request #163 from mercyblitz/0.1.x Polish apache/incubator-dubbo-spring-boot-project#162 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (c99dc17 -> 9c3bc92)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from c99dc17 Merge pull request #158 from mercyblitz/0.1.x add 1dca14a Polish apache/incubator-dubbo-spring-boot-project#162 new 9c3bc92 Merge pull request #163 from mercyblitz/0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #160 from apache/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 8c7bd1e750f40decc93129bc169e022161e7fb5f Merge: b84278c 6340b52 Author: 小马哥 AuthorDate: Thu Jun 7 10:36:16 2018 +0800 Merge pull request #160 from apache/0.2.0 0.2.0 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (b84278c -> 8c7bd1e)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from b84278c Merge pull request #156 from boliuxyz/master add 65dd7ac Update dubbo's version to be 2.6.2 add 6340b52 Merge pull request #159 from mercyblitz/0.2.0 new 8c7bd1e Merge pull request #160 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch master updated: Add Swagger UI integration and fixed #1642 (#1856)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 71fda0a Add Swagger UI integration and fixed #1642 (#1856) 71fda0a is described below commit 71fda0a5fd305d923579161d6c4cdd972f187033 Author: kimmking AuthorDate: Wed Jun 6 16:27:13 2018 +0800 Add Swagger UI integration and fixed #1642 (#1856) * 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 * add SwaggerUI Integration for Rest web service * add approved license. * remove author info * adjust dependency order * add javadoc * exclude jsr311 1.1.1 version in pom * add test cases for Swagger Integration --- dependencies-bom/pom.xml | 14 + dubbo-rpc/dubbo-rpc-rest/pom.xml | 51 + .../swagger/DubboSwaggerApiListingResource.java| 47 .../integration/swagger/DubboSwaggerService.java | 43 +++ .../DubboSwaggerApiListingResourceTest.java| 64 ++ .../rest/integration/swagger/SwaggerService.java | 34 6 files changed, 230 insertions(+), 23 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index ac111df..9df4853 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -111,6 +111,8 @@ 2.2.7 1.2.0 + +1.5.19 @@ -353,6 +355,18 @@ ${activation_version} + + +io.swagger +swagger-annotations +${swagger_version} + + +io.swagger +swagger-jaxrs +${swagger_version} + + org.apache.curator diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml index 27f7c2b..eb9ab76 100644 --- a/dubbo-rpc/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml @@ -28,12 +28,16 @@ false + +com.alibaba +dubbo-config-api +${project.parent.version} + com.alibaba dubbo-rpc-api ${project.parent.version} - com.alibaba dubbo-remoting-http @@ -67,28 +71,6 @@ resteasy-jdk-http - - - - - - - - - - - - - - - - - - - - - - org.jboss.resteasy resteasy-jackson-provider @@ -104,11 +86,34 @@ netty-all + + +io.swagger +swagger-annotations + + + javax.ws.rs +jsr311-api + + + + +io.swagger +swagger-jaxrs + + +javax.ws.rs +jsr311-api + + + + com.alibaba dubbo-serialization-jdk ${project.parent.version} test + \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java new file mode 100644 index 000..fc5ec6d --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES
[incubator-dubbo] branch master updated: unit test for common-utils (#1891)
This is an automated email from the ASF dual-hosted git repository. iluo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 04c26e6 unit test for common-utils (#1891) 04c26e6 is described below commit 04c26e6cb0f07d776769f2e53edd7ef92e078f77 Author: Ian Luo AuthorDate: Wed Jun 6 16:23:47 2018 +0800 unit test for common-utils (#1891) * #1682: Enhance the test coverage part-4 : dubbo-common/src/main/java/com/alibaba/dubbo/common/status(store|threadpoolutils) modules * fix test failure on travis --- .../com/alibaba/dubbo/common/utils/NetUtils.java | 2 +- .../com/alibaba/dubbo/common/utils/PojoUtils.java | 5 +- .../alibaba/dubbo/common/utils/LRUCacheTest.java | 61 + .../dubbo/common/utils/NamedThreadFactoryTest.java | 48 +++ .../alibaba/dubbo/common/utils/NetUtilsTest.java | 143 .../alibaba/dubbo/common/utils/PojoUtilsTest.java | 145 + 6 files changed, 379 insertions(+), 25 deletions(-) diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java index 59edd48..de62059 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java @@ -132,7 +132,7 @@ public class NetUtils { new InetSocketAddress(port) : new InetSocketAddress(host, port); } -private static boolean isValidAddress(InetAddress address) { +static boolean isValidAddress(InetAddress address) { if (address == null || address.isLoopbackAddress()) return false; String name = address.getHostAddress(); diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java index 754fd2d..9520629 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java @@ -69,12 +69,15 @@ public class PojoUtils { } public static Object[] realize(Object[] objs, Class[] types) { -if (objs.length != types.length) +if (objs.length != types.length) { throw new IllegalArgumentException("args.length != types.length"); +} + Object[] dests = new Object[objs.length]; for (int i = 0; i < objs.length; i++) { dests[i] = realize(objs[i], types[i]); } + return dests; } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java new file mode 100644 index 000..040344f --- /dev/null +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.dubbo.common.utils; + +import org.junit.Test; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +public class LRUCacheTest { +@Test +public void testCache() throws Exception { +LRUCache cache = new LRUCache(3); +cache.put("one", 1); +cache.put("two", 2); +cache.put("three", 3); +assertThat(cache.get("one"), equalTo(1)); +assertThat(cache.get("two"), equalTo(2)); +assertThat(cache.get("three"), equalTo(3)); +assertThat(cache.size(), equalTo(3)); +cache.put("four", 4); +assertThat(cache.size(), equalTo(3)); +assertFalse(cache.containsKey("one")); +assertTrue(cache.containsKey("two")); +assertTrue(cache.containsKey("three")); +assertTrue(cache.containsKey("four")); +cache.remove("four"); +assertThat(cache.size(), equalTo(2)); +cache.put("five", 5); +assertFalse(cache.containsKey("four")); +