[dubbo-go] branch 1.1 updated: Rem: version
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/1.1 by this push: new 1bbfcb1 Rem: version 1bbfcb1 is described below commit 1bbfcb1b7b3318493e71f3b4825a19b7f524ab19 Author: AlexStocks AuthorDate: Wed Aug 14 13:05:03 2019 +0800 Rem: version --- version/version.go | 24 1 file changed, 24 deletions(-) diff --git a/version/version.go b/version/version.go deleted file mode 100644 index b9a076e..000 --- a/version/version.go +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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 version - -const ( - Version = "2.6.0" - Name= "dubbogo" - DATE= "2019/05/06" -)
[dubbo-go] branch master updated: Rem: version
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/master by this push: new c6ef9ee Rem: version c6ef9ee is described below commit c6ef9ee385637fb521621ec762dbbde550ca16a1 Author: AlexStocks AuthorDate: Wed Aug 14 13:04:31 2019 +0800 Rem: version --- version/version.go | 24 1 file changed, 24 deletions(-) diff --git a/version/version.go b/version/version.go deleted file mode 100644 index b9a076e..000 --- a/version/version.go +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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 version - -const ( - Version = "2.6.0" - Name= "dubbogo" - DATE= "2019/05/06" -)
[dubbo-go] branch develop updated: Rem: version; Mod: translate chinese to english
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new a560c3c Rem: version; Mod: translate chinese to english a560c3c is described below commit a560c3c5e7151e1e9047cc8d074314fb51847891 Author: AlexStocks AuthorDate: Wed Aug 14 13:03:41 2019 +0800 Rem: version; Mod: translate chinese to english --- registry/zookeeper/registry.go | 8 +--- version/version.go | 24 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 9ce3ee5..003ee29 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -232,8 +232,9 @@ func (r *zkRegistry) Register(conf common.URL) error { // Check if the service has been registered r.cltLock.Lock() - // 注意此处与consumerZookeeperRegistry的差异,consumer用的是conf.Path, - // 因为consumer要提供watch功能给selector使用, provider允许注册同一个service的多个group or version + // Note the difference between consumer and consumerZookeeperRegistry (consumer use conf.Path). + // Because the consumer wants to provide monitoring functions for the selector, + // the provider allows multiple groups or versions of the same service to be registered. _, ok = r.services[conf.Key()] r.cltLock.Unlock() if ok { @@ -298,7 +299,8 @@ func (r *zkRegistry) register(c common.URL) error { } params.Add("anyhost", "true") - // dubbo java consumer来启动找provider url时,因为category不匹配,会找不到provider,导致consumer启动不了,所以使用consumers&providers + // Dubbo java consumer to start looking for the provider url,because the category does not match, + // the provider will not find, causing the consumer can not start, so we use consumers. // DubboRole = [...]string{"consumer", "", "", "provider"} // params.Add("category", (RoleType(PROVIDER)).Role()) params.Add("category", (common.RoleType(common.PROVIDER)).String()) diff --git a/version/version.go b/version/version.go deleted file mode 100644 index b9a076e..000 --- a/version/version.go +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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 version - -const ( - Version = "2.6.0" - Name= "dubbogo" - DATE= "2019/05/06" -)
[dubbo-go] branch 1.1 updated: [ISSUE #163] clean heartbeat from PendingResponse
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/1.1 by this push: new 9e718c2 [ISSUE #163] clean heartbeat from PendingResponse 9e718c2 is described below commit 9e718c273e699d2b0a816f94a99cbc7b41d60431 Author: scott.wang AuthorDate: Wed Aug 14 11:06:53 2019 +0800 [ISSUE #163] clean heartbeat from PendingResponse --- protocol/dubbo/listener.go | 1 + 1 file changed, 1 insertion(+) diff --git a/protocol/dubbo/listener.go b/protocol/dubbo/listener.go index c0d5fe2..aa20828 100644 --- a/protocol/dubbo/listener.go +++ b/protocol/dubbo/listener.go @@ -91,6 +91,7 @@ func (h *RpcClientHandler) OnMessage(session getty.Session, pkg interface{}) { if p.Err != nil { logger.Errorf("rpc heartbeat response{error: %#v}", p.Err) } + h.conn.pool.rpcClient.removePendingResponse(SequenceType(p.Header.ID)) return } logger.Debugf("get rpc response{header: %#v, body: %#v}", p.Header, p.Body)
[dubbo-go] branch 1.1.0 deleted (was 7f0abe3)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch 1.1.0 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. was 7f0abe3 Update README.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[dubbo-go] branch master updated (3ad9a8d -> bd8663b)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from 3ad9a8d Merge pull request #164 from amudong/master add 7a34fb2 ETCD tmp complete add 549f4ae merge && add etcdv3 remote pkg add 14b198d ADD etcdv3 basic complete add c06c8a2 etcdv3 basic complete add 07c1d31 reset default config add 61e5ec5 Fix pkg name add 27809f3 Basic function comleted, wait for refactor add 7defc21 Refactor remote registry add 13acf67 ADD etcdv3 registry for dubbo add 898fce9 ADD RACE for etcd test add 0cdbd1d ADD star&&stop etcd for ut add b40d56d ADD etcdctl for ut add 8fa6f5b Fix etcd work-dir add d071e25 Fix etcd start && stop add 09a4d07 FMT registry/etcdv3 remoting/v3 add cb529f6 Fix etcd start cmd add 8178ee4 wait for etcd start add 60a490b wait for etcd start add 13e218d ADD TestMain for ut add 0e48540 Fix UT framework add bb4c0d1 Finish etcd registry add cabd9fc Fix etcd remoting etcd endpionts add 4576e92 ADD remoting/etcdv3 && registry/etcdv3 add f6e6268 fmt project add 4d3233c Update go.sum to Fix github.com/coreos/etcd@v3.3.13+incompatible: checksum mismatch add 97d0977 Fix etcd dep add a836ecf Fix etcd dependency add f69675e Fix etcd dependency add ca5a700 Fix depend with go.etcd.io add 8444dc4 Fix GOPROXY cause dependency mistake add e574713 Fix export GOPROXY= && retidy add 21f7c5f DEL go1.11 support add dff5a0a Fix fmt and remove use juju/errors add 86a197a Fix comflict in go.mod && fmt project add b0f3e19 Fix deadlock && len(string) ==0 && rename errors-> perrors add 8bdc29f support nacos registry add 5d51d2a coding standard add b27dac4 coding standard add 0c987d3 merge conflict add 7f87ea6 coding standard add d448aa8 add depandency to go.mod add 96bf3ea Merge pull request #151 from lzp0412/develop add 1e91d2a Fix go.sum conflict with develop branch add e9a168b Fix etcd event log format add 069d5fe Fix rename facede_test.go facade_test.go add 48e3abf Fix merge from local branch add f48a899 Merge pull request #148 from sxllwx/develop add 828dce7 Mod: translate Chinese comments to English add 9bcb593 Merge pull request #165 from amudong/develop add cd5ca05 [ISSUE #163] clean heartbeat from PendingResponse add a3a566b Fix go.sum add 4abb36f Merge pull request #166 from sxllwx/develop new bd8663b Merge: develop 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: common/constant/key.go | 12 + config/reference_config.go | 1 + config/registry_config.go| 11 +- config/service_config.go | 1 + go.mod | 33 ++- go.sum | 190 +++- protocol/dubbo/listener.go | 1 + registry/etcdv3/listener.go | 88 +++ registry/etcdv3/listener_test.go | 71 ++ registry/etcdv3/registry.go | 326 ++ registry/etcdv3/registry_test.go | 112 + registry/nacos/listener.go | 199 registry/nacos/registry.go | 176 ++ registry/nacos/registry_test.go | 174 ++ remoting/etcdv3/client.go| 480 +++ remoting/etcdv3/client_test.go | 366 + remoting/etcdv3/facade.go| 82 +++ remoting/etcdv3/listener.go | 217 ++ remoting/etcdv3/listener_test.go | 87 +++ remoting/listener.go | 1 + 20 files changed, 2618 insertions(+), 10 deletions(-) create mode 100644 registry/etcdv3/listener.go create mode 100644 registry/etcdv3/listener_test.go create mode 100644 registry/etcdv3/registry.go create mode 100644 registry/etcdv3/registry_test.go create mode 100644 registry/nacos/listener.go create mode 100644 registry/nacos/registry.go create mode 100644 registry/nacos/registry_test.go create mode 100644 remoting/etcdv3/client.go create mode 100644 remoting/etcdv3/client_test.go create mode 100644 remoting/etcdv3/facade.go create mode 100644 remoting/etcdv3/listener.go create mode 100644 remoting/etcdv3/listener_test.go
[dubbo-go] 01/01: Merge: develop
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git commit bd8663b2936565c46ae1a404ff9b85008396219b Merge: 3ad9a8d 4abb36f Author: AlexStocks AuthorDate: Wed Aug 14 12:02:15 2019 +0800 Merge: develop common/constant/key.go | 12 + config/reference_config.go | 1 + config/registry_config.go| 11 +- config/service_config.go | 1 + go.mod | 33 ++- go.sum | 190 +++- protocol/dubbo/listener.go | 1 + registry/etcdv3/listener.go | 88 +++ registry/etcdv3/listener_test.go | 71 ++ registry/etcdv3/registry.go | 326 ++ registry/etcdv3/registry_test.go | 112 + registry/nacos/listener.go | 199 registry/nacos/registry.go | 176 ++ registry/nacos/registry_test.go | 174 ++ remoting/etcdv3/client.go| 480 +++ remoting/etcdv3/client_test.go | 366 + remoting/etcdv3/facade.go| 82 +++ remoting/etcdv3/listener.go | 217 ++ remoting/etcdv3/listener_test.go | 87 +++ remoting/listener.go | 1 + 20 files changed, 2618 insertions(+), 10 deletions(-)
[dubbo-go] branch develop updated (9bcb593 -> 4abb36f)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from 9bcb593 Merge pull request #165 from amudong/develop new cd5ca05 [ISSUE #163] clean heartbeat from PendingResponse new a3a566b Fix go.sum new 4abb36f Merge pull request #166 from sxllwx/develop The 667 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: go.sum | 6 -- protocol/dubbo/listener.go | 1 + 2 files changed, 1 insertion(+), 6 deletions(-)
[dubbo] branch cloud-native updated: Dubbo cloud native (#4817)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/cloud-native by this push: new 12e1532 Dubbo cloud native (#4817) 12e1532 is described below commit 12e1532a725dd8704a72b61090a98edc9da3fcbc Author: Mercy Ma AuthorDate: Wed Aug 14 11:41:13 2019 +0800 Dubbo cloud native (#4817) * Polish apache/dubbo#4542 : [Enhancement] Adapt the Java standard Event/Listener mechanism * Polish apache/dubbo#4541 : [Feature] Add local File System DynamicConfigurationFactory‘s extension * Polish apache#4541 : Bugfix * Polish apache/dubbo#4541 : Optimization * Polish apache/dubbo#4541 : Add the compatibility for PollingWatchService on the some platforms * Polish apache/dubbo#4541 : Add delay publish without ThreadPoolExecutor * Polish apache/dubbo#4541 : Refactor the extension name * Polish apache/dubbo#4541 : Add remove ops * Polish apache/dubbo#4541 : Add testable constructor * Polish apache/dubbo#4541 : Add getConfigGroups method * Polish apache/dubbo#4610 : [Refactor] Refactor the bootstrap module * Polish apache/dubbo#4541 : Fix the nulling URL issue * Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager * Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager * Polish apache/dubbo#4622 : Support multiple configcenters * Polish apache/dubbo#4671 : ServiceNameMapping will not map the group, version and protocol * update referenceCount log (#4683) Add comments to support multiple shared connections * Polish /apache/dubbo#4687 : Remove the duplicated test code in dubbo-config-spring (#4688) * #4685 修改代码if判断false问题 if (hasException == false)修改成if (!hasException) (#4695) * Fixed Service annotation method parameters are not in effect (#4598) * keep demo simple, and switch to use zookeeper as registry center (#4705) * keep demo simple, and switch to use zookeeper as registry center * remove comment * @Reference auto-wires the instance of generic interface #4594 (#4677) * try to shorten maven output to make travis build pass (#4710) * use CountDownLatch to check zk registry if establish connection (#4589) * Minor change * Rename the extension name of WritableMetadataService * Polish apache/dubbo#4759 : [Refactor] Change the signature of methods of MetadataService #4759 * Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native # Conflicts: # dubbo-all/pom.xml # dubbo-bom/pom.xml # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java # dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-api/src/test/java/org/apache/dubbo/configcenter/mock/MockDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/model/MethodDefinition.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifier.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java # dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifierTest.java
[dubbo] branch master updated: issue #4238: provider服务端配置serialization="kryo"自定义异常类抛错时消费端捕获不到 (#4795)
This is an automated email from the ASF dual-hosted git repository. victory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 0e76eb0 issue #4238: provider服务端配置serialization="kryo"自定义异常类抛错时消费端捕获不到 (#4795) 0e76eb0 is described below commit 0e76eb000b92a8719413cd0eacabb70d4fb9f7a2 Author: Ian Luo AuthorDate: Wed Aug 14 10:08:04 2019 +0800 issue #4238: provider服务端配置serialization="kryo"自定义异常类抛错时消费端捕获不到 (#4795) --- .../apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java index 541a5e7..a8b058d 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java @@ -16,6 +16,7 @@ */ package org.apache.dubbo.common.serialize.kryo.utils; +import com.esotericsoftware.kryo.serializers.JavaSerializer; import org.apache.dubbo.common.serialize.kryo.CompatibleKryo; import org.apache.dubbo.common.serialize.support.SerializableClassRegistry; @@ -93,6 +94,7 @@ public abstract class AbstractKryoFactory implements KryoFactory { //kryo.setReferences(false); kryo.setRegistrationRequired(registrationRequired); +kryo.addDefaultSerializer(Throwable.class, new JavaSerializer()); kryo.register(Arrays.asList("").getClass(), new ArraysAsListSerializer()); kryo.register(GregorianCalendar.class, new GregorianCalendarSerializer()); kryo.register(InvocationHandler.class, new JdkProxySerializer());
[dubbo] branch master updated: use correct import (#4812)
This is an automated email from the ASF dual-hosted git repository. tswstarplanet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 9975bfc use correct import (#4812) 9975bfc is described below commit 9975bfc0e2f4026d297105563292ff18b013f976 Author: myPrecious AuthorDate: Wed Aug 14 05:06:41 2019 +0800 use correct import (#4812) --- .../apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java | 4 +++- .../java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandlerTest.java | 2 +- .../rest/integration/swagger/DubboSwaggerApiListingResourceTest.java | 3 ++- .../apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java index 1da2507..2ee7a89 100644 --- a/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java +++ b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java @@ -20,7 +20,9 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.registry.Registry; import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; public class MulticastRegistryFactoryTest { diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandlerTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandlerTest.java index 9c2d40d..73f8c68 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandlerTest.java @@ -26,7 +26,7 @@ import org.mockito.MockitoAnnotations; import java.lang.reflect.Method; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.when; public class InvokerInvocationHandlerTest { diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java index 64f8b5d..4fc185f 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java @@ -30,7 +30,8 @@ import java.net.URI; import java.util.HashSet; import java.util.Set; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class DubboSwaggerApiListingResourceTest { diff --git a/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java b/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java index 25fb639..5de73c1 100644 --- a/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java +++ b/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java @@ -26,7 +26,9 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; public class GsonJsonObjectOutputTest {
[dubbo-website] branch ecology-page updated (61fb366 -> b659fa5)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch ecology-page in repository https://gitbox.apache.org/repos/asf/dubbo-website.git. omit 61fb366 revert gitignore omit e592751 delete static files omit 962cefd update gitignore omit 6631510 add ecology-page omit cf9f34c Fix typo (#429) omit 9c5ca0e Fix classpath didn't update#409 (#431) omit c7cbfe5 Fix a typo in architecture page(#428) omit a6b4934 Separate the tables of maturity.md (#426) omit c2f9412 fix a typo and reformat the format (#425) omit e6e439a 覆盖规则需要添加版本 (#420) omit 3dd4933 Addd new docs (#424) omit 2f99615 add config center dev doc (#423) omit 7927661 Fix typos in maturity.md (#419) omit 4895708 Fix typo in sidebar title for Serialization (#418) omit ef991ad [Doc] Dubbo's Config Center model corresponding to different thirdparty products (#388) omit f1df26c Correct word separator to '-' (#417) omit d5b2314 Fix registry protocol description (#407) omit 0dc1740 fix Eco System some item url (#413) omit bb7f4b7 [Doc] update rest.md (#412) omit 9e420ce Fix typo for Maturity in menu list(#411) omit 5bc58d5 Update requirements.md (#406) omit bb39ed8 fix typos and make some changes on readme (#404) omit 5bec06c remove md_json folder omit 5b2a221 remove build folder omit 9709cb8 remove genereated htmls from source branch omit f3b7ed6 Fix dead links and typo (#400) omit 3ca0682 Website updated omit 43731b8 Update home.jsx (#394) omit 8496a46 Avoid global install for docsite (#378) omit e24be04 modify 2.7.2-release omit 81f61c0 Fix typo (#397) omit ae41535 fix wrong word (#396) omit bb941e7 'fix#389' (#390) omit bab5988 htmls generated from e03ad801d7ccd3df3e3918ea518390f013ca667f omit e03ad80 update stub-mock (#385) omit 72c4883 Add dubbo-erlang user doc (#382) omit 87f6b8f fixed service test blog link #379 (#383) omit c90ef9f add a committer (#384) omit cc5a045 nacos registry omit ff36d3f Feature nacos registry center (#381) omit 0dccd17 add nacos registry omit 9416627 Add Nacos registry center page. (#380) omit 1a57773 build htmls omit 07c8518 remove incubator (#377) omit 9b409db update README omit 03be83b rebuild website omit 1a3a85c Blog & Docs translation plan (#375) omit 627292e Fix some issues of Blog (#374) omit bebf6f8 add new page for docker image build (#373) omit 574428a new acticle: study dubbo network interfaces seletion (#363) omit 0d2f3c5 Update README.md (#366) omit d4e6dd9 fix 404 link (#372) omit 5fd8a83 [UPDATE] zkclient has remove in 2.7.x(#370) omit 5e66b18 Remove incubating word omit b02e30d fix doc issue, protocolconfig does not support specifying of token (#369) omit bd0881d Add title, keywords, descriptions to blogs (#362) omit 21c544f Fix typos in architecture.md & xml.md (#364) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/ecology-page (b659fa5) \ O -- O -- O (61fb366) 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: .gitignore |7 +- PULL_REQUEST_TEMPLATE.md |4 +- README.md | 15 +- blog/en-us/apachecon-na-2018.md|8 +- blog/en-us/download.md | 32 +- blog/en-us/dubbo-101.md|4 +- blog/en-us/dubbo-new-async.md |6 +- blog/en-us/dubbo2-js.md|4 +- blog/en-us/gsoc-2018.md|8 +- blog/en-us/prepare-an-apache-release.md| 50 +- blog/en-us/qcon-beijing-2018.md|7 - .../en-us/spring-boot-dubbo-start-stop-analysis.md | 12 +- blog/en-us/tracing-with-skywalking.md |2 +- blog/zh-cn/apachecon-na-2018.md|6 - blog/zh-cn/build-new-docker-image-in-dockerhub.md | 58 - blog/zh-cn/download.md | 24 +- blog/zh-cn/dubbo-27-features.md|2 +- blog/zh-cn/dubbo-admin.md |2 +- ...nsource.md => dubbo-contribue-to-opensource.md} | 18 +- blog/zh-cn/dubbo-integrate-with-hystrix.md |6 +- blog/zh-cn/dubbo-local-call.md |2 +- blog/zh-cn/dubbo-meet-arthas.md|6 +- blog/zh-cn/dubbo-network-interfaces.md | 526 - blog/zh-cn/dubbo-new-async.md |6 +- blog/zh-cn/dubbo-registry
[dubbo-website] branch ecology-page updated: revert gitignore
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch ecology-page in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/ecology-page by this push: new 61fb366 revert gitignore 61fb366 is described below commit 61fb366c9e146a4b0b2f208ee7eb902913148b21 Author: Xin Wang AuthorDate: Tue Aug 13 21:41:31 2019 +0800 revert gitignore --- .gitignore | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b1b1567..8b7e577 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ npm-debug.log *.orig package-lock.json *.iml -#/en-us/ -#/zh-cn/ -#build/ -#index.html -#md_json/ +/en-us/ +/zh-cn/ +build/ +index.html +md_json/
[dubbo-website] 03/03: delete static files
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch ecology-page in repository https://gitbox.apache.org/repos/asf/dubbo-website.git commit e592751f62e557d8d1ab842dea3c9a7b83bd7107 Author: Xin Wang AuthorDate: Tue Aug 13 21:40:44 2019 +0800 delete static files --- index.html| 33 - md_json/blog.json | 771 md_json/docs.json | 2110 - 3 files changed, 2914 deletions(-) diff --git a/index.html b/index.html deleted file mode 100644 index 9dd7634..000 --- a/index.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - http://www.apache.org/events/current-event";>Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the comp [...] - http://dubbo.apache.org/img/apache_logo.png"/> - -ASF -http://www.apache.org";>Foundation -http://www.apache.org/licenses/";>License -http://www.apache.org/events/current-event";>Events -http://www.apache.org/foundation/sponsorship.html";>Sponsorship -http://www.apache.org/foundation/thanks.html";>Thanks - - Copyright © 2018 The Apache Software Foundation. Apache and the Apache feather logo are trademarks of The Apache Software Foundation. - http://www.apache.org/security/";>Security - - - -window.rootPath = ''; -window.defaultLanguage = 'en-us'; -var lang = Cookies.get('docsite_language'); -if (!lang) { - lang = 'en-us'; -} -window.location = window.rootPath + '/' + lang; - - - \ No newline at end of file diff --git a/md_json/blog.json b/md_json/blog.json deleted file mode 100644 index 6cfad96..000 --- a/md_json/blog.json +++ /dev/null @@ -1,771 +0,0 @@ -{ - "en-us": [ -{ - "filename": "apachecon-na-2018.md", - "link": "/en-us/blog/apachecon-na-2018.html", - "meta": { -"title": "The ApacheCon NA schedule has been announced", -"keywords": "Dubbo, ApacheCon NA", -"description": "This article will introduce you that the ApacheCon NA schedule has been announced attention." - } -}, -{ - "filename": "download.md", - "link": "/en-us/blog/download.html", - "meta": { -"title": "Downloads", -"keywords": "Dubbo, Downloads, Version", -"description": "This article will introduce you how to understand the details of each version and upgrade matters needing attention." - } -}, -{ - "filename": "dubbo-101.md", - "link": "/en-us/blog/dubbo-101.html", - "meta": { -"title": "Your First Dubbo Demo", -"keywords": "Dubbo, RPC, RMI", -"description": "Modern distributed frameworks is similiar to RMI in terms of concepts. They both use Java interface as a service contract, archive service registry and discovery by a registry center, and Shield communication details by a proxy." - } -}, -{ - "filename": "dubbo-annotation.md", - "link": "/en-us/blog/dubbo-annotation.html", - "meta": { -"title": "Use Annotations In Dubbo", -"keywords": "Dubbo, Annotation, Spring", -"description": "This article will introduce you how to use annotations instead of XML to develop Dubbo applications, such as `@EnableDubbo`, `@Service` and `@Reference`." - } -}, -{ - "filename": "dubbo-basic-usage-dubbo-provider-configuration.md", - "link": "/en-us/blog/dubbo-basic-usage-dubbo-provider-configuration.html", - "meta": { -"title": "Dubbo Basic Usage -- Dubbo Provider Configuration", -"keywords": "Dubbo, Provider, Configuration", -"description": "This article will introduce you how to config Dubbo, by XML, property files, annotations or Java code." - } -}, -{ - "filename": "dubbo-fescar.md", - "link": "/en-us/blog/dubbo-fescar.html", - "meta": { -"title": "How to use Fescar to ensure consistency between Dubbo Microservices", -"keywords": "Dubbo,Fescar,Consistency", -"description": "This article will introduce you how to use Fescar to ensure consistency between Dubbo Microservices." - } -}, -{ - "filename": "dubbo-generic-invoke.md", - "link": "/en-us/blog/dubbo-generic-invoke.html", - "meta": { -"title": "Generic invoke of Dubbo", -"keywords": "Dubbo, Generic invoke", -"description": "This article introduces you when and how to use generic invoke of Dubbo." - } -}, -{ - "filename": "dubbo-invoke.md", - "link": "/en-us/blog/dubbo-invoke.html", - "meta": { -
[dubbo-website] branch ecology-page updated (b659fa5 -> e592751)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch ecology-page in repository https://gitbox.apache.org/repos/asf/dubbo-website.git. from b659fa5 feat: 优化移动端适配及窗口尺寸变化 add 21c544f Fix typos in architecture.md & xml.md (#364) add bd0881d Add title, keywords, descriptions to blogs (#362) add b02e30d fix doc issue, protocolconfig does not support specifying of token (#369) add 5e66b18 Remove incubating word add 5fd8a83 [UPDATE] zkclient has remove in 2.7.x(#370) add d4e6dd9 fix 404 link (#372) add 0d2f3c5 Update README.md (#366) add 574428a new acticle: study dubbo network interfaces seletion (#363) add bebf6f8 add new page for docker image build (#373) add 627292e Fix some issues of Blog (#374) add 1a3a85c Blog & Docs translation plan (#375) add 03be83b rebuild website add 9b409db update README add 07c8518 remove incubator (#377) add 1a57773 build htmls add 9416627 Add Nacos registry center page. (#380) add 0dccd17 add nacos registry add ff36d3f Feature nacos registry center (#381) add cc5a045 nacos registry add c90ef9f add a committer (#384) add 87f6b8f fixed service test blog link #379 (#383) add 72c4883 Add dubbo-erlang user doc (#382) add e03ad80 update stub-mock (#385) add bab5988 htmls generated from e03ad801d7ccd3df3e3918ea518390f013ca667f add bb941e7 'fix#389' (#390) add ae41535 fix wrong word (#396) add 81f61c0 Fix typo (#397) add e24be04 modify 2.7.2-release add 8496a46 Avoid global install for docsite (#378) add 43731b8 Update home.jsx (#394) add 3ca0682 Website updated add f3b7ed6 Fix dead links and typo (#400) add 9709cb8 remove genereated htmls from source branch add 5b2a221 remove build folder add 5bec06c remove md_json folder add bb39ed8 fix typos and make some changes on readme (#404) add 5bc58d5 Update requirements.md (#406) add 9e420ce Fix typo for Maturity in menu list(#411) add bb7f4b7 [Doc] update rest.md (#412) add 0dc1740 fix Eco System some item url (#413) add d5b2314 Fix registry protocol description (#407) add f1df26c Correct word separator to '-' (#417) add ef991ad [Doc] Dubbo's Config Center model corresponding to different thirdparty products (#388) add 4895708 Fix typo in sidebar title for Serialization (#418) add 7927661 Fix typos in maturity.md (#419) add 2f99615 add config center dev doc (#423) add 3dd4933 Addd new docs (#424) add e6e439a 覆盖规则需要添加版本 (#420) add c2f9412 fix a typo and reformat the format (#425) add a6b4934 Separate the tables of maturity.md (#426) add c7cbfe5 Fix a typo in architecture page(#428) add 9c5ca0e Fix classpath didn't update#409 (#431) add cf9f34c Fix typo (#429) new 6631510 add ecology-page new 962cefd update gitignore new e592751 delete static files The 3 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: .gitignore |7 +- PULL_REQUEST_TEMPLATE.md |4 +- README.md | 15 +- blog/en-us/apachecon-na-2018.md|8 +- blog/en-us/download.md | 32 +- blog/en-us/dubbo-101.md|4 +- blog/en-us/dubbo-new-async.md |6 +- blog/en-us/dubbo2-js.md|4 +- blog/en-us/gsoc-2018.md|8 +- blog/en-us/prepare-an-apache-release.md| 50 +- blog/en-us/qcon-beijing-2018.md|7 + .../en-us/spring-boot-dubbo-start-stop-analysis.md | 12 +- blog/en-us/tracing-with-skywalking.md |2 +- blog/zh-cn/apachecon-na-2018.md|6 + blog/zh-cn/build-new-docker-image-in-dockerhub.md | 58 + blog/zh-cn/download.md | 24 +- blog/zh-cn/dubbo-27-features.md|2 +- blog/zh-cn/dubbo-admin.md |2 +- ...source.md => dubbo-contribute-to-opensource.md} | 18 +- blog/zh-cn/dubbo-integrate-with-hystrix.md |6 +- blog/zh-cn/dubbo-local-call.md |2 +- blog/zh-cn/dubbo-meet-arthas.md|6 +- blog/zh-cn/dubbo-network-interfaces.md | 526 + blog/zh-cn/dubbo-new-async.md |6 +- blog/zh-cn/dubbo-registry-nacos-integration.md | 12 +- blog/zh-cn/dubbo-stub-mock.md |6 +- blog/zh-cn/dubbo2-js.md|4 +- blog/zh-cn/gsoc-20
[dubbo-go] 01/01: Merge: master
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git commit 6043f7956646f347b2059c79ab5438f7af88653e Merge: 91117f9 3ad9a8d Author: AlexStocks AuthorDate: Tue Aug 13 21:23:10 2019 +0800 Merge: master .gitignore | 1 + NOTICE | 2 +- README.md | 17 +- README_CN.md | 17 +- cluster/cluster_impl/available_cluster.go | 40 cluster/cluster_impl/available_cluster_invoker.go | 61 ++ .../cluster_impl/available_cluster_invoker_test.go | 88 + cluster/cluster_impl/base_cluster_invoker.go | 2 +- cluster/cluster_impl/broadcast_cluster.go | 40 cluster/cluster_impl/broadcast_cluster_invoker.go | 59 ++ .../cluster_impl/broadcast_cluster_invoker_test.go | 109 +++ cluster/cluster_impl/failback_cluster_invoker.go | 6 +- cluster/cluster_impl/failover_cluster_test.go | 3 +- cluster/cluster_impl/failsafe_cluster_invoker.go | 1 - cluster/loadbalance/least_active_test.go | 3 +- cluster/loadbalance/random_test.go | 6 +- common/constant/default.go | 2 + common/constant/key.go | 2 + common/logger/logger.go| 9 +- common/proxy/proxy.go | 4 +- common/proxy/proxy_test.go | 10 +- common/rpc_service.go | 15 +- common/rpc_service_test.go | 17 +- common/url.go | 5 + config/base_config.go | 40 ++-- config/base_config_test.go | 23 +-- config/config_loader.go| 36 ++-- config/config_loader_test.go | 19 +- config/consumer_config.go | 3 +- .../app/version.go => config/generic_service.go| 16 +- config/mock_rpcservice.go | 6 +- config/provider_config.go | 2 +- config/reference_config.go | 58 -- config/reference_config_test.go| 7 +- config/registry_config.go | 27 ++- .../registry_config_test.go| 51 +++-- config/service.go | 4 +- config/service_config.go | 41 ++-- config/service_config_test.go | 2 +- config/testdata/consumer_config.yml| 15 +- .../testdata/consumer_config_with_configcenter.yml | 4 +- config/testdata/provider_config.yml| 10 +- config_center/zookeeper/impl.go| 2 +- .../with-configcenter-go-client/app/client.go | 4 +- .../dubbo/with-configcenter-go-client}/app/user.go | 10 +- .../with-configcenter-go-client}/app/version.go| 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh| 0 .../assembly/mac/release.sh| 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh| 0 .../assembly/windows/release.sh| 0 .../assembly/windows/test.sh | 0 .../profiles/dev/client.yml| 2 - .../profiles/dev/log.yml | 0 .../profiles/release/client.yml| 2 - .../profiles/release/log.yml | 0 .../profiles/test/client.yml | 2 - .../profiles/test/log.yml | 0 .../with-configcenter-go-server/app/server.go | 2 +- .../dubbo/with-configcenter-go-server/app/user.go | 14 +- .../with-configcenter-go-server}/app/version.go| 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh| 0 .../assembly/mac/release.sh| 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh| 0 .../assembly/window
[dubbo-go] branch 1.1 updated (91117f9 -> 6043f79)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from 91117f9 Add: NOTICE add 6d932fd Add: NOTICE add 320c0e1 remove ineffassign add 8017536 remove ineffassign add f169566 Merge pull request #160 from xujianhai666/feat-remove-ineffassign add b1ce26e Add:support multi-implementation of service add 5ba44f9 Mod:modify rpcinvocation.go add e894ce1 Ftr: allow user set custom params to register to registry add e89f362 Fix:base_config.go setFieldValue bug add d7e948e Fix: unit test TestListener in listener_test.go add cc1f089 Fix:can not need children id add d59c087 Merge pull request #117 from hxmhlt/config_params add f3e33d7 Mrg:merge add 4fa45b5 Merge pull request #119 from fangyincheng/develop add 5cd0d98 Mrg:merge master add 00e2933 Imp:improve config & update getty & add connect timeout add dd1c82c Mod:change timer to wheel add dd2c0a9 Merge pull request #123 from fangyincheng/develop add b9a0f74 Add:GetLogger add 8238cab Merge pull request #125 from fangyincheng/develop add 39e0902 Add:for zookeeper registry cluster add 7be1601 Fmt:code formate add 72f Merge pull request #124 from hxmhlt/master add 368d2f3 Add:update readme add 05ea35f Mrg:merge add d0984fe Merge pull request #128 from fangyincheng/develop add a38d1fa merge master add 2d1eead change getty version to 1.2.0 add d233238 Merge pull request #134 from aliiohs/FixUpdateHessianVersion add cda1cf9 Mrg: update getty version add 7a24cc6 Merge remote-tracking branch 'upstream/master' into develop add 6a272cb Mod: adjust the log level add 3ff4931 Merge pull request #132 from fangyincheng/develop add 8a874cf upgrade getty: remove read queue add 8ea2e60 Merge pull request #137 from wongoo/develop add b7f6669 Mod: example modify, Make it easier for beginners to get started add 7aa7732 Mod: example modify, ci failed reslove add 306054c Mod: make simple more easy add 76a21c3 Mod: use task pool of getty add 06eb335 Merge remote-tracking branch 'upstream/develop' into develop add 152921f Mod: modify testdata add 8dd9f77 Mod: grpool config add 688a156 Merge pull request #141 from fangyincheng/develop add 680b584 Merge remote-tracking branch 'apache/develop' into modify_example add 4f20d72 resolve conflict add 3458324 Merge pull request #142 from hxmhlt/modify_example add d76440d fix hessian2 package after transfering to apache add 092399a Merge pull request #144 from wongoo/fix-hessian2-package add 4379d39 Mod: delete go1.11 in travis config add 22498ac Merge pull request #1 from apache/master add 47c4d20 Merge pull request #2 from apache/develop add 9751266 add go to java generic add 6cde06a fix test add 25b1512 update add e216bcb 优化 add 2cf9399 改成和java一样的使用方式 add 4df2f94 fix add e545dd0 add license add 48073dd change file name add 5e0ebf7 fix、and jsonrpc has no genericComsumer add 79775de Merge pull request #3 from apache/develop add 4dbeb2a fix bug with Temporary disposal add 0b111a5 Merge pull request #5 from apache/develop add 7f00a83 Merge branch 'master' of https://github.com/pantianying/dubbo-go add 09b9130 update add 81b8c35 change annotation add 96f5554 add generic filter add e9d7d86 Merge remote-tracking branch 'apache/develop' add 74e16bb add ut add 428fad4 ut be compatible with go 1.11 add 31c898f add Generic tag add d77c8e3 Merge branch 'develop' into master add 6e5df6c fix add a1e9a4d fix fmt add 068983b add generic config.Load support add c3d2c9c fix bug add 754252b add hessain.Object to genericfilter add d7be686 add support add 4271bcc fix add 1faca0c generic filter add slice support add cd1d707 change code style add 57cbc46 fix code add 0c6e36c fix bug add 8d7c1c1 Merge pull request #122 from pantianying/master add 168dbd9 Fix:bug in reference_config add 63e0369 Merge pull request #157 from hxmhlt/apache_dev add bac7c65 Mod:merge from develop add 39733d1 add available cluster support add 8194fe8 Merge pull request #155 from xujianhai666/feat-avail add a6d900f add broadcast cluster add 2bfc6a9 Merge pull request #158 from xujianhai666/feat-broadcast add ea373a7 Update README.md add ff8c560 Update README.md add 739c744 Update README_CN.md add 86687a1 Update README.md add 6bdab5d Update README_CN.md add 046699a Fix:bug in failbackClusterInvoker add ae23614 Update README.md add 6c8853c Update README.md add be25cd0 Update READM
[dubbo-go] branch develop updated: Mod: translate Chinese comments to English
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new 828dce7 Mod: translate Chinese comments to English new 9bcb593 Merge pull request #165 from amudong/develop 828dce7 is described below commit 828dce733b52d4462a5a77102a0212e63ad1c4b3 Author: amudong AuthorDate: Tue Aug 13 20:47:12 2019 +0800 Mod: translate Chinese comments to English --- cluster/cluster_impl/base_cluster_invoker.go | 2 +- config_center/zookeeper/impl.go | 2 +- .../zookeeper/dubbo/with-configcenter-go-client/app/client.go | 4 ++-- .../zookeeper/dubbo/with-configcenter-go-client/app/user.go | 2 +- .../zookeeper/dubbo/with-configcenter-go-server/app/server.go | 2 +- .../zookeeper/dubbo/with-configcenter-go-server/app/user.go | 2 +- .../zookeeper/jsonrpc/with-configcenter-go-client/app/client.go | 2 +- .../zookeeper/jsonrpc/with-configcenter-go-server/app/server.go | 2 +- examples/general/dubbo/go-client/app/client.go| 2 +- examples/general/dubbo/go-client/app/user.go | 2 +- examples/general/dubbo/go-server/app/server.go| 2 +- examples/general/dubbo/go-server/app/user.go | 4 ++-- .../java-client/src/main/java/com/ikurento/user/Consumer.java | 6 +++--- .../src/main/java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++-- .../src/main/java/com/ikurento/user/UserProviderImpl.java | 4 ++-- examples/general/jsonrpc/go-client/app/client.go | 2 +- examples/general/jsonrpc/go-server/app/server.go | 2 +- .../java-client/src/main/java/com/ikurento/user/Consumer.java | 6 +++--- .../src/main/java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++-- .../src/main/java/com/ikurento/user/UserProviderImpl.java | 4 ++-- examples/helloworld/dubbo/go-server/app/server.go | 2 +- .../src/main/java/com/ikurento/user/UserProviderImpl.java | 2 +- registry/zookeeper/listener.go| 2 +- registry/zookeeper/registry.go| 8 remoting/zookeeper/facade.go | 4 ++-- 25 files changed, 39 insertions(+), 39 deletions(-) diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go index 2426258..d42a099 100644 --- a/cluster/cluster_impl/base_cluster_invoker.go +++ b/cluster/cluster_impl/base_cluster_invoker.go @@ -84,7 +84,7 @@ func (invoker *baseClusterInvoker) checkWhetherDestroyed() error { } func (invoker *baseClusterInvoker) doSelect(lb cluster.LoadBalance, invocation protocol.Invocation, invokers []protocol.Invoker, invoked []protocol.Invoker) protocol.Invoker { - //todo:ticky connect 粘纸连接 + //todo:sticky connect if len(invokers) == 1 { return invokers[0] } diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go index ef0761e..f2827b2 100644 --- a/config_center/zookeeper/impl.go +++ b/config_center/zookeeper/impl.go @@ -196,7 +196,7 @@ func (r *zookeeperDynamicConfiguration) closeConfigs() { r.cltLock.Lock() defer r.cltLock.Unlock() logger.Infof("begin to close provider zk client") - // 先关闭旧client,以关闭tmp node + // Close the old client first to close the tmp node r.client.Close() r.client = nil } diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go index fb2e0ef..5da8506 100644 --- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go +++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go @@ -27,7 +27,7 @@ import ( ) import ( - "github.com/apache/dubbo-go-hessian2" + hessian "github.com/apache/dubbo-go-hessian2" ) import ( @@ -140,7 +140,7 @@ func initSignal() { os.Exit(1) }) - // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出,要么执行上面的超时函数程序强行退出 + // The program exits normally or timeout forcibly exits.// fmt.Println("app exit now...") return } diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go index 8140aca..5bddf1e 100644 --- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go +++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go @@ -83,7 +83,7 @@ type User struct {
[dubbo] 03/13: consul complement
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 2eaa132b20eae50f18e391a7418ec24f4cff439e Author: ken.lj AuthorDate: Mon Aug 12 16:52:46 2019 +0800 consul complement --- .../registry/consul/ConsulServiceDiscovery.java| 112 ++--- ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 + 2 files changed, 99 insertions(+), 14 deletions(-) diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java index 3f8f6bd..ce7efc6 100644 --- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java @@ -17,18 +17,20 @@ package org.apache.dubbo.registry.consul; import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.NamedThreadFactory; -import org.apache.dubbo.event.EventDispatcher; import org.apache.dubbo.event.EventListener; -import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.QueryParams; import com.ecwid.consul.v1.Response; import com.ecwid.consul.v1.agent.model.NewService; +import com.ecwid.consul.v1.health.HealthServicesRequest; import com.ecwid.consul.v1.health.model.HealthService; import java.util.Collections; @@ -36,15 +38,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static java.util.concurrent.Executors.newCachedThreadPool; -import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE; import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.CHECK_PASS_INTERVAL; import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.DEFAULT_CHECK_PASS_INTERVAL; import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.DEFAULT_DEREGISTER_TIME; @@ -59,22 +60,20 @@ import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.WATCH_TIME * 2019-07-31 */ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener { +private static final Logger logger = LoggerFactory.getLogger(ConsulServiceDiscovery.class); private ConsulClient client; -private long checkPassInterval; private ExecutorService notifierExecutor = newCachedThreadPool( new NamedThreadFactory("dubbo-consul-notifier", true)); -private ScheduledExecutorService ttlConsulCheckExecutor; - +private TtlScheduler ttlScheduler; +private long checkPassInterval; public ConsulServiceDiscovery(URL url) { String host = url.getHost(); int port = url.getPort() != 0 ? url.getPort() : DEFAULT_PORT; -client = new ConsulClient(host, port); checkPassInterval = url.getParameter(CHECK_PASS_INTERVAL, DEFAULT_CHECK_PASS_INTERVAL); -ttlConsulCheckExecutor = Executors.newSingleThreadScheduledExecutor(); -//ttlConsulCheckExecutor.scheduleAtFixedRate(this::checkPass, checkPassInterval / 8, -//checkPassInterval / 8, TimeUnit.MILLISECONDS); +client = new ConsulClient(host, port); +ttlScheduler = new TtlScheduler(checkPassInterval, client); } @Override @@ -94,7 +93,9 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener getInstances(String serviceName) throws NullPointerException { +List instances; +Response> response = getHealthServices(serviceName, -1, buildWatchTimeout(url)); +urls = convert(response.getValue(), url); +} + +private Response> getHealthServices(String service, long index, int watchTimeout) { +HealthServicesRequest request = HealthServicesRequest.newBuilder() +.setTag(SERVICE_TAG) +.setQueryParams(new QueryParams(watchTimeout, index)) +.setPassing(true) +.build(); +return client.getHealthServices(service, request); +} + privat
[dubbo] 07/13: support old registry model and new registry model
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 591e45a36e597d12a7fa09ca5687f00af035c058 Author: ken.lj AuthorDate: Mon Aug 12 19:44:38 2019 +0800 support old registry model and new registry model --- .../registry/support/AbstractRegistryFactory.java | 47 +++--- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java index 0458ada..70e7597 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java @@ -47,9 +47,12 @@ public abstract class AbstractRegistryFactory implements RegistryFactory { // The lock for the acquisition process of the registry private static final ReentrantLock LOCK = new ReentrantLock(); -// Registry Collection Map +// Registry Collection Map private static final Map REGISTRIES = new HashMap<>(); +// Registry Collection Map +private static final Map COMPATIBLE_REGISTRIES = new HashMap<>(); + /** * Get all registries * @@ -94,28 +97,42 @@ public abstract class AbstractRegistryFactory implements RegistryFactory { // Lock the registry access process to ensure a single instance of the registry LOCK.lock(); try { -Registry registry = REGISTRIES.get(key); -if (registry != null) { -return registry; -} -// creates an instance of ServiceOrientedRegistry if supported -// since 2.7.4 -registry = ServiceOrientedRegistry.create(url); -if (registry == null) { // If not supported, create the default Registry +boolean isServiceOriented = ServiceOrientedRegistry.supports(url); +if (isServiceOriented) { +Registry registry = REGISTRIES.get(key); +if (registry != null) { +return registry; +} //create registry by spi/ioc -registry = createRegistry(url); -} -if (registry == null) { -throw new IllegalStateException("Can not create registry " + url); +registry = ServiceOrientedRegistry.create(url); +if (registry == null) { +throw new IllegalStateException("Can not service-oriented registry " + url); +} +REGISTRIES.put(key, registry); +return registry; +} else { +return getCompatibleRegistry(key, url); } -REGISTRIES.put(key, registry); -return registry; } finally { // Release the lock LOCK.unlock(); } } +private Registry getCompatibleRegistry(String key, URL url) { +Registry registry = COMPATIBLE_REGISTRIES.get(key); +if (registry != null) { +return registry; +} +//create registry by spi/ioc +registry = createRegistry(url); +if (registry == null) { +throw new IllegalStateException("Can not create registry " + url); +} +COMPATIBLE_REGISTRIES.put(key, registry); +return registry; +} + protected abstract Registry createRegistry(URL url); }
[dubbo] 04/13: Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 0c33f3908bf63c12c9394aa85a3edf09998abb32 Merge: 2eaa132 4549e02 Author: ken.lj AuthorDate: Mon Aug 12 17:00:22 2019 +0800 Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 5 +- .../DynamicConfigurationServiceNameMapping.java| 6 +- .../apache/dubbo/metadata/MetadataConstants.java | 12 .../org/apache/dubbo/metadata/MetadataService.java | 4 +- .../org/apache/dubbo/metadata/MetadataUtil.java| 8 +-- .../dubbo/metadata/WritableMetadataService.java| 2 +- .../dubbo/metadata/report/MetadataReport.java | 13 ++-- .../metadata/report/MetadataReportInstance.java| 53 ++ .../BaseApplicationMetadataIdentifier.java | 50 ++ .../identifier/BaseServiceMetadataIdentifier.java | 69 +++ .../report/identifier/MetadataIdentifier.java | 49 ++--- .../identifier/ServiceMetadataIdentifier.java | 51 ++ .../identifier/SubscriberMetadataIdentifier.java | 55 +++ .../report/support/AbstractMetadataReport.java | 38 ++ .../store/InMemoryWritableMetadataService.java | 4 +- .../store/RemoteWritableMetadataService.java | 80 -- .../report/identifier/MetadataIdentifierTest.java | 12 ++-- .../support/AbstractMetadataReportFactoryTest.java | 15 ++-- .../report/support/AbstractMetadataReportTest.java | 34 ++--- .../store/RemoteWritableMeatadataServiceTest.java | 3 +- .../metadata/test/JTestMetadataReport4Test.java| 13 +++- .../store/consul/ConsulMetadataReport.java | 13 +++- .../metadata/store/etcd/EtcdMetadataReport.java| 13 +++- .../metadata/store/nacos/NacosMetadataReport.java | 13 +++- .../metadata/store/redis/RedisMetadataReport.java | 17 +++-- .../store/zookeeper/ZookeeperMetadataReport.java | 13 +++- dubbo-registry/dubbo-registry-api/pom.xml | 5 -- .../CompositeMetadataServiceURLBuilder.java| 1 + .../metadata/RefreshServiceMetadataCustomizer.java | 2 +- .../proxy/BaseMetadataServiceProxyFactory.java | 23 +++ .../proxy/DefaultMetadataServiceProxyFactory.java | 7 +- .../metadata/{ => proxy}/MetadataServiceProxy.java | 15 ++-- .../metadata/proxy/RemoteMetadataServiceProxy.java | 71 +++ .../proxy/RemoteMetadataServiceProxyFactory.java | 6 +- 34 files changed, 570 insertions(+), 205 deletions(-)
[dubbo] 06/13: Merge remote-tracking branch 'origin/cloud-native' into cloud-native
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit eb62f48a3f5e25c8b686ec2a9a8fe80a7f2d0f94 Merge: 705ee97 b2f3307 Author: ken.lj AuthorDate: Mon Aug 12 17:26:12 2019 +0800 Merge remote-tracking branch 'origin/cloud-native' into cloud-native # Conflicts: # dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java .../configcenter/AbstractDynamicConfiguration.java | 52 -- .../config/configcenter/DynamicConfiguration.java | 3 + .../file/FileSystemDynamicConfiguration.java | 101 +++- .../org/apache/dubbo/config/AbstractConfig.java| 15 ++ .../apache/dubbo/config/context/ConfigManager.java | 182 - .../ConfigurableMetadataServiceExporter.java | 1 - .../dubbo/metadata/MetadataServiceExporter.java| 1 - .../dubbo-metadata-definition-protobuf/pom.xml | 3 +- .../metadata/RefreshServiceMetadataCustomizer.java | 1 - .../registry/consul/AbstractConsulRegistry.java| 4 - .../dubbo/registry/etcd/EtcdServiceDiscovery.java | 1 - 11 files changed, 192 insertions(+), 172 deletions(-)
[dubbo] 08/13: change demo
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit a80f6fc61863abc501b4922306df86569d5e7e71 Author: ken.lj AuthorDate: Mon Aug 12 19:44:52 2019 +0800 change demo --- .../bootstrap/DubboServiceProviderBootstrap.java | 37 +++--- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java index fc2242e..2639d6b 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java @@ -19,7 +19,10 @@ package org.apache.dubbo.bootstrap; import org.apache.dubbo.bootstrap.rest.UserService; import org.apache.dubbo.bootstrap.rest.UserServiceImpl; import org.apache.dubbo.config.ProtocolConfig; -import org.apache.dubbo.config.builders.RegistryBuilder; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; + +import java.util.Arrays; /** * Dubbo Provider Bootstrap @@ -29,21 +32,46 @@ import org.apache.dubbo.config.builders.RegistryBuilder; public class DubboServiceProviderBootstrap { public static void main(String[] args) { +multipleRegistries(); +} + +private static void multipleRegistries() { ProtocolConfig restProtocol = new ProtocolConfig(); restProtocol.setName("rest"); restProtocol.setId("rest"); restProtocol.setPort(-1); +RegistryConfig interfaceRegistry = new RegistryConfig(); +interfaceRegistry.setId("interfaceRegistry"); +interfaceRegistry.setAddress("zookeeper://127.0.0.1:2181"); + +RegistryConfig serviceRegistry = new RegistryConfig(); +serviceRegistry.setId("serviceRegistry"); + serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry-type=service"); + +ServiceConfig echoService = new ServiceConfig<>(); +echoService.setInterface(EchoService.class.getName()); +echoService.setRef(new EchoServiceImpl()); +//echoService.setRegistries(Arrays.asList(interfaceRegistry, serviceRegistry)); + +ServiceConfig userService = new ServiceConfig<>(); +userService.setInterface(UserService.class.getName()); +userService.setRef(new UserServiceImpl()); +userService.setProtocol(restProtocol); +//userService.setRegistries(Arrays.asList(interfaceRegistry, serviceRegistry)); + + new DubboBootstrap() .application("dubbo-provider-demo") // Zookeeper in service registry type //.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) // Nacos //.registry("zookeeper", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service")) - .registry(RegistryBuilder.newBuilder().address("consul://127.0.0.1:8500?registry-type=service").build()) +.registries(Arrays.asList(interfaceRegistry, serviceRegistry)) +// .registry(RegistryBuilder.newBuilder().address("consul://127.0.0.1:8500?registry-type=service").build()) .protocol(builder -> builder.port(-1).name("dubbo")) -.service(builder -> builder.id("echo").interfaceClass(EchoService.class).ref(new EchoServiceImpl())) -.service(builder -> builder.id("user").interfaceClass(UserService.class).ref(new UserServiceImpl()).addProtocol(restProtocol)) +.service(echoService) +.service(userService) .start() .await(); } @@ -59,4 +87,5 @@ public class DubboServiceProviderBootstrap { private static void testDubboTansormation() { } + }
[dubbo] 05/13: consul service discovery complement
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 705ee975717e5e5dacfc9f8db8c02abb74e66e14 Author: ken.lj AuthorDate: Mon Aug 12 17:25:31 2019 +0800 consul service discovery complement --- .../registry/consul/ConsulServiceDiscovery.java| 28 ++ 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java index ce7efc6..503823a 100644 --- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java @@ -21,10 +21,12 @@ import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.NamedThreadFactory; import org.apache.dubbo.event.EventListener; +import org.apache.dubbo.registry.client.DefaultServiceInstance; import org.apache.dubbo.registry.client.ServiceDiscovery; import org.apache.dubbo.registry.client.ServiceInstance; import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; +import org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.QueryParams; @@ -36,6 +38,7 @@ import com.ecwid.consul.v1.health.model.HealthService; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; @@ -67,6 +70,7 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener getInstances(String serviceName) throws NullPointerException { -List instances; -Response> response = getHealthServices(serviceName, -1, buildWatchTimeout(url)); -urls = convert(response.getValue(), url); +Response> response = getHealthServices(serviceName, -1, buildWatchTimeout()); +return convert(response.getValue()); +} + +private List convert(List services) { +return services.stream() +.map(HealthService::getService) +.filter(service -> Objects.nonNull(service) && service.getMeta().containsKey(ServiceInstanceMetadataUtils.METADATA_SERVICE_URL_PARAMS_KEY)) +.map(service -> { +ServiceInstance instance = new DefaultServiceInstance( +service.getService(), +service.getAddress(), +service.getPort()); +instance.getMetadata().putAll(service.getMeta()); +return instance; +}) +.collect(Collectors.toList()); } private Response> getHealthServices(String service, long index, int watchTimeout) { @@ -170,11 +189,10 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener
[dubbo] 02/13: exclude injvm and registry protocol
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit e9a9e4711ea7b82f4c3a164c37059570ab391aaf Author: ken.lj AuthorDate: Mon Aug 12 16:52:28 2019 +0800 exclude injvm and registry protocol --- .../src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java index 4189238..457116c 100644 --- a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java +++ b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java @@ -773,14 +773,19 @@ public class DubboBootstrap { private String findOneProtocolForServiceInstance(Set protocols) { String result = null; for (String protocol : protocols) { -if ("rest".equals(protocol)) { +if ("rest".equalsIgnoreCase(protocol)) { result = protocol; break; } } if (result == null) { -result = protocols.iterator().next(); +for (String protocol : protocols) { +if (!"injvm".equalsIgnoreCase(protocol) && "registry".equalsIgnoreCase(protocol)) { +result = protocol; +break; +} +} } return result; }
[dubbo] 01/13: add rest demo
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit a12a5398850dac857c1021fa751801f993035287 Author: ken.lj AuthorDate: Mon Aug 12 16:52:04 2019 +0800 add rest demo --- dubbo-bootstrap/pom.xml| 13 +++- .../bootstrap/DubboServiceConsumerBootstrap.java | 8 ++- .../bootstrap/DubboServiceProviderBootstrap.java | 30 +++-- .../java/org/apache/dubbo/bootstrap/rest/User.java | 77 ++ .../apache/dubbo/bootstrap/rest/UserService.java | 47 + .../dubbo/bootstrap/rest/UserServiceImpl.java | 38 +++ 6 files changed, 205 insertions(+), 8 deletions(-) diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml index 0fd354d..2566294 100644 --- a/dubbo-bootstrap/pom.xml +++ b/dubbo-bootstrap/pom.xml @@ -33,6 +33,12 @@ ${project.parent.version} test + +org.apache.dubbo +dubbo-registry-consul +${project.parent.version} +test + org.apache.dubbo @@ -75,7 +81,12 @@ ${project.parent.version} test - + +org.apache.dubbo +dubbo-rpc-rest +${project.parent.version} +test + org.apache.dubbo dubbo-rpc-hessian diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java index 0f7a958..def1d07 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java @@ -16,6 +16,7 @@ */ package org.apache.dubbo.bootstrap; +import org.apache.dubbo.bootstrap.rest.UserService; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.context.ConfigManager; @@ -31,10 +32,11 @@ public class DubboServiceConsumerBootstrap { new DubboBootstrap() .application("dubbo-consumer-demo") // Zookeeper -.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo")) +//.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo")) // Nacos -//.registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=dubbo-provider-demo")) -.reference("ref", builder -> builder.interfaceClass(EchoService.class)) +.registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry-type=service&subscribed-services=dubbo-provider-demo")) +.reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo")) +.reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest")) .onlyRegisterProvider(true) .start() .await(); diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java index 15d1628..fc2242e 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java @@ -16,6 +16,11 @@ */ package org.apache.dubbo.bootstrap; +import org.apache.dubbo.bootstrap.rest.UserService; +import org.apache.dubbo.bootstrap.rest.UserServiceImpl; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.builders.RegistryBuilder; + /** * Dubbo Provider Bootstrap * @@ -24,17 +29,34 @@ package org.apache.dubbo.bootstrap; public class DubboServiceProviderBootstrap { public static void main(String[] args) { +ProtocolConfig restProtocol = new ProtocolConfig(); +restProtocol.setName("rest"); +restProtocol.setId("rest"); +restProtocol.setPort(-1); + new DubboBootstrap() .application("dubbo-provider-demo") // Zookeeper in service registry type -.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) +//.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) // Nacos //.registry("zookeeper", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service")) -//
[dubbo] 13/13: Merge remote-tracking branch 'origin/cloud-native' into cloud-native
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 36e1a1c0acf1625fa16204f1b4eeb8f45abfbd81 Merge: c8ca5b6 733473f Author: ken.lj AuthorDate: Tue Aug 13 20:30:53 2019 +0800 Merge remote-tracking branch 'origin/cloud-native' into cloud-native # Conflicts: # dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java # dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 10 +- .../org/apache/dubbo/config/AbstractConfig.java| 3 +- .../apache/dubbo/config/context/ConfigManager.java | 135 --- .../dubbo/config/context/ConfigManagerTest.java| 186 - .../apache/dubbo/metadata/MetadataConstants.java | 1 + .../identifier/BaseServiceMetadataIdentifier.java | 3 + .../identifier/ServiceMetadataIdentifier.java | 10 +- .../report/support/AbstractMetadataReport.java | 4 +- .../report/support/AbstractMetadataReportTest.java | 4 +- .../metadata/test/JTestMetadataReport4Test.java| 2 +- .../store/consul/ConsulMetadataReport.java | 2 +- .../metadata/store/etcd/EtcdMetadataReport.java| 2 +- .../metadata/store/nacos/NacosMetadataReport.java | 2 +- .../metadata/store/redis/RedisMetadataReport.java | 2 +- .../store/zookeeper/ZookeeperMetadataReport.java | 14 +- .../metadata/RefreshServiceMetadataCustomizer.java | 6 +- .../proxy/BaseMetadataServiceProxyFactory.java | 3 +- .../metadata/proxy/RemoteMetadataServiceProxy.java | 4 +- .../registry/service/ServiceOrientedRegistry.java | 2 + 19 files changed, 301 insertions(+), 94 deletions(-)
[dubbo] 12/13: demos
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit c8ca5b6d839f7759d09543a5a95e5082278d9860 Author: ken.lj AuthorDate: Tue Aug 13 20:20:43 2019 +0800 demos --- dubbo-demo/dubbo-call-sc&dubbo/README.md | 7 ++ dubbo-demo/dubbo-call-sc&dubbo/consumer/pom.xml| 81 + .../samples/microservices/sc/Application.java | 56 +++ .../dubbo/samples/microservices/sc/rest/User.java | 77 .../samples/microservices/sc/rest/UserService.java | 45 .../microservices/sc/rest/UserServiceImpl.java | 32 + .../consumer/src/main/resources/log4j.properties | 7 ++ dubbo-demo/dubbo-call-sc&dubbo/pom.xml | 61 dubbo-demo/dubbo-call-sc&dubbo/provider/pom.xml| 83 + .../samples/microservices/sc/Application.java | 15 .../configuration/RestTemplateConfiguration.java | 16 + .../microservices/sc/controller/MeController.java | 23 ++ .../sc/controller/PropertyController.java | 45 .../sc/controller/TestController.java | 46 .../samples/microservices/sc/feign/TestFeign.java | 13 .../provider/src/main/resources/application.yml| 6 ++ .../provider/src/main/resources/bootstrap.yml | 24 +++ dubbo-demo/dubbo-call-sc/README.md | 7 ++ dubbo-demo/dubbo-call-sc/consumer/pom.xml | 81 + .../samples/microservices/sc/Application.java | 55 ++ .../dubbo/samples/microservices/sc/rest/User.java | 77 .../samples/microservices/sc/rest/UserService.java | 45 .../microservices/sc/rest/UserServiceImpl.java | 32 + .../consumer/src/main/resources/log4j.properties | 7 ++ dubbo-demo/dubbo-call-sc/pom.xml | 61 dubbo-demo/dubbo-call-sc/provider/pom.xml | 83 + .../samples/microservices/sc/Application.java | 15 .../configuration/RestTemplateConfiguration.java | 16 + .../microservices/sc/controller/MeController.java | 23 ++ .../sc/controller/PropertyController.java | 45 .../sc/controller/TestController.java | 54 ++ .../samples/microservices/sc/controller/User.java | 60 .../samples/microservices/sc/feign/TestFeign.java | 13 .../provider/src/main/resources/application.yml| 6 ++ .../provider/src/main/resources/bootstrap.yml | 24 +++ dubbo-demo/pom.xml | 1 + dubbo-demo/sc-call-dubbo/consumer/pom.xml | 84 ++ .../com/bettercloud/spring/cloud/Application.java | 15 .../configuration/RestTemplateConfiguration.java | 17 + .../spring/cloud/controller/ClientController.java | 29 .../bettercloud/spring/cloud/feign/TestFeign.java | 12 .../src/main/resources/application-holding.yml | 3 + .../consumer/src/main/resources/application.yml| 7 ++ .../consumer/src/main/resources/bootstrap.yml | 26 +++ dubbo-demo/sc-call-dubbo/pom.xml | 61 dubbo-demo/sc-call-dubbo/provider/pom.xml | 33 + .../apache/dubbo/demo/provider/Application.java| 36 ++ .../dubbo/demo/provider/DemoServiceImpl.java | 34 + .../provider/src/main/resources/log4j.properties | 7 ++ .../dubbo/registry/dubbo/RegistryProtocolTest.java | 19 +++-- 50 files changed, 1718 insertions(+), 7 deletions(-) diff --git a/dubbo-demo/dubbo-call-sc&dubbo/README.md b/dubbo-demo/dubbo-call-sc&dubbo/README.md new file mode 100644 index 000..e42c3e7 --- /dev/null +++ b/dubbo-demo/dubbo-call-sc&dubbo/README.md @@ -0,0 +1,7 @@ +Dubbo自动发现并消费原生Spring Cloud服务,以Consul为注册中心。 + +* Spring MVC方式开发服务端 +* 以标准Dubbo方式开发客户端 +* 首先,定义标准JAX-RS注解的接口(与Provider端相对应) +* Registry指定 +* 同时消费,要使用Multiple Registry策略 \ No newline at end of file diff --git a/dubbo-demo/dubbo-call-sc&dubbo/consumer/pom.xml b/dubbo-demo/dubbo-call-sc&dubbo/consumer/pom.xml new file mode 100644 index 000..f1d9dfd --- /dev/null +++ b/dubbo-demo/dubbo-call-sc&dubbo/consumer/pom.xml @@ -0,0 +1,81 @@ + + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + +org.apache.dubbo +dubbo-call-sc +${revision} +../pom.xml + +4.0.0 + +consumer + + +true + + + + +org.apache.dubbo +dubbo-config-api +${project.parent.version} + + +org.apache.dubbo +dubbo-demo-interface +${project.parent.version} +
[dubbo] branch cloud-native updated (733473f -> 36e1a1c)
This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 733473f Merge branch 'cloud-native' of github.com:apache/incubator-dubbo into cloud-native new a12a539 add rest demo new e9a9e47 exclude injvm and registry protocol new 2eaa132 consul complement new 0c33f39 Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native new 705ee97 consul service discovery complement new eb62f48 Merge remote-tracking branch 'origin/cloud-native' into cloud-native new 591e45a support old registry model and new registry model new a80f6fc change demo new 9fdbad3 Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native new fd89c83 enhance supporting of multiple registries new 96786d8 demos new c8ca5b6 demos new 36e1a1c Merge remote-tracking branch 'origin/cloud-native' into cloud-native The 13 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-bootstrap/pom.xml| 13 +- .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 9 +- .../bootstrap/DubboServiceConsumerBootstrap.java | 12 +- .../bootstrap/DubboServiceProvider2Bootstrap.java | 6 +- .../bootstrap/DubboServiceProviderBootstrap.java | 62 -- .../DubboInterfaceConsumerBootstrap.java} | 27 +++-- .../java/org/apache/dubbo/bootstrap/rest/User.java | 77 .../apache/dubbo/bootstrap/rest/UserService.java | 45 +++ .../dubbo/bootstrap/rest/UserServiceImpl.java | 32 + .../rpc/cluster/directory/AbstractDirectory.java | 6 +- .../dubbo/common/constants/RegistryConstants.java | 6 +- .../org/apache/dubbo/common/utils/UrlUtils.java| 5 + .../dubbo/config/AbstractInterfaceConfig.java | 17 ++- .../org/apache/dubbo/config/ReferenceConfig.java | 6 +- .../dubbo/config/DubboConsumerBootstrap.java | 2 +- .../dubbo/config/DubboProviderBootstrap.java | 2 +- dubbo-demo/dubbo-call-sc&dubbo/README.md | 7 ++ .../consumer}/pom.xml | 27 ++--- .../samples/microservices/sc/Application.java | 56 + .../dubbo/samples/microservices/sc/rest/User.java | 77 .../samples/microservices/sc/rest/UserService.java | 45 +++ .../microservices/sc/rest/UserServiceImpl.java | 32 + .../consumer/src/main}/resources/log4j.properties | 0 .../pom.xml| 6 +- dubbo-demo/dubbo-call-sc&dubbo/provider/pom.xml| 83 + .../samples/microservices/sc/Application.java | 15 +++ .../configuration/RestTemplateConfiguration.java | 16 +++ .../microservices/sc/controller/MeController.java | 23 .../sc/controller/PropertyController.java | 45 +++ .../sc/controller/TestController.java | 46 +++ .../samples/microservices/sc/feign/TestFeign.java | 13 ++ .../provider/src/main/resources/application.yml| 6 + .../provider/src/main/resources/bootstrap.yml | 24 dubbo-demo/dubbo-call-sc/README.md | 7 ++ .../consumer}/pom.xml | 27 ++--- .../samples/microservices/sc/Application.java | 55 + .../dubbo/samples/microservices/sc/rest/User.java | 77 .../samples/microservices/sc/rest/UserService.java | 45 +++ .../microservices/sc/rest/UserServiceImpl.java | 32 + .../consumer/src/main}/resources/log4j.properties | 0 .../{dubbo-demo-api => dubbo-call-sc}/pom.xml | 6 +- dubbo-demo/dubbo-call-sc/provider/pom.xml | 83 + .../samples/microservices/sc/Application.java | 15 +++ .../configuration/RestTemplateConfiguration.java | 16 +++ .../microservices/sc/controller/MeController.java | 23 .../sc/controller/PropertyController.java | 45 +++ .../sc/controller/TestController.java | 54 + .../samples/microservices/sc/controller/User.java | 60 + .../samples/microservices/sc/feign/TestFeign.java | 13 ++ .../provider/src/main/resources/application.yml| 6 + .../provider/src/main/resources/bootstrap.yml | 24 dubbo-demo/pom.xml | 1 + dubbo-demo/sc-call-dubbo/consumer/pom.xml | 84 + .../com/bettercloud/spring/cloud/Application.java | 15 +++ .../configuration/RestTemplateConfiguration.java | 17 +++ .../spring/cloud/controller/ClientController.java | 29 + .../bettercloud/spring/cloud/feign/TestFeign.java | 12 ++ .../src/main/resources/application-holding.yml | 3 + .../consumer/s
[dubbo] 09/13: Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 9fdbad3537060dae8d221af3d4ffdae4c77ed7f2 Merge: a80f6fc 932cace Author: ken.lj AuthorDate: Mon Aug 12 19:45:45 2019 +0800 Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native .../apache/dubbo/config/context/ConfigManager.java | 30 ++ 1 file changed, 14 insertions(+), 16 deletions(-)
[dubbo] 10/13: enhance supporting of multiple registries
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit fd89c839447fdea828b7d0d248674281c45d019c Author: ken.lj AuthorDate: Tue Aug 13 20:13:48 2019 +0800 enhance supporting of multiple registries --- .../rpc/cluster/directory/AbstractDirectory.java | 6 +-- .../dubbo/common/constants/RegistryConstants.java | 6 ++- .../org/apache/dubbo/common/utils/UrlUtils.java| 5 +++ .../dubbo/config/AbstractInterfaceConfig.java | 17 ++-- .../org/apache/dubbo/config/ReferenceConfig.java | 6 +-- .../dubbo/config/DubboConsumerBootstrap.java | 2 +- .../dubbo/config/DubboProviderBootstrap.java | 2 +- .../dubbo/qos/protocol/QosProtocolWrapper.java | 6 +-- .../registry/integration/RegistryProtocol.java | 32 ++- .../ServiceOrientedRegistry.java | 9 - .../service/ServiceOrientedRegistryFactory.java| 38 + .../service/ServiceOrientedRegistryProtocol.java | 47 ++ .../registry/support/AbstractRegistryFactory.java | 42 +-- .../org.apache.dubbo.registry.RegistryFactory | 1 + .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 3 +- .../support/ServiceOrientedRegistryTest.java | 1 + .../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 6 +-- .../rpc/protocol/ProtocolListenerWrapper.java | 6 +-- 18 files changed, 158 insertions(+), 77 deletions(-) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java index 4e304e9..36110c9 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java @@ -20,6 +20,7 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcException; @@ -31,9 +32,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.apache.dubbo.rpc.cluster.Constants.REFER_KEY; import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY; -import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL; +import static org.apache.dubbo.rpc.cluster.Constants.REFER_KEY; /** * Abstract implementation of Directory: Invoker list returned from this Directory's list method have been filtered by Routers @@ -65,7 +65,7 @@ public abstract class AbstractDirectory implements Directory { throw new IllegalArgumentException("url == null"); } -if (url.getProtocol().equals(REGISTRY_PROTOCOL)) { +if (UrlUtils.isRegistry(url)) { Map queryMap = StringUtils.parseQueryString(url.getParameterAndDecoded(REFER_KEY)); this.url = url.addParameters(queryMap).removeParameter(MONITOR_KEY); } else { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java index 69aa605..b0d89b9 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java @@ -58,7 +58,7 @@ public interface RegistryConstants { * * @since 2.7.4 */ -String REGISTRY_TYPE_KEY = "registry-type"; +String REGISTRY_TYPE_KEY = "registry.type"; /** * The parameter value of Service-Oriented Registry type @@ -67,12 +67,14 @@ public interface RegistryConstants { */ String SERVICE_REGISTRY_TYPE = "service"; +String SERVICE_REGISTRY_PROTOCOL = "service-oriented-registry"; + /** * The parameter key of the subscribed service names for Service-Oriented Registry * * @since 2.7.4 */ -String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services"; +String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed.services"; /** diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java index 91dc387..7a2f99c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java @@ -49,8 +49,10 @@ import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_CATEGO import static org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL; import s
[dubbo] 11/13: demos
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 96786d8a9a61970a8793fa3990e14e6f31cc526b Author: ken.lj AuthorDate: Tue Aug 13 20:14:09 2019 +0800 demos --- .../bootstrap/DubboServiceConsumerBootstrap.java| 6 +++--- .../bootstrap/DubboServiceProvider2Bootstrap.java | 6 +++--- .../bootstrap/DubboServiceProviderBootstrap.java| 8 .../DubboInterfaceConsumerBootstrap.java} | 21 +++-- .../apache/dubbo/bootstrap/rest/UserService.java| 2 -- .../dubbo/bootstrap/rest/UserServiceImpl.java | 6 -- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java index def1d07..f082192 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java @@ -32,9 +32,9 @@ public class DubboServiceConsumerBootstrap { new DubboBootstrap() .application("dubbo-consumer-demo") // Zookeeper -//.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo")) +.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service&subscribed.services=dubbo-provider-demo")) // Nacos -.registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry-type=service&subscribed-services=dubbo-provider-demo")) +//.registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1")) .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo")) .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest")) .onlyRegisterProvider(true) @@ -43,7 +43,7 @@ public class DubboServiceConsumerBootstrap { ConfigManager configManager = ConfigManager.getInstance(); -ReferenceConfig referenceConfig = configManager.getReferenceConfig("ref"); +ReferenceConfig referenceConfig = configManager.getReferenceConfig("echo"); EchoService echoService = referenceConfig.get(); diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java index cc2948e..ad87adb 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java @@ -27,10 +27,10 @@ public class DubboServiceProvider2Bootstrap { new DubboBootstrap() .application("dubbo-provider-demo") // Zookeeper in service registry type -.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service")) +.registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service")) // Nacos -//.registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service")) -// .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry-type=service").build()) +//.registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service")) +// .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry.type=service").build()) .protocol(builder -> builder.port(20885).name("dubbo")) .service(builder -> builder.id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl())) .start() diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java index 2639d6b..dd2060c 100644 --- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java +++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java @@ -47,7 +47,7 @@ public class DubboServiceProviderBootstrap { RegistryConfig serviceRegistry = new RegistryConfig(); serviceRegistry.setId("serviceRegistry"); - serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry-type=service"); + serviceRegistry
[dubbo-go] branch master updated: Modify Chinese comments to English
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/master by this push: new 003f80d Modify Chinese comments to English new 3ad9a8d Merge pull request #164 from amudong/master 003f80d is described below commit 003f80db806c51d23d35be7c3859d264d70d039c Author: lindongyu1 AuthorDate: Tue Aug 13 20:04:26 2019 +0800 Modify Chinese comments to English --- cluster/cluster_impl/base_cluster_invoker.go | 2 +- config_center/zookeeper/impl.go | 2 +- .../dubbo/with-configcenter-go-client/app/client.go | 4 ++-- .../dubbo/with-configcenter-go-client/app/user.go| 2 +- .../dubbo/with-configcenter-go-server/app/server.go | 2 +- .../dubbo/with-configcenter-go-server/app/user.go| 2 +- .../jsonrpc/with-configcenter-go-client/app/client.go| 2 +- .../jsonrpc/with-configcenter-go-server/app/server.go| 2 +- examples/general/dubbo/go-client/app/client.go | 2 +- examples/general/dubbo/go-client/app/user.go | 2 +- examples/general/dubbo/go-server/app/server.go | 2 +- examples/general/dubbo/go-server/app/user.go | 4 ++-- .../src/main/java/com/ikurento/user/Consumer.java| 6 +++--- .../java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++-- .../main/java/com/ikurento/user/UserProviderImpl.java| 4 ++-- examples/general/jsonrpc/go-client/app/client.go | 2 +- examples/general/jsonrpc/go-server/app/server.go | 2 +- .../src/main/java/com/ikurento/user/Consumer.java| 6 +++--- .../java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++-- .../main/java/com/ikurento/user/UserProviderImpl.java| 4 ++-- examples/helloworld/dubbo/go-server/app/server.go| 2 +- .../main/java/com/ikurento/user/UserProviderImpl.java| 2 +- registry/zookeeper/listener.go | 2 +- registry/zookeeper/registry.go | 16 +--- remoting/zookeeper/facade.go | 4 ++-- 25 files changed, 44 insertions(+), 42 deletions(-) diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go index 2426258..d42a099 100644 --- a/cluster/cluster_impl/base_cluster_invoker.go +++ b/cluster/cluster_impl/base_cluster_invoker.go @@ -84,7 +84,7 @@ func (invoker *baseClusterInvoker) checkWhetherDestroyed() error { } func (invoker *baseClusterInvoker) doSelect(lb cluster.LoadBalance, invocation protocol.Invocation, invokers []protocol.Invoker, invoked []protocol.Invoker) protocol.Invoker { - //todo:ticky connect 粘纸连接 + //todo:sticky connect if len(invokers) == 1 { return invokers[0] } diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go index ef0761e..f2827b2 100644 --- a/config_center/zookeeper/impl.go +++ b/config_center/zookeeper/impl.go @@ -196,7 +196,7 @@ func (r *zookeeperDynamicConfiguration) closeConfigs() { r.cltLock.Lock() defer r.cltLock.Unlock() logger.Infof("begin to close provider zk client") - // 先关闭旧client,以关闭tmp node + // Close the old client first to close the tmp node r.client.Close() r.client = nil } diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go index fb2e0ef..d27af7a 100644 --- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go +++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go @@ -27,7 +27,7 @@ import ( ) import ( - "github.com/apache/dubbo-go-hessian2" + hessian "github.com/apache/dubbo-go-hessian2" ) import ( @@ -140,7 +140,7 @@ func initSignal() { os.Exit(1) }) - // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出,要么执行上面的超时函数程序强行退出 + // The program exits normally or timeout forcibly exits. fmt.Println("app exit now...") return } diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go index 8140aca..5bddf1e 100644 --- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go +++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go @@ -83,7 +83,7 @@ type User struct { Name string Age int32 Time time.Time - Sex Gender // 注意此处,java enum Object <--> go string + Sex Gender // notice: java enum Object <--> go string } func (u User) String()
svn commit: r35219 - in /dev/dubbo/dubbo-go/1.1.0: apache-dubbo-go-1.1.0-source-release.zip apache-dubbo-go-1.1.0-source-release.zip.asc apache-dubbo-go-1.1.0-source-release.zip.sha512
Author: alexstocks Date: Tue Aug 13 10:33:05 2019 New Revision: 35219 Log: using new v1.1.0 release Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip == Binary files - no diff available. Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc == --- dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc (original) +++ dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc Tue Aug 13 10:33:05 2019 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEECy/46JeRMqSHuBhFDZY7Nbfx5okFAl1SeEoACgkQDZY7Nbfx -5onsBBAAi1nPuqP2J+s/CG1foIAjHa91RnVxMUmnBR1xOJbvqeSZEbrltpWNTZs4 -FTwcT1qxoqrri4/2pkNoTZXkolN92fE37199mVuaVGkTZEb27BNASfDa89ssKUlL -0fPbte3Ue2eQp1B526u9c1oqhIiF5K5ztf2SPxj5yC2lXhzGambCWcZ73IZTBy7O -XYnTGvbEpZjozMKcZLFPdYBjOFSVB6zqz1rfB90PqqVqX07RlG9gu+0K9iJe8GU0 -mXL2Iku2Eg4XqtguhAQ/o9cLtHaRkS42wGMKZ9X51RmMzSGPpi1ZAzUZ2xy18UlH -JLZo0N7+Lli37oFKAxIqUwSq6XIUD0DWmVPCoZhT0KBek1TZJ9iPeZc3MZGkplWH -XmYyn7bBMLnhREXkttnzUoKAbRODJosOEePLI7t4rnBkYzNJWZws65iqkYDhFMlz -DU6ezeC0YABSFEtpdSHToImac4TSj2cL2ol9lEq2+XAwcnA3htzSScdVQUBc6HCA -yc29SpKru7BHXC/U0bLbkUAtJV8871DYRe/o4NN0jOhXMSYSI7xa4+FwhgjjoUdM -h6Lvta9UmXz1u45JLXk4rFwcJ2yhwdCTQ+zucLayla5T2O1FUumyff8uLGmHJBlu -hlffWoVfUuWGTT8S/nRM9RhetI/zyiU7Yp/0G3oEmtikVI9JMKs= -=SXb9 +iQIzBAABCAAdFiEECy/46JeRMqSHuBhFDZY7Nbfx5okFAl1SkbcACgkQDZY7Nbfx +5okg0w//fQbBYpbOQHxKDaMahQaaKukJ7UKx02T/Ld32OvsXiHrIhCFCOhLlc5v8 +M9yTsmjudmt/YlRwkXTzSB2vOlf9oZdntW2Ik3rVBthgFvYoNLbSVH1e2880PZQD +oX4Do4sJgmgtXwvoBsFNnXsOA3lemsanqsdeGyeHfNtfuWK0ErchrtxHa8NDqx4x +jaTQGZMN8SuU0jKmGkuxK5WG/UrZYGIf3wErVIUf6zc9pVWGWFtx8LTVeYaxLsKF +mpx9NZvlh2M3Oxoxxoj2LpCHYAvnszrDkFEhLuhL12XmjjbNifkisM+PcBZKsgaS +hlfNQKgAEaBNh6EqBzzdXNFNOQtKm0If/Zp3o9VLZKDLd5sxtacV0bJsZkUSAuv+ +erybv29VUM7r6wrJVsb5CGJaRZBDBRgN0WjXUomoKM6g1IG5+BqB48HtsnLTnyT5 +RFVoHIQPjrKsP4HjOnHhmAwLrvyCyt+rJdHymifmcASofgfMGLNrm0WDPxd5FPBY +mltN/XZJJlifKvPlKAxQzPg/7ZAEYgwJ4ARiJMw+jmehQrrxklRkjN+ifgIn1AJ8 +ZG9eJPuvl9AYqiN8N9mDAHC7aD04uuhP75LC9DPUwAE1OH124I14OhbOAzLJT6Ma +S9Q9ZPkkqqkhaxM1tsmhq56KCuNnSGwgTPvU/YPT/AgYXoFb4oM= +=zkvu -END PGP SIGNATURE- Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 == --- dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 (original) +++ dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 Tue Aug 13 10:33:05 2019 @@ -1 +1 @@ -b457565b34336911b125e5b9551c6fcca10542c07a455c84481a288236ccd636e3018880d935411faa82be75549f781480336265cb83966b14b24215c45da63c apache-dubbo-go-1.1.0-source-release.zip +e79103ac53559056d0bce011c03c5f15a78dc078a7a0b36cc730eb05f9c7138e7a5e5fe698acaf32859ec8b861a7880ca8b313b8cdcd8175aa886c0fcf02d706 apache-dubbo-go-1.1.0-source-release.zip
[dubbo-go] annotated tag v1.1.0 updated (91117f9 -> 061daca)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to annotated tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. *** WARNING: tag v1.1.0 was modified! *** from 91117f9 (commit) to 061daca (tag) tagging 91117f91fc30fe74cb0412c16256bd72eb1b6579 (commit) replaces v0.1.2 by AlexStocks on Tue Aug 13 18:22:13 2019 +0800 - Log - the first release after transferred to apache --- No new revisions were added by this update. Summary of changes:
[dubbo-go] annotated tag v1.1.0 deleted (was 2c1ae5b)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to annotated tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. *** WARNING: tag v1.1.0 was deleted! *** tag was 2c1ae5b The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r35218 - in /dev/dubbo/dubbo-go/1.1.0: apache-dubbo-go-1.1.0-source-release.zip apache-dubbo-go-1.1.0-source-release.zip.asc apache-dubbo-go-1.1.0-source-release.zip.sha512
Author: alexstocks Date: Tue Aug 13 08:44:42 2019 New Revision: 35218 Log: Add: notice Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip == Binary files - no diff available. Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc == --- dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc (original) +++ dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc Tue Aug 13 08:44:42 2019 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEECy/46JeRMqSHuBhFDZY7Nbfx5okFAl1SctMACgkQDZY7Nbfx -5olZ6w//Vecg3uGq5dyxoIjgU/dtbH1MzEn45d3HkDWfnUAVJj7iHoAdibFcQtKh -aTsmssLvw1HyxZOWuPApJPMshxxI77LUDRub7+p5oqfmf2zLTdFnydUxN9cGD5eY -uFtLFA8P2Vb8BnPz7LqNIozpPgTcYaMv2Q0sYDT849mCLlZhO0CpB56WYnI8HNOe -smNmtmizBcswEnjdGsrWex6BHM+WGiI9YcRLeC3ydQQ/xid9pPM1Nddjo8a7cSwn -xUOhrCuRqcTu1tIF0MFf+uJUsmqwATGmJlfC9pCDMg0z6blRl5YXtGwaccdQNf/n -HrNmJy7pCDTeAgW7pmL+C7ujSymcyAPzRX5OWDu/NLuAr3fmOSAXNKZRmbG33NPN -4A2V6WLXmYKvbPcuv4J/rk/nT0RTpHydsVEwfwesL4awgh3QysLLg+J3ArSA4QOV -4JZKa/KwqOo1N9/8DY4XzGo/RZico0UukonObbzITQbIcBs7MSzeZcZbnHOEXgCc -eD6JN5KWUhTYi1yeRp4k9j98SOuwP5GfOydHxTkYQoBynqbHoNdFZ43zp+e6c/dv -LD0c/Pdacw1c0Ht1MybX/pCmzAzaUXdY4sO6FeVo51wcPx4ZpTnw2Bwr1MOXk1Vo -zsYMGAAPZwcUNiLlX9CSWhzEc2Tc7Mz2C3Ip1VlyfEdB73YdevU= -=5b0N +iQIzBAABCAAdFiEECy/46JeRMqSHuBhFDZY7Nbfx5okFAl1SeEoACgkQDZY7Nbfx +5onsBBAAi1nPuqP2J+s/CG1foIAjHa91RnVxMUmnBR1xOJbvqeSZEbrltpWNTZs4 +FTwcT1qxoqrri4/2pkNoTZXkolN92fE37199mVuaVGkTZEb27BNASfDa89ssKUlL +0fPbte3Ue2eQp1B526u9c1oqhIiF5K5ztf2SPxj5yC2lXhzGambCWcZ73IZTBy7O +XYnTGvbEpZjozMKcZLFPdYBjOFSVB6zqz1rfB90PqqVqX07RlG9gu+0K9iJe8GU0 +mXL2Iku2Eg4XqtguhAQ/o9cLtHaRkS42wGMKZ9X51RmMzSGPpi1ZAzUZ2xy18UlH +JLZo0N7+Lli37oFKAxIqUwSq6XIUD0DWmVPCoZhT0KBek1TZJ9iPeZc3MZGkplWH +XmYyn7bBMLnhREXkttnzUoKAbRODJosOEePLI7t4rnBkYzNJWZws65iqkYDhFMlz +DU6ezeC0YABSFEtpdSHToImac4TSj2cL2ol9lEq2+XAwcnA3htzSScdVQUBc6HCA +yc29SpKru7BHXC/U0bLbkUAtJV8871DYRe/o4NN0jOhXMSYSI7xa4+FwhgjjoUdM +h6Lvta9UmXz1u45JLXk4rFwcJ2yhwdCTQ+zucLayla5T2O1FUumyff8uLGmHJBlu +hlffWoVfUuWGTT8S/nRM9RhetI/zyiU7Yp/0G3oEmtikVI9JMKs= +=SXb9 -END PGP SIGNATURE- Modified: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 == --- dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 (original) +++ dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.sha512 Tue Aug 13 08:44:42 2019 @@ -1 +1 @@ -65fa98fa435ab5ad94c353c600cd3eb84c43a0c2f571d21e62ad0c3589e8896219ee00dfaabc61bdf4bdcda33df8b6e7835c36e81d6dcdc0e7e2ce7f79146997 apache-dubbo-go-1.1.0-source-release.zip +b457565b34336911b125e5b9551c6fcca10542c07a455c84481a288236ccd636e3018880d935411faa82be75549f781480336265cb83966b14b24215c45da63c apache-dubbo-go-1.1.0-source-release.zip
[dubbo-go] branch master updated: Mod: rename notice
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/master by this push: new 2d24b6b Mod: rename notice 2d24b6b is described below commit 2d24b6b8cab83a9e5de6334db6bed87a48b801ac Author: AlexStocks AuthorDate: Tue Aug 13 16:42:21 2019 +0800 Mod: rename notice --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 5905fb8e..a9bd809 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache Dubbo +Apache Dubbo Go Copyright 2018-2019 The Apache Software Foundation This product includes software developed at
[dubbo-go] branch master updated: Add: NOTICE
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/master by this push: new 6d932fd Add: NOTICE new 2f327e0 Merge branch 'master' of https://github.com/apache/dubbo-go 6d932fd is described below commit 6d932fd34190e0c3b348fde90c767e248dd167e1 Author: AlexStocks AuthorDate: Tue Aug 13 16:38:18 2019 +0800 Add: NOTICE --- NOTICE | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE b/NOTICE new file mode 100644 index 000..5905fb8e --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Dubbo +Copyright 2018-2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/).
[dubbo-go] branch 1.1 updated: Add: NOTICE
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/1.1 by this push: new 91117f9 Add: NOTICE 91117f9 is described below commit 91117f91fc30fe74cb0412c16256bd72eb1b6579 Author: AlexStocks AuthorDate: Tue Aug 13 16:37:50 2019 +0800 Add: NOTICE --- NOTICE | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE b/NOTICE new file mode 100644 index 000..5905fb8e --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Dubbo +Copyright 2018-2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/).
svn commit: r35217 - /dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc
Author: alexstocks Date: Tue Aug 13 08:23:47 2019 New Revision: 35217 Log: Add: sign for apache-dubbo-go-1.1.0-source-release.zip Added: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc Added: dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc == --- dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc (added) +++ dev/dubbo/dubbo-go/1.1.0/apache-dubbo-go-1.1.0-source-release.zip.asc Tue Aug 13 08:23:47 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEECy/46JeRMqSHuBhFDZY7Nbfx5okFAl1SctMACgkQDZY7Nbfx +5olZ6w//Vecg3uGq5dyxoIjgU/dtbH1MzEn45d3HkDWfnUAVJj7iHoAdibFcQtKh +aTsmssLvw1HyxZOWuPApJPMshxxI77LUDRub7+p5oqfmf2zLTdFnydUxN9cGD5eY +uFtLFA8P2Vb8BnPz7LqNIozpPgTcYaMv2Q0sYDT849mCLlZhO0CpB56WYnI8HNOe +smNmtmizBcswEnjdGsrWex6BHM+WGiI9YcRLeC3ydQQ/xid9pPM1Nddjo8a7cSwn +xUOhrCuRqcTu1tIF0MFf+uJUsmqwATGmJlfC9pCDMg0z6blRl5YXtGwaccdQNf/n +HrNmJy7pCDTeAgW7pmL+C7ujSymcyAPzRX5OWDu/NLuAr3fmOSAXNKZRmbG33NPN +4A2V6WLXmYKvbPcuv4J/rk/nT0RTpHydsVEwfwesL4awgh3QysLLg+J3ArSA4QOV +4JZKa/KwqOo1N9/8DY4XzGo/RZico0UukonObbzITQbIcBs7MSzeZcZbnHOEXgCc +eD6JN5KWUhTYi1yeRp4k9j98SOuwP5GfOydHxTkYQoBynqbHoNdFZ43zp+e6c/dv +LD0c/Pdacw1c0Ht1MybX/pCmzAzaUXdY4sO6FeVo51wcPx4ZpTnw2Bwr1MOXk1Vo +zsYMGAAPZwcUNiLlX9CSWhzEc2Tc7Mz2C3Ip1VlyfEdB73YdevU= +=5b0N +-END PGP SIGNATURE-
svn commit: r35216 - /dev/dubbo/dubbo-go/1.1.0/KEYS
Author: alexstocks Date: Tue Aug 13 07:00:44 2019 New Revision: 35216 Log: Del: keys in dubbo-go Removed: dev/dubbo/dubbo-go/1.1.0/KEYS