[dubbo] branch master updated: fix some typos in LeastActiveLoadBalance (#5044)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 39edc80 fix some typos in LeastActiveLoadBalance (#5044)
39edc80 is described below
commit 39edc80716aaa998eedcc53a2997fa5f7ac2b0ae
Author: LHearen
AuthorDate: Wed Sep 11 12:01:46 2019 +0800
fix some typos in LeastActiveLoadBalance (#5044)
---
.../dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
index 0706053..f9283fb 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
@@ -48,9 +48,9 @@ public class LeastActiveLoadBalance extends
AbstractLoadBalance {
int[] leastIndexes = new int[length];
// the weight of every invokers
int[] weights = new int[length];
-// The sum of the warmup weights of all the least active invokes
+// The sum of the warmup weights of all the least active invokers
int totalWeight = 0;
-// The weight of the first least active invoke
+// The weight of the first least active invoker
int firstWeight = 0;
// Every least active invoker has the same weight value?
boolean sameWeight = true;
@@ -59,9 +59,9 @@ public class LeastActiveLoadBalance extends
AbstractLoadBalance {
// Filter out all the least active invokers
for (int i = 0; i < length; i++) {
Invoker invoker = invokers.get(i);
-// Get the active number of the invoke
+// Get the active number of the invoker
int active = RpcStatus.getStatus(invoker.getUrl(),
invocation.getMethodName()).getActive();
-// Get the weight of the invoke configuration. The default value
is 100.
+// Get the weight of the invoker's configuration. The default
value is 100.
int afterWarmup = getWeight(invoker, invocation);
// save for later use
weights[i] = afterWarmup;
@@ -113,4 +113,4 @@ public class LeastActiveLoadBalance extends
AbstractLoadBalance {
// If all invokers have the same weight value or totalWeight=0, return
evenly.
return
invokers.get(leastIndexes[ThreadLocalRandom.current().nextInt(leastCount)]);
}
-}
\ No newline at end of file
+}
[dubbo] branch master updated: Change main method under dubbo-remoting-api to standard unit test (#5026)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 9275b9d Change main method under dubbo-remoting-api to standard unit
test (#5026)
9275b9d is described below
commit 9275b9d5154b75c3a52f7fbb14f9290ef24bde2f
Author: xiaomoran <54576528+xiaomo...@users.noreply.github.com>
AuthorDate: Tue Sep 10 10:46:29 2019 +0800
Change main method under dubbo-remoting-api to standard unit test (#5026)
* change main method under dubbo-remoting-api to standard test
* add timeout
* remove unnecessary loops
---
.../transport/mina/ClientToServerTest.java | 3 +-
.../transport/netty/ClientToServerTest.java| 3 +-
.../transport/netty4/ClientReconnectTest.java | 2 +-
.../transport/netty4/ClientToServerTest.java | 3 +-
.../remoting/transport/netty4}/DemoService.java| 2 +-
.../transport/netty4}/DemoServiceImpl.java | 2 +-
.../remoting/transport/netty4}/MockResult.java | 2 +-
.../transport/netty4/ReplierDispatcherTest.java} | 117 -
.../remoting/transport/netty4}/RpcMessage.java | 2 +-
.../transport/netty4}/RpcMessageHandler.java | 3 +-
10 files changed, 81 insertions(+), 58 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
index 6414434..25d8618 100644
---
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.remoting.transport.mina;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.exchange.ExchangeChannel;
import org.apache.dubbo.remoting.exchange.ExchangeServer;
@@ -47,7 +48,7 @@ public abstract class ClientToServerTest {
@BeforeEach
protected void setUp() throws Exception {
-int port = (int) (1000 * Math.random() + 1);
+int port = NetUtils.getAvailablePort();
server = newServer(port, handler);
client = newClient(port);
}
diff --git
a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
index 267f569..d89227f 100644
---
a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.remoting.transport.netty;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.exchange.ExchangeChannel;
import org.apache.dubbo.remoting.exchange.ExchangeServer;
@@ -46,7 +47,7 @@ public abstract class ClientToServerTest {
@BeforeEach
protected void setUp() throws Exception {
-int port = (int) (1000 * Math.random() + 1);
+int port = NetUtils.getAvailablePort();
server = newServer(port, handler);
client = newClient(port);
}
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
index 9a2065a..844950c 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
@@ -50,7 +50,7 @@ public class ClientReconnectTest {
Assertions.assertFalse(client.isConnected());
Server server = startServer(port);
for (int i = 0; i < 100 && !client.isConnected(); i++) {
-Thread.sleep(10);
+Thread.sleep(20);
}
Assertions.assertTrue(client.isConnected());
client.close(2000);
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java
index 9b8db00..1015a53 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting
[dubbo] branch master updated: Avoid resize in ClassUtils.java (#5009)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 8b1f60a Avoid resize in ClassUtils.java (#5009)
8b1f60a is described below
commit 8b1f60adcc5bc5b17b371bb8f83757637408ef49
Author: fanghuabing
AuthorDate: Mon Sep 9 19:19:18 2019 +0800
Avoid resize in ClassUtils.java (#5009)
---
.../src/main/java/org/apache/dubbo/common/utils/ClassUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
index 10b6b9a..ec5b766 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
@@ -37,12 +37,12 @@ public class ClassUtils {
* Map with primitive type name as key and corresponding primitive type as
* value, for example: "int" -> "int.class".
*/
-private static final Map> PRIMITIVE_TYPE_NAME_MAP = new
HashMap>(16);
+private static final Map> PRIMITIVE_TYPE_NAME_MAP = new
HashMap>(32);
/**
* Map with primitive wrapper type as key and corresponding primitive type
* as value, for example: Integer.class -> int.class.
*/
-private static final Map, Class> PRIMITIVE_WRAPPER_TYPE_MAP =
new HashMap, Class>(8);
+private static final Map, Class> PRIMITIVE_WRAPPER_TYPE_MAP =
new HashMap, Class>(16);
private static final char PACKAGE_SEPARATOR_CHAR = '.';
@@ -56,7 +56,7 @@ public class ClassUtils {
PRIMITIVE_WRAPPER_TYPE_MAP.put(Long.class, long.class);
PRIMITIVE_WRAPPER_TYPE_MAP.put(Short.class, short.class);
-Set> primitiveTypeNames = new HashSet<>(16);
+Set> primitiveTypeNames = new HashSet<>(32);
primitiveTypeNames.addAll(PRIMITIVE_WRAPPER_TYPE_MAP.values());
primitiveTypeNames.addAll(Arrays
.asList(boolean[].class, byte[].class, char[].class,
double[].class,
[dubbo] branch master updated: Optimization: remove unnecessary String operations (#4964)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 e51c24e Optimization: remove unnecessary String operations (#4964)
e51c24e is described below
commit e51c24e93e7d08b01eb74f1e0ea286fe0e545419
Author: jimin
AuthorDate: Sat Aug 31 21:31:43 2019 +0800
Optimization: remove unnecessary String operations (#4964)
---
.../java/org/apache/dubbo/common/io/UnsafeStringWriter.java| 2 +-
.../main/java/org/apache/dubbo/common/utils/StringUtils.java | 4 ++--
.../org/apache/dubbo/remoting/telnet/support/TelnetUtils.java | 2 +-
.../remoting/transport/netty4/logging/MessageFormatter.java| 10 +-
.../main/java/org/apache/dubbo/rpc/support/AccessLogData.java | 4 ++--
.../java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java | 8
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
index 47e9a3a..a27f77d 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
@@ -66,7 +66,7 @@ public class UnsafeStringWriter extends Writer {
@Override
public void write(String str, int off, int len) {
-mBuffer.append(str.substring(off, off + len));
+mBuffer.append(str, off, off + len);
}
@Override
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java
index a8d22ad..28aca4a 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java
@@ -336,7 +336,7 @@ public final class StringUtils {
increase *= max < 0 ? 16 : max > 64 ? 64 : max;
final StringBuilder buf = new StringBuilder(text.length() + increase);
while (end != INDEX_NOT_FOUND) {
-buf.append(text.substring(start, end)).append(replacement);
+buf.append(text, start, end).append(replacement);
start = end + replLength;
if (--max == 0) {
break;
@@ -774,7 +774,7 @@ public final class StringUtils {
if (buf == null) {
buf = new StringBuilder();
if (i > 0) {
-buf.append(camelName.substring(0, i));
+buf.append(camelName, 0, i);
}
}
if (i > 0) {
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java
index 1d7f52e..50a06c9 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java
@@ -131,7 +131,7 @@ public class TelnetUtils {
//}
}
-rowbuf.append(cell.substring(cell.length() - remaing,
cell.length() - remaing + 1));
+rowbuf.append(cell, cell.length() - remaing, cell.length()
- remaing + 1);
remaing--;
}
int pad = widths[j] - cell.length();
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java
index c7cde8b..808600e 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java
@@ -192,7 +192,7 @@ final class MessageFormatter {
throwableCandidate);
} else { // add the tail string which contains no variables
and return
// the result.
-sbuf.append(messagePattern.substring(i,
messagePattern.length()));
+sbuf.append(messagePattern.substring(i));
return new FormattingTuple(sbuf.toString(), argArray,
throwableCandidate);
}
@@ -200,27 +200,27 @@ final class MessageFormatter {
if (isEscapedDelimeter(messagePattern, j)) {
if (!isDoubleEscaped(messa
[dubbo-website] branch master updated: translate configuration-load-process.md (#457)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 0109f70 translate configuration-load-process.md (#457)
0109f70 is described below
commit 0109f706ab813ad943c31c6232193fe8865b6b4c
Author: Junjian Peng
AuthorDate: Sat Aug 31 21:10:18 2019 +0800
translate configuration-load-process.md (#457)
* translate configuration-load-process.md
* Update docs.js
---
.../translate configuration-load-process.md| 180 +
site_config/docs.js| 4 +
2 files changed, 184 insertions(+)
diff --git a/docs/en-us/user/configuration/translate
configuration-load-process.md b/docs/en-us/user/configuration/translate
configuration-load-process.md
new file mode 100644
index 000..2b66eda
--- /dev/null
+++ b/docs/en-us/user/configuration/translate configuration-load-process.md
@@ -0,0 +1,180 @@
+# Configuration Loading Process
+
+This document focuses on **how the Dubbo framework collects the required
configuration** (including application configuration, registry configuration,
service configuration, etc.) **during the application startup phase** to
complete the process of service exposure and reference.
+
+Depending on how you drive it (such as Spring or naked API programming), the
configuration form will certainly vary, for detail please refer to [XML
Configuration](./xml.md), [Annotation Configuration](./annotation.md) and [API
Configuration](./api.md). In addition to the differences in peripheral drivers,
Dubbo's configuration reads generally follow the following principles:
+
+1. Dubbo supports multiple levels of configuration and automatically override
configurations according to predetermined priorities. Eventually, all
configurations are aggregated to the data bus URL to drive subsequent service
exposure, reference and other processes.
+2. ApplicationConfig, ServiceConfig and ReferenceConfig can be regarded as
configuration sources, which collect configuration by directly user-oriented
programming.
+3. The configuration format is mainly `Properties`, and the configuration
content follows conventions
+3. The configuration format is mainly Properties, and the configuration
content follows the agreed `path-based` naming [specification](#Configuration
Format).
+
+## Configuration Source
+
+First, starting with the configuration sources that Dubbo supports, there are
four default configuration sources:
+
+- JVM System Properties，-Dproperty
+- Externalized Configuration
+- ServiceConfig, ReferenceConfig and other programming interface collected
configuration
+- Local configuration file dubbo.properties
+
+### Override Priority
+
+The figure below shows the priority of configuration override, decreasing from
top to bottom:
+
+
+
+click here to view [Externalize configuration details](./config-center.md)
+
+
+## Configuration Format
+
+Currently, all configurations supported by Dubbo are in the format of
`.properties`, including `-D`, `Externalized Configuration`, etc., and all
configuration items in `.properties` follow a `path-based` Configuration format:
+
+```properties
+# Application level
+dubbo.{config-type}[.{config-id}].{config-item}={config-item-value}
+# Service level
+dubbo.service.{interface-name}[.{method-name}].{config-item}={config-item-value}
+dubbo.reference.{interface-name}[.{method-name}].{config-item}={config-item-value}
+# Multiple configuration items
+dubbo.{config-type}s.{config-id}.{config-item}={config-item-value}
+```
+
+- Application level
+
+```properties
+dubbo.application.name=demo-provider
+dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.protocol.port=-1
+```
+
+- Service level
+
+```properties
+dubbo.service.org.apache.dubbo.samples.api.DemoService.timeout=5000
+dubbo.reference.org.apache.dubbo.samples.api.DemoService.timeout=6000
+dubbo.reference.org.apache.dubbo.samples.api.DemoService.sayHello.timeout=7000
+```
+
+- Multiple configuration items
+
+```properties
+dubbo.registries.unit1.address=zookeeper://127.0.0.1:2181
+dubbo.registries.unit2.address=zookeeper://127.0.0.1:2182
+
+dubbo.protocols.dubbo.name=dubbo
+dubbo.protocols.dubbo.port=20880
+dubbo.protocols.hessian.name=hessian
+dubbo.protocols.hessian.port=8089
+```
+
+- Extended configuration
+
+```properties
+dubbo.application.parameters.item1=value1
+dubbo.application.parameters.item2=value2
+dubbo.registry.parameters.item3=value3
+dubbo.reference.org.apache.dubbo.samples.api.DemoService.parameters.item4=value4
+```
+
+## Several programming approaches of configuration
+
+Next, let's look at the changes corresponding to `ServiceConfig,
ReferenceConfig and other programming interface collected configuration` when
selecting different development methods
[dubbo] branch master updated: Remove unused import for unit test (#4976)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 57c13e0 Remove unused import for unit test (#4976) 57c13e0 is described below commit 57c13e07430a58e77249b96af9574b3db04e6dba Author: freekry AuthorDate: Sat Aug 31 21:36:22 2019 +0800 Remove unused import for unit test (#4976) * clear unused import --- .../org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java | 1 - .../src/test/java/org/apache/dubbo/config/spring/ConfigTest.java | 1 - .../beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java | 1 - .../config/spring/beans/factory/config/YamlPropertySourceFactory.java| 1 - 4 files changed, 4 deletions(-) diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java index 8c63ec0..df0b908 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java @@ -20,7 +20,6 @@ package org.apache.dubbo.common.threadlocal; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java index 7b28d82..3d50dcf 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java @@ -44,7 +44,6 @@ import org.apache.dubbo.rpc.Exporter; import org.apache.dubbo.rpc.Filter; import org.apache.dubbo.rpc.RpcContext; import org.apache.dubbo.rpc.RpcException; -import org.apache.dubbo.rpc.service.GenericException; import org.apache.dubbo.rpc.service.GenericService; import org.junit.Assert; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java index 17d3023..a509b43 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java @@ -17,7 +17,6 @@ package org.apache.dubbo.config.spring.beans.factory.annotation; import org.apache.dubbo.config.spring.ServiceBean; -import org.apache.dubbo.config.spring.api.DemoService; import org.apache.dubbo.config.spring.api.HelloService; import org.junit.Assert; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java index 060a0e4..271b179 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java @@ -30,7 +30,6 @@ import org.yaml.snakeyaml.resolver.Resolver; import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Properties; import java.util.regex.Pattern; /**
[dubbo-website] branch master updated: Update docs.js (#465)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new fb26608 Update docs.js (#465)
fb26608 is described below
commit fb266084647b69b397916be02e6f4c3586ba6d53
Author: kowasaretaneko17 <1239407...@qq.com>
AuthorDate: Sat Aug 31 08:42:00 2019 +0800
Update docs.js (#465)
---
site_config/docs.js | 4
1 file changed, 4 insertions(+)
diff --git a/site_config/docs.js b/site_config/docs.js
index d172ceb..940f36b 100644
--- a/site_config/docs.js
+++ b/site_config/docs.js
@@ -666,6 +666,10 @@ export default {
link:
'/zh-cn/docs/user/configuration/xml.html',
},
{
+title: '属性配置',
+link:
'/zh-cn/docs/user/configuration/properties.html',
+},
+{
title: 'API配置',
link: '/zh-cn/docs/user/configuration/api.html'
},
[dubbo-website] branch master updated: Add chinese version properties.md (#460)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new a52ad16 Add chinese version properties.md (#460) a52ad16 is described below commit a52ad168989098a08fd8a520389b550b997ba60a Author: kowasaretaneko17 <1239407...@qq.com> AuthorDate: Sat Aug 31 08:41:44 2019 +0800 Add chinese version properties.md (#460) --- docs/zh-cn/user/configuration/properties.md | 37 + 1 file changed, 37 insertions(+) diff --git a/docs/zh-cn/user/configuration/properties.md b/docs/zh-cn/user/configuration/properties.md new file mode 100644 index 000..bd3368d --- /dev/null +++ b/docs/zh-cn/user/configuration/properties.md @@ -0,0 +1,37 @@ +# 属性配置 + +如果你的应用足够简单，例如，不需要多注册中心或多协议，并且需要在spring容器中共享配置，那么，我们可以直接使用 `dubbo.properties`作为默认配置。 + +Dubbo可以自动加载classpath根目录下的dubbo.properties，但是你同样可以使用JVM参数来指定路径：`-Ddubbo.properties.file=xxx.properties`。 + +# 映射规则 +可以将xml的tag名和属性名组合起来，用‘.’分隔。每行一个属性。 + +* `dubbo.application.name=foo` 相当于 `` +* `dubbo.registry.address=10.20.153.10:9090` 相当于 ` ` + +如果在xml配置中有超过一个的tag，那么你可以使用‘id’进行区分。如果你不指定id，它将作用于所有tag。 + +* `dubbo.protocol.rmi.port=1099` 相当于 ` ` +* `dubbo.registry.china.address=10.20.153.10:9090` 相当于 `` + +如下，是一个典型的dubbo.properties配置样例。 + +```properties +dubbo.application.name=foo +dubbo.application.owner=bar +dubbo.registry.address=10.20.153.10:9090 +``` + +## 重写与优先级 + + +优先级从高到低： + +* JVM -D参数，当你部署或者启动应用时，它可以轻易地重写配置，比如，改变buddo协议端口； +* XML, XML中的当前配置会重写dubbo.properties中的； +* Properties，默认配置，仅仅作用于以上两者没有配置时。 + +1：如果在classpath下有超过一个dubbo.properties文件，比如，两个jar包都各自包含了dubbo.properties，dubbo将随机选择一个加载，并且打印错误日志。 + +2：如果 `id`没有在`protocol`中配置，将使用`name`作为默认属性。
[dubbo-website] branch master updated: create become-a-committer_dev.md for chinese" (#458)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new a29ce01 create become-a-committer_dev.md for chinese" (#458) a29ce01 is described below commit a29ce01332d0c110115ca25e56f2bcea9d221cb4 Author: far <20223723+far...@users.noreply.github.com> AuthorDate: Sat Aug 31 08:37:58 2019 +0800 create become-a-committer_dev.md for chinese" (#458) --- .../developers/contributor-guide/become-a-committer_dev.md | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/zh-cn/developers/contributor-guide/become-a-committer_dev.md b/docs/zh-cn/developers/contributor-guide/become-a-committer_dev.md index 4d03053..532b131 100644 --- a/docs/zh-cn/developers/contributor-guide/become-a-committer_dev.md +++ b/docs/zh-cn/developers/contributor-guide/become-a-committer_dev.md @@ -1,3 +1,15 @@ # 如何成为Dubbo committer -本文描述如何成为Dubbo committer \ No newline at end of file +每个人都可以成为Apache项目的贡献者。作为一个贡献者只是意味着你对项目感兴趣并以某种方式做出贡献，从提出合理的问题（这些问题记录了项目并向开发人员提供反馈）到提供新的特性作为补丁。 + +如果你成为对一个项目有价值的贡献者，你有可能被邀请成为一个committer。committer是ASF（Apache软件基金会）中用来表示提交特定项目的人的术语。它给你带来对项目仓库和资源写的权限。 + +在Dubbo社区，如果一个committer获得大量的优秀成绩，就可以被邀请加入项目管理委员会（PMC）。 + +当您不熟悉ASF使用的开源的开发过程时，有时难以理解的一点，就是我们更重视社区而不是代码。一个强大而健康的社区将受到尊重，成为一个有趣和有益的地方。更重要的是，一个多元化和健康的社区可以长时间的持续支持代码，即使个别公司在这个领域来来往往，也是如此。 + +更多详细信息可以在[这里](https://community.apache.org/contributors/)找到。 + +### 我可以贡献什么？ + +请参阅[新的贡献者指南](new-contributor-guide_dev.md)。 \ No newline at end of file
[dubbo-website] branch master updated (462ebca -> 32b7157)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git. from 462ebca Add english version for service-test (#461) add 32b7157 translate `async-execute-on-provider.md` into english (#463) No new revisions were added by this update. Summary of changes: docs/en-us/user/demos/async-execute-on-provider.md | 90 ++ site_config/docs.js| 4 + 2 files changed, 94 insertions(+) create mode 100644 docs/en-us/user/demos/async-execute-on-provider.md
[dubbo] branch master updated: Disable docker environment check on setup for unit test (#4803)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 9a9bf2a Disable docker environment check on setup for unit test (#4803) 9a9bf2a is described below commit 9a9bf2a968a9f37ac88845eff4b4f6c92ae4cafa Author: Like AuthorDate: Thu Aug 29 19:51:18 2019 +0800 Disable docker environment check on setup for unit test (#4803) --- .../src/test/resources/testcontainers.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/dubbo-metadata-report/dubbo-metadata-report-etcd/src/test/resources/testcontainers.properties b/dubbo-metadata-report/dubbo-metadata-report-etcd/src/test/resources/testcontainers.properties new file mode 100644 index 000..71f1d22 --- /dev/null +++ b/dubbo-metadata-report/dubbo-metadata-report-etcd/src/test/resources/testcontainers.properties @@ -0,0 +1 @@ +checks.disable=true \ No newline at end of file
[dubbo-website] branch master updated: Add english version for service-test (#461)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 462ebca Add english version for service-test (#461)
462ebca is described below
commit 462ebcaf384652f73049b6f0b5167be1df31edc0
Author: sandao
AuthorDate: Thu Aug 29 19:39:01 2019 +0800
Add english version for service-test (#461)
---
blog/en-us/service-test.md | 170 +
site_config/blog.js| 7 ++
2 files changed, 177 insertions(+)
diff --git a/blog/en-us/service-test.md b/blog/en-us/service-test.md
new file mode 100644
index 000..28e8b9c
--- /dev/null
+++ b/blog/en-us/service-test.md
@@ -0,0 +1,170 @@
+---
+title: Dubbo Admin service test
+keywords: Dubbo, test
+description: This article introduces how to make service test with Dubbo.
+---
+
+# Dubbo Admin service test
+Based on the metadata of Dubbo2.7, Dubbo Admin implements the service test
function, which can call the real service provider on the console through
generalized call.
+
+## Usage
+* Deploy the provider: You can download the demo
[here](https://github.com/nzomkxia/dubbo-demo). This project is based on Spring
Boot, which is convenient to start in the IDE or command line. For service
testing, you only need to start `dubbo-basic-provider`.
+
+* Service-seeking: After completing the server deployment, you can query the
corresponding service on the Dubbo Admin's `service test` page:
+ 
+ the information here is similar to the metadata, including the method name,
parameter type and return value. Click the label on the right to enter the
`service test` page.
+
+* Service test：
+ 
+ `service test` page contains two json editor, the parameter's informations
are all stored in a json format, where you need to fill in the corresponding
parameter values (in this case, the number type is String ), after filling,
click `execute` to initiate the call to the server, and the result of the call
is displayed in the editor on the right. If the call fails, the detailed cause
of the failure is displayed. Let's look at the example of the call failure.
+ 
+
+ In this case, the Dubbo service provider's process is shut down before the
service test is executed, you can see that the returned result is an `No
provider availble` exception. As with normal calls, business and framework
exceptions are returned in the results, for easy business troubleshooting.
+
+* Complex type parameters
+Consider the following methods and types in `UserService`:
+```java
+//org.apache.dubbo.demo.api.UserService
+Result getUser(String name, UserInfoDO userInfoDO);
+```
+```java
+public class UserInfoDO {
+private int id;
+private LocationDO locationDO;
+private DepartmentDO departmentDO;
+
+@Override
+public String toString() {
+return "UserInfoDO{" +
+"id=" + id +
+", locationDO=" + locationDO.toString() +
+", departmentDO=" + departmentDO.toString() +
+'}';
+}
+}
+```
+
+```java
+public class DepartmentDO {
+
+private String departName;
+private LocationDO departLocation;
+
+@Override
+public String toString() {
+return "DepartmentDO{" +
+"departName='" + departName + '\'' +
+", departLocation=" + departLocation.toString() +
+'}';
+}
+}
+```
+
+```java
+public class LocationDO {
+private String address;
+private int postNum;
+
+@Override
+public String toString() {
+return "LocationDO{" +
+"address='" + address + '\'' +
+", postNum=" + postNum +
+'}';
+}
+}
+```
+The parameters are complex complex type. When the service is tested, the value
of each field will be filled out layer by layer, As shown below:
+
+It can also make successful call and the result is returned.
+
+## Principle：Data source
+
+In the service test, the most important thing is the complete method
signature, and the type information of the parameters, with which the values of
each parameter can be filled step by step to assemble the complete service
consumer. In Dubbo 2.7, the metadata center has been added. The method
signature and parameter type information of Dubbo Admin is from here:
+
+As shown, the server will register the metadata information of the service to
the metadata center when it runs,the format is as follows:
+
+```json
+{
[dubbo-website] branch master updated: translate config-center.md (#456)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new db097d3 translate config-center.md (#456)
db097d3 is described below
commit db097d3d517666500d743bc0c4eed78b42814477
Author: Junjian Peng
AuthorDate: Thu Aug 29 11:26:34 2019 +0800
translate config-center.md (#456)
* translate config-center.md
* fix typos
* Update docs.js
---
docs/en-us/dev/impls/config-center.md | 95 +++
site_config/docs.js | 4 ++
2 files changed, 99 insertions(+)
diff --git a/docs/en-us/dev/impls/config-center.md
b/docs/en-us/dev/impls/config-center.md
new file mode 100644
index 000..23e594b
--- /dev/null
+++ b/docs/en-us/dev/impls/config-center.md
@@ -0,0 +1,95 @@
+# Dubbo Configuration Center
+
+## Design Purpose
+
+The key function of CC(Configuration Center) is to act as a Key-Value store.
Dubbo Framework tells CC the key it care about, CC return the corresponding
value.
+
+Divided by application scenarios, CC mainly undertake the following
responsibilities in Dubbo Framework:
+
+- As a external configuration center, CC store configuration files like
dubbo.properties, where the key is usually file name like dubbo.properties, and
value is content of the file.
+- Store single configuration items, like all kinds of switchs, contants, etc.
+- Store service governance rules, where the key is usually formated like
"ServiceName+RuleType", while value is the specific governance rule.
+
+Dubbo CC also introduced concepts of `namespace` and `group` to better manage
Key-Value pairs by group, those concepts are already built-in in many
professional third-party configuration centers. In most cases, `namespace` is
used to isolate different tetants, while `group` is used to divid the key set
from one tetant into groups.
+
+Dubbo CC has currently supported Zookeeper, Nacos, Etcd, Consul, Apollo, next
we will see how Dubbo CC is mapped to a specific third-party implementation.
+
+## Extension Interface
+
+* `org.apache.dubbo.configcenter.DynamicConfigurationFactory`
+* `org.apache.dubbo.configcenter.DynamicConfiguration`
+
+## Existing Extension
+
+*
`org.apache.dubbo.configcenter.support.zookeeper.ZookeeperDynamicConfigurationFactory`
+*
`org.apache.dubbo.configcenter.support.zookeeper.NacosDynamicConfigurationFactory`
+*
`org.apache.dubbo.configcenter.support.zookeeper.EtcdDynamicConfigurationFactory`
+*
`org.apache.dubbo.configcenter.support.zookeeper.ConsulDynamicConfigurationFactory`
+*
`org.apache.dubbo.configcenter.support.zookeeper.ApolloDynamicConfigurationFactory`
+
+## Implementation
+
+### Zookeeper
+
+Zookeeper provided a tree-structure storage model, the implementation is as
follows:
+
+
+
+namespace, group, key are corresponded to different levels of ZNodes, while
value is content of the key ZNode.
+
+1. External configuration cetner dubbo.properties
+
+ 
+
+ The figure above shows the storage structure of the dubbo.properties file
in two different scopes in zookeeper:
+ - namespace: both are 'dubbo'
+ - group: 'dubbo' is globally shared by all applications; 'demo-provider' is
application level, only affect the specific application
+ - key: dubbo.properties
+
+2. Single configuration item
+
+ 
+
+ The figure above shows how we set the shutdown wait time to 15000:
+ - namespace: dubbo
+ - group: dubbo
+ - key: dubbo.service.shutdown.wait
+ - value: 15000
+
+3. Service governance rule
+
+
+
+The figure above shows an application-level conditional routing rule:
+
+- namespace：dubbo
+- group：dubbo
+- key：governance-conditionrouter-consumer.condition-router, in wich
governance-conditionrouter-consumer is application name, condition-router
represents condition router.
+
+
+> Notice:
+>
+> Dubbo support two level of governance rules: application, service. The
key format are as follows:
+> * application level {application name + rule suffix}, such as:
`demo-application.configurators`,`demo-application.tag-router`, etc.
+> * service level {service interface name:[version]:[group] + rule
suffix}, in which version and group are optional, such as:
`org.apache.dubbo.demo.DemoService::.configurators`,`org.apache.dubbo.demo.DemoService:1.0.0:group1.configurators`,
etc.
+
+### Etcd & Consul
+
+Etcd and Consul are essencially tree-structure storage like Zookeeper, see
zookeeper for implementation.
+
+### Nacos
+
+Nacos is a professional third-party configuration center
[dubbo] branch master updated: Polish license check script (#4736)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 87703ad Polish license check script (#4736)
87703ad is described below
commit 87703adb16a354456e89724b2ec6dd9e3d02de9c
Author: Huxing Zhang
AuthorDate: Sun Aug 4 20:21:50 2019 +0800
Polish license check script (#4736)
* Polish license check script
* Remove temp files
---
licenseCheck.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/licenseCheck.sh b/licenseCheck.sh
index a2d3565..da0aa17 100755
--- a/licenseCheck.sh
+++ b/licenseCheck.sh
@@ -18,9 +18,9 @@ else
echo "checking whole project"
fi
-echo "Running command: ./mvnw clean package -DskipTests=true -PlicenseCheck
$APPEND_ARG"
+echo "Running command: mvn clean package -DskipTests=true -PlicenseCheck
$APPEND_ARG"
-./mvnw clean package -DskipTests=true -PlicenseCheck $APPEND_ARG
+mvn clean package -DskipTests=true -PlicenseCheck $APPEND_ARG
status=$?
if [ $status -eq 0 ]; then
@@ -91,7 +91,7 @@ allowLicense=(
)
#filter allow license
-license_need_check=`cat $TARGET_FILE | grep -v
"generated-sources/license/THIRD-PARTY.txt" | grep -v "third-party
dependencies" | grep -v $LINE_FLAG`
+license_need_check=`cat $TARGET_FILE | grep -v
"generated-sources/license/THIRD-PARTY.txt" | grep -v "third-party
dependencies" | grep -v "The project has no dependencies." | grep -v $LINE_FLAG`
for i in "${allowLicense[@]}"; do
license_need_check=`echo "$license_need_check"|grep -vi "$i"`
@@ -106,3 +106,5 @@ else
echo "${red}Please check below license${reset}"
cat license-need-check
fi
+
+rm -f license-list license-need-check
[dubbo] branch master updated: Fix name type for FailedNotifiedTask (#4731)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 2c92916 Fix name type for FailedNotifiedTask (#4731)
2c92916 is described below
commit 2c92916d631b6784a491e756aa0c54db546af65d
Author: tangcent
AuthorDate: Sun Aug 4 11:01:34 2019 +0800
Fix name type for FailedNotifiedTask (#4731)
---
.../main/java/org/apache/dubbo/registry/retry/FailedNotifiedTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/retry/FailedNotifiedTask.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/retry/FailedNotifiedTask.java
index 9ccb673..43084c6 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/retry/FailedNotifiedTask.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/retry/FailedNotifiedTask.java
@@ -31,7 +31,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/
public final class FailedNotifiedTask extends AbstractRetryTask {
-private static final String NAME = "retry subscribe";
+private static final String NAME = "retry notify";
private final NotifyListener listener;
[dubbo-website] branch master updated: Fix 'Here' link in CHANGES.md is invalid (#439)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 0141ec8 Fix 'Here' link in CHANGES.md is invalid (#439) 0141ec8 is described below commit 0141ec89606bf0074a9c29dc16b8686aec0decdf Author: 天璇 AuthorDate: Tue Jul 30 13:36:34 2019 +0800 Fix 'Here' link in CHANGES.md is invalid (#439) --- docs/zh-cn/user/versions/version-270.md | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/zh-cn/user/versions/version-270.md b/docs/zh-cn/user/versions/version-270.md index 913d289..bba14c6 100644 --- a/docs/zh-cn/user/versions/version-270.md +++ b/docs/zh-cn/user/versions/version-270.md @@ -1,8 +1,14 @@ +--- +title: 升级与可能的兼容性问题总结 +keywords: Dubbo,升级与可能的兼容性问题总结 +description: 升级与可能的兼容性问题总结 +--- + # 升级与可能的兼容性问题总结 环境要求：需要**Java 8**及以上版本。 -2.7.0版本在改造的过程中遵循了一个原则，即**保持与低版本的兼容性，因此从功能层面来说它是与2.6.x及更低版本完全兼容的**，而接下来将要提到的兼容性问题主要是[包重命名](#包名改造)带来的。另外，虽然功能用法保持向后兼容，但参考本文能帮助您尽快用到2.7.0版本的新特性。 +2.7.0版本在改造的过程中遵循了一个原则，即**保持与低版本的兼容性，因此从功能层面来说它是与2.6.x及更低版本完全兼容的**，而接下来将要提到的兼容性问题主要是[包重命名](#1.1)带来的。另外，虽然功能用法保持向后兼容，但参考本文能帮助您尽快用到2.7.0版本的新特性。 ## 升级步骤 @@ -37,7 +43,7 @@ ``` -如果升级依赖后出现API或SPI扩展相关的编译错误，请参考[包兼容性问题](#包名改造) +如果升级依赖后出现API或SPI扩展相关的编译错误，请参考[包兼容性问题](#1.1) 此时重新部署应用，所有默认行为和2.6.x保持一致，如果要用到2.7的新特性，则需要继续做以下配置（可选）： @@ -64,7 +70,7 @@ dubbo.registry.simplified=true ``` -建议将此配置集中管理，参考[外部化配置](#使用外部化配置)。 +建议将此配置集中管理，参考[外部化配置](#1.2)。 > URL简化只是剔除了一些纯粹的查询用的参数，并没有做大刀阔斧的服务发现模型改造，因此精简后的URL完全可以被2.6及以下版本的消费端实现服务发现与调用，同样2.7版本也可以发现和调用低版本的提供者。 @@ -80,12 +86,12 @@ dubbo.registry.simplified=true dubbo.metadataReport.address=redis://127.0.0.1:6379 ``` -建议将此配置集中管理，参考[外部化配置](#使用外部化配置)。 +建议将此配置集中管理，参考[外部化配置](#1.2)。 在此了解更多[元数据中心]()设计目的与用途。 - 使用外部化配置 +使用外部化配置 需要在项目启动前，使用[最新版本Dubbo-OPS](https://github.com/apache/dubbo-ops)完成外部化配置迁移，理论上配置中心支持所有本地dubbo.properties所支持的配置项。 @@ -210,7 +216,7 @@ dubbo.protocol.port=20880 -## 包名改造 +包名改造 1. Maven坐标
[dubbo-website] branch master updated: doc: fix admin frontend deploy command (#434)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 6ac7c85 doc: fix admin frontend deploy command (#434) 6ac7c85 is described below commit 6ac7c85d7c49ca86a1357a7be4b4e832a88647c2 Author: Gao Liang AuthorDate: Fri Jul 19 13:31:35 2019 +0800 doc: fix admin frontend deploy command (#434) --- docs/en-us/admin/introduction.md | 2 +- docs/zh-cn/admin/introduction.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en-us/admin/introduction.md b/docs/en-us/admin/introduction.md index e6be437..985dedf 100644 --- a/docs/en-us/admin/introduction.md +++ b/docs/en-us/admin/introduction.md @@ -20,7 +20,7 @@ http://localhost:8080 * frontend deploy ```sh cd dubbo-admin-ui -npm run install +npm install npm run dev ``` * backend deploy diff --git a/docs/zh-cn/admin/introduction.md b/docs/zh-cn/admin/introduction.md index 6886ca7..915f803 100644 --- a/docs/zh-cn/admin/introduction.md +++ b/docs/zh-cn/admin/introduction.md @@ -20,7 +20,7 @@ http://localhost:8080 * 前端 ```sh cd dubbo-admin-ui -npm run install +npm install npm run dev ``` * 后端
[dubbo-website] branch master updated: Update website link in readme file
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 0ad409a Update website link in readme file 0ad409a is described below commit 0ad409aa28b07ee67ae2be3b85bfd8f4dbdbb398 Author: Huang YunKun AuthorDate: Fri Jul 19 11:01:50 2019 +0800 Update website link in readme file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 375b684..f76e032 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dubbo Official Website -This project keeps all sources used for building up dubbo official website which's served at http://dubbo.io or http://dubbo.apache.org. +This project keeps all sources used for building up dubbo official website which's served at https://dubbo.apache.org. ## Prerequisite
[dubbo-website] branch master updated: Fix typo in dummy page (#433)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new d52c5bb Fix typo in dummy page (#433) d52c5bb is described below commit d52c5bb61f815ac817d350b691ecb846036ae0a1 Author: kang.deng AuthorDate: Fri Jul 19 09:58:05 2019 +0800 Fix typo in dummy page (#433) --- docs/zh-cn/dev/principals/dummy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-cn/dev/principals/dummy.md b/docs/zh-cn/dev/principals/dummy.md index 9863d23..7ea052d 100644 --- a/docs/zh-cn/dev/principals/dummy.md +++ b/docs/zh-cn/dev/principals/dummy.md @@ -2,7 +2,7 @@ > http://javatar.iteye.com/blog/804187 -最近有点痴呆，因为解决了太多的痴呆问题。服务框架实施面超来超广，已有 50 多个项目在使用，每天都要去帮应用查问题，来来回回，发现大部分都是配置错误，或者重复的文件或类，或者网络不通等，所以准备在新版本中加入防痴呆设计。估且这么叫吧，可能很简单，但对排错速度还是有点帮助，希望能抛砖引玉，也希望大家多给力，想出更多的防范措施共享出来。 +最近有点痴呆，因为解决了太多的痴呆问题。服务框架实施面越来越广，已有 50 多个项目在使用，每天都要去帮应用查问题，来来回回，发现大部分都是配置错误，或者重复的文件或类，或者网络不通等，所以准备在新版本中加入防痴呆设计。估且这么叫吧，可能很简单，但对排错速度还是有点帮助，希望能抛砖引玉，也希望大家多给力，想出更多的防范措施共享出来。 ## 检查重复的jar包
[dubbo-benchmark] branch master updated: Add ci integration (#5)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-benchmark.git
The following commit(s) were added to refs/heads/master by this push:
new 4fad6cb Add ci integration (#5)
4fad6cb is described below
commit 4fad6cba66d45385969c33472cac84de4040b9c3
Author: Huang YunKun
AuthorDate: Thu Jul 18 22:51:31 2019 +0800
Add ci integration (#5)
* add args to change config for jmh
* add travis file
* skip default install
* kill server in background
* add travis status in readme
* add travis status in readme
---
.travis.yml| 12 +
README.md | 2 ++
benchmark.sh | 9 +--
client-base/pom.xml| 6 +
.../java/org/apache/dubbo/benchmark/Client.java| 30 +++---
5 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..e287f3e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: java
+
+jdk:
+ - openjdk8
+
+install: true
+
+script:
+ - mvn clean package -DskipTests=true -pl
benchmark-base,client-base,server-base
+ - ./benchmark.sh dubbo-kryo-server &
+ - sleep 20
+ - ./benchmark.sh -a "--warmupIterations=1 --warmupTime=1
--measurementIterations=1 --measurementTime=3" dubbo-kryo-client
\ No newline at end of file
diff --git a/README.md b/README.md
index 8d9d2b6..df209f7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Dubbo Benchmark
+[](https://travis-ci.org/apache/dubbo-benchmark)
+
This project focuses on benchmarking and profiling dubbo framework with the
combination of different serialization and transporter options. The code and
the idea behinds it is inspired by [RPC
Benchmark](https://github.com/hank-whu/rpc-benchmark).
## How To Run Benchmark
diff --git a/benchmark.sh b/benchmark.sh
index af5f2ff..4f83b75 100755
--- a/benchmark.sh
+++ b/benchmark.sh
@@ -7,6 +7,7 @@ usage() {
echo " -s hostname, host name"
echo " -p port, port number"
echo " -f output file path"
+echo " -a other args"
echo "dirname: test module name"
}
@@ -36,7 +37,7 @@ run() {
JAR=`find ${PROJECT_DIR}/target/*.jar | head -n 1`
echo
echo "RUN ${PROJECT_DIR} IN ${MODE:-benchmark} MODE"
-CMD="java ${JAVA_OPTIONS} -Dserver.host=${SERVER}
-Dserver.port=${PORT} -Dbenchmark.output=${OUTPUT} -jar ${JAR}"
+CMD="java ${JAVA_OPTIONS} -Dserver.host=${SERVER}
-Dserver.port=${PORT} -Dbenchmark.output=${OUTPUT} -jar ${JAR} ${OTHERARGS}"
echo "command is: ${CMD}"
echo
${CMD}
@@ -49,8 +50,9 @@ SERVER="localhost"
PORT="8080"
OUTPUT=""
OPTIND=1
+OTHERARGS=""
-while getopts "m:s:p:f:" opt; do
+while getopts "m:s:p:f:a:" opt; do
case "$opt" in
m)
MODE=${OPTARG}
@@ -64,6 +66,9 @@ while getopts "m:s:p:f:" opt; do
f)
OUTPUT=${OPTARG}
;;
+a)
+OTHERARGS=${OPTARG}
+;;
?)
usage
exit 0
diff --git a/client-base/pom.xml b/client-base/pom.xml
index d4adb21..9607e04 100644
--- a/client-base/pom.xml
+++ b/client-base/pom.xml
@@ -47,5 +47,11 @@
org.openjdk.jmh
jmh-generator-annprocess
+
+
+commons-cli
+commons-cli
+1.4
+
\ No newline at end of file
diff --git a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
index bb57bd7..174abfb 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
@@ -1,5 +1,9 @@
package org.apache.dubbo.benchmark;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Option;
import org.apache.dubbo.benchmark.bean.Page;
import org.apache.dubbo.benchmark.bean.User;
import org.apache.dubbo.benchmark.rpc.AbstractClient;
@@ -77,19 +81,37 @@ public class Client extends AbstractClient {
}
public static void main(String[] args) throws Exception {
+System.out.println(args);
+org.apache.commons.cli.Options options = new
org.apache.commons.cli.Options();
+
+
options.addOption(Option.builder().longOpt("warmupIterations").hasArg().build());
+
option
[dubbo] branch master updated: Optimize part of the code in AnnotatedBeanDefinitionRegistryUtils.java (#4590)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 d7d4d67 Optimize part of the code in
AnnotatedBeanDefinitionRegistryUtils.java (#4590)
d7d4d67 is described below
commit d7d4d67e12b0e59fc671a6dde62cfb29c3afa24f
Author: yidadi <1056027...@qq.com>
AuthorDate: Thu Jul 18 22:44:52 2019 +0800
Optimize part of the code in AnnotatedBeanDefinitionRegistryUtils.java
(#4590)
* Optimize part of the code
---
.../config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java | 4 +---
.../org/apache/dubbo/remoting/transport/netty4/NettyClient.java| 7 +--
.../src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java | 4
.../src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java | 4 +---
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
index c46ca8a..3753b61 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
@@ -94,8 +94,6 @@ public abstract class AnnotatedBeanDefinitionRegistryUtils {
return;
}
-boolean debugEnabled = logger.isDebugEnabled();
-
// Remove all annotated-classes that have been registered
Iterator> iterator = new
ArrayList<>(asList(annotatedClasses)).iterator();
@@ -108,7 +106,7 @@ public abstract class AnnotatedBeanDefinitionRegistryUtils {
AnnotatedBeanDefinitionReader reader = new
AnnotatedBeanDefinitionReader(registry);
-if (debugEnabled) {
+if (logger.isDebugEnabled()) {
logger.debug(registry.getClass().getSimpleName() + " will register
annotated classes : " + asList(annotatedClasses) + " .");
}
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java
index 3c32a9c..64b98d2 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java
@@ -96,12 +96,7 @@ public class NettyClient extends AbstractClient {
//.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, getTimeout())
.channel(NioSocketChannel.class);
-if (getConnectTimeout() < 3000) {
-bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000);
-} else {
-bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
getConnectTimeout());
-}
-
+bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, Math.max(3000,
getConnectTimeout()));
bootstrap.handler(new ChannelInitializer() {
@Override
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java
index f8f6743..adbc7fc 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java
@@ -16,14 +16,10 @@
*/
package org.apache.dubbo.rpc;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
public class AsyncContextImpl implements AsyncContext {
-private static final Logger logger =
LoggerFactory.getLogger(AsyncContextImpl.class);
private final AtomicBoolean started = new AtomicBoolean(false);
private final AtomicBoolean stopped = new AtomicBoolean(false);
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
index ae2bc06..f7fd91d 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
@@ -26,7 +26,6 @@ import org.apache.dubbo.rpc.Filter;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
-import or
[dubbo-benchmark] branch master updated: Update dubbo version to 2.7.2
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-benchmark.git
The following commit(s) were added to refs/heads/master by this push:
new a8be15a Update dubbo version to 2.7.2
a8be15a is described below
commit a8be15a41a573b1fd91713f82682f4151be784c7
Author: Huang YunKun
AuthorDate: Thu Jul 18 21:41:40 2019 +0800
Update dubbo version to 2.7.2
* add snapshot mode
* exclude wrong lib when copy
* exclude wrong lib when copy
* polish
* update to latest version
* update to latest version
---
.../dubbo/benchmark/serialize/SerializationOptimizerImpl.java | 2 +-
client-base/pom.xml | 2 +-
client-base/src/main/java/org/apache/dubbo/benchmark/Client.java| 3 ---
pom.xml | 6 +++---
server-base/pom.xml | 2 +-
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git
a/benchmark-base/src/main/java/org/apache/dubbo/benchmark/serialize/SerializationOptimizerImpl.java
b/benchmark-base/src/main/java/org/apache/dubbo/benchmark/serialize/SerializationOptimizerImpl.java
index 9c47274..505e1ee 100644
---
a/benchmark-base/src/main/java/org/apache/dubbo/benchmark/serialize/SerializationOptimizerImpl.java
+++
b/benchmark-base/src/main/java/org/apache/dubbo/benchmark/serialize/SerializationOptimizerImpl.java
@@ -1,9 +1,9 @@
package org.apache.dubbo.benchmark.serialize;
-import com.alibaba.dubbo.common.serialize.support.SerializationOptimizer;
import org.apache.dubbo.benchmark.bean.Page;
import org.apache.dubbo.benchmark.bean.User;
import org.apache.dubbo.benchmark.service.UserService;
+import org.apache.dubbo.common.serialize.support.SerializationOptimizer;
import java.util.Arrays;
import java.util.Collection;
diff --git a/client-base/pom.xml b/client-base/pom.xml
index 3f279f1..d4adb21 100644
--- a/client-base/pom.xml
+++ b/client-base/pom.xml
@@ -19,7 +19,7 @@
-com.alibaba
+org.apache.dubbo
dubbo
diff --git a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
b/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
index 8b52142..bb57bd7 100644
--- a/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
+++ b/client-base/src/main/java/org/apache/dubbo/benchmark/Client.java
@@ -1,7 +1,5 @@
package org.apache.dubbo.benchmark;
-import com.alibaba.dubbo.config.ProtocolConfig;
-
import org.apache.dubbo.benchmark.bean.Page;
import org.apache.dubbo.benchmark.bean.User;
import org.apache.dubbo.benchmark.rpc.AbstractClient;
@@ -43,7 +41,6 @@ public class Client extends AbstractClient {
@TearDown
public void close() throws IOException {
-ProtocolConfig.destroyAll();
context.close();
}
diff --git a/pom.xml b/pom.xml
index ea0d6c0..94af7a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
1.8
1.8
-2.6.1
+2.7.2
4.1.25.Final
4.0.2
0.42
@@ -40,7 +40,7 @@
-com.alibaba
+org.apache.dubbo
dubbo
@@ -64,7 +64,7 @@
-com.alibaba
+org.apache.dubbo
dubbo
${dubbo.version}
diff --git a/server-base/pom.xml b/server-base/pom.xml
index 2a11cf2..e6392a9 100644
--- a/server-base/pom.xml
+++ b/server-base/pom.xml
@@ -19,7 +19,7 @@
-com.alibaba
+org.apache.dubbo
dubbo
[dubbo] branch master updated: Fix length of array is never negative (#4510)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 5eec017 Fix length of array is never negative (#4510)
5eec017 is described below
commit 5eec017be7b418a11c714ca945b891067b5cdaeb
Author: Taosheng Wei
AuthorDate: Thu Jul 11 11:16:45 2019 +0800
Fix length of array is never negative (#4510)
---
.../org/apache/dubbo/common/extension/support/ActivateComparator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
index 5dcedc3..1114804 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
@@ -82,7 +82,7 @@ public class ActivateComparator implements Comparator
{
}
private Class findSpi(Class clazz) {
-if (clazz.getInterfaces().length <= 0) {
+if (clazz.getInterfaces().length == 0) {
return null;
}
[dubbo] branch master updated: Add -jar for java command in dubbo-demo readme file (#4517)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 ddd7e43 Add -jar for java command in dubbo-demo readme file (#4517)
ddd7e43 is described below
commit ddd7e43d172b5153758413ab1ea55e5fcac64323
Author: shouhong
AuthorDate: Wed Jul 10 13:27:11 2019 +0800
Add -jar for java command in dubbo-demo readme file (#4517)
---
dubbo-demo/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dubbo-demo/README.md b/dubbo-demo/README.md
index 04653c7..3220be4 100644
--- a/dubbo-demo/README.md
+++ b/dubbo-demo/README.md
@@ -19,11 +19,11 @@ Since the generated artifacts are fat jars backed by spring
boot maven plugin, t
Use '*dubbo-demo/dubbo-demo-api*' as an example, to start the provider
'*dubbo-demo-api-provider*', execute the following command:
```bash
-java -Djava.net.preferIPv4Stack=true
dubbo-demo-api-provider-${project.version}.jar
+java -Djava.net.preferIPv4Stack=true -jar
dubbo-demo-api-provider-${project.version}.jar
```
To run the consumer '*dubbo-demo-api-consumer*', execute the following command:
```bash
-java -Djava.net.preferIPv4Stack=true
dubbo-demo-api-consumer-${project.version}.jar
+java -Djava.net.preferIPv4Stack=true -jar
dubbo-demo-api-consumer-${project.version}.jar
```
[dubbo-website] branch master updated: Fix a typo in architecture page(#428)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new c7cbfe5 Fix a typo in architecture page(#428) c7cbfe5 is described below commit c7cbfe57c2361f27d53a74f133232fedc3e594b7 Author: Zhao Junwang AuthorDate: Wed Jul 10 13:15:56 2019 +0800 Fix a typo in architecture page(#428) --- docs/en-us/user/preface/architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en-us/user/preface/architecture.md b/docs/en-us/user/preface/architecture.md index 184c941..90fdef7 100644 --- a/docs/en-us/user/preface/architecture.md +++ b/docs/en-us/user/preface/architecture.md @@ -30,7 +30,7 @@ Dubbo has the following features: Connectivity, Robustness, Scalability and Upgr * 'Provider' registers services to 'Register' and report time-consuming statistic(not include network overhead) to 'Monitor' * 'Consumer' gets a list of service provider addresses from `Registry`, call the provider directly according to the LB algorithm, report the time-consuming statistic to `Monitor`, which includes network overhead * The connections between `Register`, `Provider` and `Consumer` are long connections, `Moniter` is an exception -* `Register` is aware of the existence of `Provider` through the long connection, when `Provider` gets down, `Provider` will push the event to `Consumer` +* `Register` is aware of the existence of `Provider` through the long connection, when `Provider` gets down, `Register` will push the event to `Consumer` * It doesn't affect the already running instances of `Provider` and `Consumer` even all of the `Register` and `Monitor` get down, since `Consumer` got a cache of `Provider`s list * `Register` and `Monitor` are optional, `Consumer` can connect `Provider` directly
[dubbo-website] branch master updated: Fix registry protocol description (#407)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new d5b2314 Fix registry protocol description (#407) d5b2314 is described below commit d5b2314946d78ebc3fd84e053067ee2edb14ac66 Author: Xiaojie Li AuthorDate: Fri Jun 21 10:06:20 2019 +0800 Fix registry protocol description (#407) * Close #353 * add sofa and consul registry --- docs/en-us/user/references/xml/dubbo-registry.md | 2 +- docs/zh-cn/user/references/xml/dubbo-registry.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en-us/user/references/xml/dubbo-registry.md b/docs/en-us/user/references/xml/dubbo-registry.md index 70c0463..3071802 100644 --- a/docs/en-us/user/references/xml/dubbo-registry.md +++ b/docs/en-us/user/references/xml/dubbo-registry.md @@ -6,7 +6,7 @@ The configuration of the registry center. The corresponding class is `org.apache | - | --- | --- | --- | - | - | | - | | id| | string | False | | Configuration association | Bean Id of the registry center, can be referenced in dubbo:service registry=""or dubbo:reference registry="" | Above 1.0.16 | | address | host:port | string | True | | Service discovery | The address of the registry center. If the address has no port, default port will be adopted. Multiple addresses within the same cluster use `,` to seperate, such as `ip:port,ip:port`. Multiple registries within different cluster, please configure different `dubbo:registry` tag. | Above 1.0.16 | -| protocol | protocol| string | False | dubbo | Service discovery | The protocol of the registry center. `dubbo`, `http`, `local` are available. | Above 2.0.0 | +| protocol | protocol| string | False | dubbo | Service discovery | The protocol of the registry center. `dubbo`, `multicast`, `zookeeper`, `redis`, `consul(2.7.1)`, `sofa(2.7.2)`, `etcd(2.7.2)`, `nacos(2.7.2)` are available. | Above 2.0.0 | | port | port| int | False | 9090 | Service discovery | The default port of the registry. When the `address` has no port, this default port will be adopted. | Above 2.0.0 | | username | username| string | False | | Service governance| The usename of the registry. Do not set it if the registry doesn't need validation. | Above 2.0.0 | | password | password| string | False | | Service governance| The password of the registry. Do not set it if the registry doesn't need validation. | Above 2.0.0 | diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md b/docs/zh-cn/user/references/xml/dubbo-registry.md index ea53975..ca380d6 100644 --- a/docs/zh-cn/user/references/xml/dubbo-registry.md +++ b/docs/zh-cn/user/references/xml/dubbo-registry.md @@ -6,7 +6,7 @@ | --- | --- | | --- | --- | --- | --- | --- | | id | | string | 可选 | | 配置关联 | 注册中心引用BeanId，可以在dubbo:service registry=""或dubbo:reference registry=""中引用此ID | 1.0.16以上版本 | | address | host:port | string | 必填 | | 服务发现 | 注册中心服务器地址，如果地址没有端口缺省为9090，同一集群内的多个地址用逗号分隔，如：ip:port,ip:port，不同集群的注册中心，请配置多个dubbo:registry标签 | 1.0.16以上版本 | -| protocol | protocol | string | 可选 | dubbo | 服务发现 | 注册中心地址协议，支持dubbo, http, local三种协议，分别表示：dubbo地址、http地址、本地注册中心 | 2.0.0以上版本 | +| protocol | protocol | string | 可选 | dubbo | 服务发现 | 注册中心地址协议，支持`dubbo`, `multicast`, `zookeeper`, `redis`, `consul(2.7.1)`, `sofa(2.7.2)`, `etcd(2.7.2)`, `nacos(2.7.2)`等协议 | 2.0.0以上版本 | | port | port | int | 可选 | 9090 | 服务发现 | 注册中心缺省端口，当address没有带端口时使用此端口做为缺省值 | 2.0.0以上版本 | | username | username | string | 可选 | | 服务治理 | 登录注册中心用户名，如果注册中心不需要验证可不填 | 2.0.0以上版本 | | password | password | string | 可选 | | 服务治理 | 登录注册中心密码，如果注册中心不需要验证可不填 | 2.0.0以上版本 |
[dubbo] branch 2.7.3-release updated (ae22f9e -> 041a6ad)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch 2.7.3-release in repository https://gitbox.apache.org/repos/asf/dubbo.git. omit ae22f9e [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/2.7.3-release (041a6ad) \ O -- O -- O (ae22f9e) 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: dubbo-all/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[dubbo] branch revert-4356-changeProtobufJsonIncludeName deleted (was 36fe1c8)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch revert-4356-changeProtobufJsonIncludeName in repository https://gitbox.apache.org/repos/asf/dubbo.git. was 36fe1c8 Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)" This change permanently discards the following revisions: discard 36fe1c8 Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)"
[dubbo] 01/01: Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)"
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch revert-4356-changeProtobufJsonIncludeName in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 36fe1c8e4545649447b4730a165e573747a078d9 Author: Huang YunKun AuthorDate: Thu Jun 20 23:20:09 2019 +0800 Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)" This reverts commit ae22f9ec283cf6f5d9c0f3a307510e3fa7f94930. --- dubbo-all/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index eaa2dbc..d8c8949 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -622,7 +622,7 @@ org.apache.dubbo:dubbo-serialization-jdk org.apache.dubbo:dubbo-serialization-protostuff org.apache.dubbo:dubbo-serialization-gson - org.apache.dubbo:dubbo-serialization-protobuf-json + org.apache.dubbo:dubbo-serialization-googlePb org.apache.dubbo:dubbo-configcenter-api org.apache.dubbo:dubbo-configcenter-definition org.apache.dubbo:dubbo-configcenter-apollo
[dubbo] branch revert-4356-changeProtobufJsonIncludeName created (now 36fe1c8)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch revert-4356-changeProtobufJsonIncludeName in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 36fe1c8 Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)" This branch includes the following new commits: new 36fe1c8 Revert "[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)" 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.
[dubbo] branch 2.7.3-release updated: [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch 2.7.3-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.3-release by this push: new ae22f9e [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) ae22f9e is described below commit ae22f9ec283cf6f5d9c0f3a307510e3fa7f94930 Author: violin AuthorDate: Thu Jun 20 23:06:41 2019 +0800 [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) * include protobuf-json jar to dubbo --- dubbo-all/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index d8c8949..eaa2dbc 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -622,7 +622,7 @@ org.apache.dubbo:dubbo-serialization-jdk org.apache.dubbo:dubbo-serialization-protostuff org.apache.dubbo:dubbo-serialization-gson - org.apache.dubbo:dubbo-serialization-googlePb + org.apache.dubbo:dubbo-serialization-protobuf-json org.apache.dubbo:dubbo-configcenter-api org.apache.dubbo:dubbo-configcenter-definition org.apache.dubbo:dubbo-configcenter-apollo
[dubbo-website] branch master updated: Fix typo for Maturity in menu list(#411)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 9e420ce Fix typo for Maturity in menu list(#411) 9e420ce is described below commit 9e420ce16f02a948342eb81739928b8ab9c22e54 Author: Romain Prévost <32127074+toin...@users.noreply.github.com> AuthorDate: Thu Jun 20 15:34:38 2019 +0200 Fix typo for Maturity in menu list(#411) --- docs/en-us/user/SUMMARY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en-us/user/SUMMARY.md b/docs/en-us/user/SUMMARY.md index d803626..9abf667 100644 --- a/docs/en-us/user/SUMMARY.md +++ b/docs/en-us/user/SUMMARY.md @@ -6,7 +6,7 @@ * [1.4 Usage](./preface/usage.md) * [2 Quick start](./quick-start.md) * [3 Dependencies](./dependencies.md) -* [4 maturality](./maturity.md) +* [4 Maturity](./maturity.md) * [5 Configuration](./configuration/index.md) * [5.1 XML configuration](./configuration/xml.md) * [5.2 Properties configuration](./configuration/properties.md)
[dubbo-website] branch master updated: remove md_json folder
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5bec06c remove md_json folder
5bec06c is described below
commit 5bec06c29aa9ac79f4446fa7b9aafc008d20bf55
Author: Huang Yunkun
AuthorDate: Fri Jun 14 17:00:25 2019 +0800
remove md_json folder
---
.gitignore|1 +
md_json/blog.json | 771
md_json/docs.json | 2100 -
3 files changed, 1 insertion(+), 2871 deletions(-)
diff --git a/.gitignore b/.gitignore
index 94ae3ee..0ff7c69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ en-us/
zh-cn/
build/
index.html
+md_json/
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": {
-"title": "Dubbo: Several ways about synchronous/asynchronous invoke",
-"keywords": "Dubbo, Invoke, Async",
-"description": "This article introduces you how to use Dubbo
synchronously or asynchron
[dubbo-website] branch master updated: remove build folder
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5b2a221 remove build folder
5b2a221 is described below
commit 5b2a22180285eb0916182ecbc9a7813b2146651f
Author: Huang Yunkun
AuthorDate: Fri Jun 14 16:55:19 2019 +0800
remove build folder
---
.gitignore | 6 +-
build/TXD_D-Medium.eot | Bin 5025 -> 0 bytes
build/TXD_D-Medium.ttf | Bin 8984 -> 0 bytes
build/TXD_D-Medium.woff | Bin 5488 -> 0 bytes
build/TXD_D-Regular.eot | Bin 4837 -> 0 bytes
build/TXD_D-Regular.ttf | Bin 8832 -> 0 bytes
build/TXD_D-Regular.woff | Bin 5336 -> 0 bytes
build/blog.css | 1 -
build/blog.js| 6 --
build/blogDetail.css | 1 -
build/blogDetail.js | 6 --
build/community.css | 1 -
build/community.js | 6 --
build/documentation.css | 1 -
build/documentation.js | 6 --
build/home.css | 1 -
build/home.js| 6 --
index.html | 33 -
18 files changed, 5 insertions(+), 69 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7a04d2d..94ae3ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,8 @@ node_modules/
npm-debug.log
*.orig
package-lock.json
-*.iml
\ No newline at end of file
+*.iml
+en-us/
+zh-cn/
+build/
+index.html
diff --git a/build/TXD_D-Medium.eot b/build/TXD_D-Medium.eot
deleted file mode 100644
index e3159de..000
Binary files a/build/TXD_D-Medium.eot and /dev/null differ
diff --git a/build/TXD_D-Medium.ttf b/build/TXD_D-Medium.ttf
deleted file mode 100644
index befb38e..000
Binary files a/build/TXD_D-Medium.ttf and /dev/null differ
diff --git a/build/TXD_D-Medium.woff b/build/TXD_D-Medium.woff
deleted file mode 100644
index 852ee67..000
Binary files a/build/TXD_D-Medium.woff and /dev/null differ
diff --git a/build/TXD_D-Regular.eot b/build/TXD_D-Regular.eot
deleted file mode 100644
index ceebaa4..000
Binary files a/build/TXD_D-Regular.eot and /dev/null differ
diff --git a/build/TXD_D-Regular.ttf b/build/TXD_D-Regular.ttf
deleted file mode 100644
index 1803320..000
Binary files a/build/TXD_D-Regular.ttf and /dev/null differ
diff --git a/build/TXD_D-Regular.woff b/build/TXD_D-Regular.woff
deleted file mode 100644
index 63fae25..000
Binary files a/build/TXD_D-Regular.woff and /dev/null differ
diff --git a/build/blog.css b/build/blog.css
deleted file mode 100644
index 37d678b..000
--- a/build/blog.css
+++ /dev/null
@@ -1 +0,0 @@
-.header-container{position:fixed;left:0;top:0;width:100%;z-index:1000;background-color:#fff}.header-container-primary{background-color:transparent}.header-container-normal{background-color:#fff;box-shadow:0
2px 10px 0 rgba(0,0,0,.08)}.header-container
.header-body{max-width:1280px;margin:0
auto;height:66px;line-height:66px}.header-container .header-body
.logo{margin-left:40px;width:96px;vertical-align:sub}.header-container
.header-body .header-menu{float:right}.header-container .header-b [...]
\ No newline at end of file
diff --git a/build/blog.js b/build/blog.js
deleted file mode 100644
index e7e5939..000
--- a/build/blog.js
+++ /dev/null
@@ -1,6 +0,0 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=78) [...]
- Copyright (c) 2017 Jed Watson.
- Licensed under the MIT License (MIT), see
- http://jedwatson.github.io/classnames
-*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
-*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
-*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
-*/
-!function(){"use strict";function n(){for(var
e=[],t=0;thttp://jedwatson.github.io/classnames
-*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t
-
-
-
-
-
-
-
- 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
[dubbo-website] branch master updated (3ca0682 -> f3b7ed6)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git. from 3ca0682 Website updated add f3b7ed6 Fix dead links and typo (#400) No new revisions were added by this update. Summary of changes: docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md | 5 +++-- docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md | 7 --- 2 files changed, 7 insertions(+), 5 deletions(-)
[dubbo-website] branch asf-site updated: Fix dead links and typo (#400)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new f3b7ed6 Fix dead links and typo (#400) f3b7ed6 is described below commit f3b7ed6c15e563d4edada8453629846f5ace68ad Author: 天璇 AuthorDate: Thu Jun 13 21:07:19 2019 +0800 Fix dead links and typo (#400) * Update apache-dubbo-page_dev.md Fix dead link and typo. * Update apache-dubbo-page_dev.md Fix dead link and typo. --- docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md | 5 +++-- docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md | 7 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md b/docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md index 4f541b4..632f9de 100644 --- a/docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md +++ b/docs/en-us/developers/committer-guide/apache-dubbo-page_dev.md @@ -5,7 +5,7 @@ Each incubation project has an information page under this website. Dubbo's information page address is https://incubator.apache.org/projects/dubbo.html. When the project has undergone major changes, such as the addition of a new committer, -the election of a new PMC, or a new version of Release, etc., these updates need to be maintained on this page. +the election of a new PMC, or a new version of Release, etc, these updates need to be maintained on this page. The project address for this official website is https://svn.apache.org/repos/asf/incubator/public/trunk. @@ -14,7 +14,7 @@ Here's how to maintain this page: 1. Install the SVN. If it is a Mac OS X system or a Linux system, it comes with SVN. If it is a Windows system, please install SVN first. -2. Check out the https://svn.apache.org/repos/asf/incubator/public/trunk project with SVN. +2. Check out the [project](https://svn.apache.org/repos/asf/incubator/public/trunk) with SVN. 3. Modify the content/projects/dubbo.xml file and save it. @@ -29,4 +29,5 @@ This process will ask for the Apache id and password. References: 1.http://incubator.apache.org/guides/website.html + 2.https://svn.apache.org/repos/asf/incubator/public/trunk/README.txt diff --git a/docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md b/docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md index ec59617..8e56da0 100644 --- a/docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md +++ b/docs/zh-cn/developers/committer-guide/apache-dubbo-page_dev.md @@ -1,16 +1,16 @@ # Apache官方Dubbo主页的维护 Apache有一个官方的网站，用来维护所有的孵化项目的信息。每一个孵化项目在这个网站下都有一个信息页。 -Dubbo的信息页地址是https://incubator.apache.org/projects/dubbo.html。 +Dubbo的信息页地址是[https://incubator.apache.org/projects/dubbo.html](https://incubator.apache.org/projects/dubbo.html)。 当项目发生比较大的变化，比如新的committer的加入，新的PMC的当选，或是新版本的Release等，都需要将这些更新信息维护到这个页面。 -这个官方网站的项目地址是https://svn.apache.org/repos/asf/incubator/public/trunk。 +这个官方网站的项目地址是[https://svn.apache.org/repos/asf/incubator/public/trunk](https://svn.apache.org/repos/asf/incubator/public/trunk)。 维护这个页面的方法如下： 1.安装SVN。若是Mac OS X系统或是Linux系统，则自带了SVN。若是Windows系统，则请首先自行安装SVN。 -2.用SVN将https://svn.apache.org/repos/asf/incubator/public/trunk这个项目checkout下来。 +2.用SVN将这个[项目](https://svn.apache.org/repos/asf/incubator/public/trunk)checkout下来 。 3.修改content/projects/dubbo.xml文件，并保存。 @@ -24,4 +24,5 @@ Dubbo的信息页地址是https://incubator.apache.org/projects/dubbo.html。 参考: 1.http://incubator.apache.org/guides/website.html + 2.https://svn.apache.org/repos/asf/incubator/public/trunk/README.txt
[dubbo-website] branch asf-site updated: Avoid global install for docsite (#378)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8496a46 Avoid global install for docsite (#378)
8496a46 is described below
commit 8496a4638b1cb907fe3296af34aa6ab6910ef9cc
Author: Huang YunKun
AuthorDate: Wed Jun 12 09:36:20 2019 +0800
Avoid global install for docsite (#378)
---
package.json | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index e261e6e..c68153c 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"version": "0.0.1",
"private": true,
"scripts": {
-"start": "gulp",
-"build": "gulp build"
+"start": "node ./node_modules/.bin/docsite start",
+"build": "node ./node_modules/.bin/docsite build"
},
"devDependencies": {
"babel-core": "6.23.1",
@@ -39,7 +39,8 @@
"sass-loader": "6.0.2",
"style-loader": "0.6.5",
"webpack": "^2.6.1",
-"webpack-dev-server": "^2.4.5"
+"webpack-dev-server": "^2.4.5",
+"docsite": "^1.3.9"
},
"dependencies": {
"classnames": "^2.2.5",
[dubbo-admin] branch develop updated: Update dubbo version to 2.7.3-SNAPSHOT (#422)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 71c9010 Update dubbo version to 2.7.3-SNAPSHOT (#422)
71c9010 is described below
commit 71c9010c9b105f1ad53cdc54941d1cdf409a400a
Author: Huang YunKun
AuthorDate: Tue Jun 11 13:51:52 2019 +0800
Update dubbo version to 2.7.3-SNAPSHOT (#422)
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d84c0e9..dbc3623 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
${project.basedir}
-3.7
- 2.7.2-SNAPSHOT
+3.7
+ 2.7.3-SNAPSHOT
2.12.0
4.1.0
1.2.46
@@ -64,7 +64,7 @@
4.1.30.Final
0.8.2
2.9.0
-1.2.0
+1.2.0
1.24
3.0.0
2.1.4.RELEASE
[dubbo] branch removeDuplicateOverrideAnnotation deleted (was 48bc1cb)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch removeDuplicateOverrideAnnotation in repository https://gitbox.apache.org/repos/asf/dubbo.git. was 48bc1cb remove duplicate Override annotation This change permanently discards the following revisions: discard 48bc1cb remove duplicate Override annotation
[dubbo] branch wanghbxxxx-patch-1 deleted (was b7cbeda)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch wanghb-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo.git. was b7cbeda remove duplicate @Override 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] branch master updated: Improve java doc for dubbo-remoting-netty4 (#4180)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 8479906 Improve java doc for dubbo-remoting-netty4 (#4180)
8479906 is described below
commit 847990662db849f5abf0c154e7a4b474be501691
Author: tao.zhang
AuthorDate: Sat Jun 1 09:32:04 2019 +0800
Improve java doc for dubbo-remoting-netty4 (#4180)
* add some comments for dubbo-remoting-netty4
* update from upstream/master
* adjust format
---
.../org/apache/dubbo/common/utils/UrlUtils.java| 1 +
.../java/org/apache/dubbo/remoting/Constants.java | 6 ++-
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 1 +
.../remoting/transport/netty4/NettyChannel.java| 48 ++
.../remoting/transport/netty4/NettyClient.java | 35
.../transport/netty4/NettyClientHandler.java | 1 +
.../remoting/transport/netty4/NettyServer.java | 26 +---
.../transport/netty4/NettyServerHandler.java | 10 +++--
.../transport/netty4/NettyTransporter.java | 3 ++
9 files changed, 105 insertions(+), 26 deletions(-)
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 56e73cb..73c03f0 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
@@ -484,6 +484,7 @@ public class UrlUtils {
PROVIDERS_CATEGORY.equals(url.getParameter(CATEGORY_KEY,
PROVIDERS_CATEGORY));
}
+
/**
* Check if the given value matches the given pattern. The pattern
supports wildcard "*".
*
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
index 61a7e79..8fd6361 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
@@ -36,10 +36,12 @@ public interface Constants {
String IDLE_TIMEOUT_KEY = "idle.timeout";
int DEFAULT_IDLE_TIMEOUT = 600 * 1000;
-
+/**
+ * max size of channel. default value is zero that means unlimited.
+ */
String ACCEPTS_KEY = "accepts";
-int DEFAULT_ACCEPTS = 0;
+ int DEFAULT_ACCEPTS = 0;
String CONNECT_QUEUE_CAPACITY = "connect.queue.capacity";
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
index 49f5a62..9b38c7b 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/utils/UrlUtils.java
@@ -23,6 +23,7 @@ import org.apache.dubbo.remoting.Constants;
public class UrlUtils {
public static int getIdleTimeout(URL url) {
int heartBeat = getHeartbeat(url);
+// idleTimeout should be at least more than twice heartBeat because
possible retries of client.
int idleTimeout = url.getParameter(Constants.HEARTBEAT_TIMEOUT_KEY,
heartBeat * 3);
if (idleTimeout < heartBeat * 2) {
throw new IllegalStateException("idleTimeout < heartbeatInterval *
2");
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java
index b4202e1..f8bbcf6 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java
@@ -35,18 +35,29 @@ import static
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_TIMEOUT;
import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
/**
- * NettyChannel.
+ * NettyChannel maintains the cache of channel.
*/
final class NettyChannel extends AbstractChannel {
private static final Logger logger =
LoggerFactory.getLogger(NettyChannel.class);
-
+/**
+ * the cache for netty channel and dubbo channel
+ */
private static final ConcurrentMap CHANNEL_MAP =
new ConcurrentHashMap();
-
+/**
+ * netty channel
+ */
private final Channel channel;
private final Map attributes = new
ConcurrentHashMap();
-
+/**
+ * The constructor of NettyChannel.
+ * It is private so NettyChannel usually cre
[dubbo] branch lovepoem-patch-1 deleted (was 1ee821d)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch lovepoem-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo.git. was 1ee821d reverse url of python 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] branch master updated: Reverse url of python (#4162)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 492f760 Reverse url of python (#4162) 492f760 is described below commit 492f7601ce31a475674f54dccfb5d6eff2e3210f Author: Xin Wang AuthorDate: Fri May 31 21:51:13 2019 +0800 Reverse url of python (#4162) reverse url of python --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 751ad1e..6c8ae12 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ Please report security vulnerability to [us](mailto:secur...@dubbo.apache.org) p Language * [Node.js](https://github.com/apache/dubbo-js) -* [Python](https://github.com/apache/dubbo-client-py) +* [Python](https://github.com/dubbo/py-client-for-apache-dubbo) * [PHP](https://github.com/apache/dubbo-php-framework) * [Go](https://github.com/dubbo/dubbo-go) * [Erlang](https://github.com/apache/dubbo-erlang)
[dubbo] branch master updated: Remove duplicate @Override (#4228)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 85dd59c Remove duplicate @Override (#4228)
85dd59c is described below
commit 85dd59cd7323160169634ca86708fc3cd9dbea1e
Author: wanghb
AuthorDate: Fri May 31 19:28:40 2019 +0800
Remove duplicate @Override (#4228)
---
.../java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java
b/dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java
index acda3de..0ee9156 100644
---
a/dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java
+++
b/dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java
@@ -151,7 +151,6 @@ public class XmlRpcProtocol extends AbstractProxyProtocol {
@Override
@SuppressWarnings("unchecked")
-@Override
protected T doRefer(final Class serviceType, URL url) throws
RpcException {
XmlRpcProxyFactoryBean xmlRpcProxyFactoryBean = new
XmlRpcProxyFactoryBean();
xmlRpcProxyFactoryBean.setServiceUrl(url.setProtocol("http").toIdentityString());
@@ -195,4 +194,4 @@ public class XmlRpcProtocol extends AbstractProxyProtocol {
}
}
}
-}
\ No newline at end of file
+}
[dubbo-website] branch asf-site updated: fixed service test blog link #379 (#383)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 87f6b8f fixed service test blog link #379 (#383) 87f6b8f is described below commit 87f6b8f25e1b192fef71d2d760030b184c63eac2 Author: DLive AuthorDate: Thu May 30 22:36:19 2019 +0800 fixed service test blog link #379 (#383) --- docs/en-us/admin/serviceTest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en-us/admin/serviceTest.md b/docs/en-us/admin/serviceTest.md index 94bb0d9..9bb35ee 100644 --- a/docs/en-us/admin/serviceTest.md +++ b/docs/en-us/admin/serviceTest.md @@ -1 +1 @@ -please refer to this [blog](../../../blog/zh-cn/service-test.md) +please refer to this [blog](../../../zh-cn/blog/service-test.md)
[dubbo-website] branch asf-site updated: add a committer (#384)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new c90ef9f add a committer (#384) c90ef9f is described below commit c90ef9f1f804d16c183bf4f90a97268014b5a060 Author: zhaixiaoxiang AuthorDate: Thu May 30 22:31:03 2019 +0800 add a committer (#384) --- docs/en-us/developers/developers_dev.md | 1 + docs/zh-cn/developers/developers_dev.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/en-us/developers/developers_dev.md b/docs/en-us/developers/developers_dev.md index f246f4a..31340cf 100644 --- a/docs/en-us/developers/developers_dev.md +++ b/docs/en-us/developers/developers_dev.md @@ -42,6 +42,7 @@ This page shows Dubbo developers. Please file PR to add or change items. | LiZhenNet | Zhen Li | Keep | Committer | +8 | | lexburner | Jingfeng Xu | Alibaba | Committer | +8 | | khanimteyaz | Imteyaz Khan| | Committer | | +| xxz | Xiaoxiang Zhai | Souche | Committer | +8 | ### Contributors diff --git a/docs/zh-cn/developers/developers_dev.md b/docs/zh-cn/developers/developers_dev.md index 6912f74..5ea8c3f 100644 --- a/docs/zh-cn/developers/developers_dev.md +++ b/docs/zh-cn/developers/developers_dev.md @@ -42,6 +42,7 @@ | LiZhenNet | Zhen Li | Keep | Committer | +8 | | lexburner | Jingfeng Xu | Alibaba | Committer | +8 | | khanimteyaz | Imteyaz Khan| | Committer | | +| xxz | Xiaoxiang Zhai | Souche | Committer | +8 | ### 贡献者
[dubbo] branch master updated: [CI] add snapshot deploy check (#4157)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 cf1a09d [CI] add snapshot deploy check (#4157)
cf1a09d is described below
commit cf1a09d3c381607585def4a7bb213496efea655b
Author: Huang YunKun
AuthorDate: Sat May 25 15:22:57 2019 +0800
[CI] add snapshot deploy check (#4157)
---
pom.xml | 30 ++
1 file changed, 30 insertions(+)
diff --git a/pom.xml b/pom.xml
index 6ceb8fb..16afc27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
3.0.0
0.8.2
1.1.0
+3.0.0-M2
0.12
true
@@ -197,6 +198,35 @@
+snapshot-ci-deploy
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+${maven_enforce_version}
+
+
+enforce-no-releases
+
+enforce
+
+
+
+
+No Releases
Allowed!
+
false
+
+
+true
+
+
+
+
+
+
+
+
javadoc-lint
[1.8,)
[dubbo-admin] branch htynkn-patch-1 deleted (was b5e254a)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch htynkn-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git. was b5e254a Update README_ZH.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-admin] branch develop updated: Remove incubator prefix in document (#409)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git The following commit(s) were added to refs/heads/develop by this push: new ecbf806 Remove incubator prefix in document (#409) ecbf806 is described below commit ecbf8062e94792ff79396bfec6612e5a90e5f975 Author: Huang YunKun AuthorDate: Fri May 24 23:09:48 2019 +0800 Remove incubator prefix in document (#409) * Remove incubator- prefix in document * Update README_ZH.md --- README.md| 16 README_ZH.md | 14 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3917932..4e63df4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Dubbo Admin -[](https://travis-ci.org/apache/incubator-dubbo-admin) -[](https://codecov.io/gh/apache/incubator-dubbo-admin) - +[](https://travis-ci.org/apache/dubbo-admin) +[](https://codecov.io/gh/apache/dubbo-admin) + [中文说明](README_ZH.md) ### Demo Address @@ -10,10 +10,10 @@ * this demo is the latest version of `develop` branch, you can try it before building from source code ### Screenshot - + ### Service Governance -service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/incubator-dubbo-admin/wiki/The-compatibility-of-service-governance) +service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/dubbo-admin/wiki/The-compatibility-of-service-governance) ### admin UI - [Vue.js](https://vuejs.org) and [Vuetify](https://vuetifyjs.com) @@ -23,12 +23,12 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2. ### admin Server * Standard spring boot project -* [configurations in application.properties](https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration) +* [configurations in application.properties](https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration) ### Production Setup -1. Clone source code on develop branch `git clone https://github.com/apache/incubator-dubbo-admin.git` +1. Clone source code on develop branch `git clone https://github.com/apache/dubbo-admin.git` 2. Specify registry address in `dubbo-admin-server/src/main/resources/application.properties` 3. Build @@ -58,4 +58,4 @@ Once deployed, you can check http://localhost:8080/swagger-ui.html to check all ### License Apache Dubbo admin is under the Apache 2.0 license, Version 2.0. -See [LICENSE](https://github.com/apache/incubator-dubbo-admin/blob/develop/LICENSE) for full license text. +See [LICENSE](https://github.com/apache/dubbo-admin/blob/develop/LICENSE) for full license text. diff --git a/README_ZH.md b/README_ZH.md index 4c31157..9e0b324 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,8 +1,8 @@ # Dubbo控制台 -[](https://travis-ci.org/apache/incubator-dubbo-admin) -[](https://codecov.io/gh/apache/incubator-dubbo-admin) - +[](https://travis-ci.org/apache/dubbo-admin) +[](https://codecov.io/gh/apache/dubbo-admin) + [English version](README.md). ### Demo地址 @@ -10,10 +10,10 @@ * 该地址是`develop`分支的最新版本，在从源码构建之前，可以先尝试demo ### 页面截图 - + ### 服务治理 -服务治理的部分，按照Dubbo 2.7的格式进行配置，同时兼容Dubbo 2.6，详见[这里](https://github.com/apache/incubator-dubbo-admin/wiki/%E6%9C%8D%E5%8A%A1%E6%B2%BB%E7%90%86%E5%85%BC%E5%AE%B9%E6%80%A7%E8%AF%B4%E6%98%8E) +服务治理的部分，按照Dubbo 2.7的格式进行配置，同时兼容Dubbo 2.6，详见[这里](https://github.com/apache/dubbo-admin
[dubbo-admin] branch htynkn-patch-1 updated (adec02d -> b5e254a)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch htynkn-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git. from adec02d Remove incubator- prefix in document add b5e254a Update README_ZH.md No new revisions were added by this update. Summary of changes: README_ZH.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
[dubbo-admin] 01/01: Remove incubator- prefix in document
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch htynkn-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git commit adec02d03367ede70b50182428b386d3c59a28e4 Author: Huang YunKun AuthorDate: Fri May 24 23:04:32 2019 +0800 Remove incubator- prefix in document --- README.md | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3917932..4e63df4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Dubbo Admin -[](https://travis-ci.org/apache/incubator-dubbo-admin) -[](https://codecov.io/gh/apache/incubator-dubbo-admin) - +[](https://travis-ci.org/apache/dubbo-admin) +[](https://codecov.io/gh/apache/dubbo-admin) + [中文说明](README_ZH.md) ### Demo Address @@ -10,10 +10,10 @@ * this demo is the latest version of `develop` branch, you can try it before building from source code ### Screenshot - + ### Service Governance -service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/incubator-dubbo-admin/wiki/The-compatibility-of-service-governance) +service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.6, please refer to [here](https://github.com/apache/dubbo-admin/wiki/The-compatibility-of-service-governance) ### admin UI - [Vue.js](https://vuejs.org) and [Vuetify](https://vuetifyjs.com) @@ -23,12 +23,12 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2. ### admin Server * Standard spring boot project -* [configurations in application.properties](https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration) +* [configurations in application.properties](https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin-configuration) ### Production Setup -1. Clone source code on develop branch `git clone https://github.com/apache/incubator-dubbo-admin.git` +1. Clone source code on develop branch `git clone https://github.com/apache/dubbo-admin.git` 2. Specify registry address in `dubbo-admin-server/src/main/resources/application.properties` 3. Build @@ -58,4 +58,4 @@ Once deployed, you can check http://localhost:8080/swagger-ui.html to check all ### License Apache Dubbo admin is under the Apache 2.0 license, Version 2.0. -See [LICENSE](https://github.com/apache/incubator-dubbo-admin/blob/develop/LICENSE) for full license text. +See [LICENSE](https://github.com/apache/dubbo-admin/blob/develop/LICENSE) for full license text.
[dubbo-admin] branch htynkn-patch-1 created (now adec02d)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch htynkn-patch-1 in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git. at adec02d Remove incubator- prefix in document This branch includes the following new commits: new adec02d Remove incubator- prefix in document 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.
[incubator-dubbo-admin] branch develop updated: Update Dockerfile
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-admin.git The following commit(s) were added to refs/heads/develop by this push: new 8d87e39 Update Dockerfile 8d87e39 is described below commit 8d87e39200747f0f08e2a099ee837511d961edd6 Author: Huang YunKun AuthorDate: Thu May 23 13:28:36 2019 +0800 Update Dockerfile Fix copy folder name issue for docker build --- docker/0.1.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/0.1.0/Dockerfile b/docker/0.1.0/Dockerfile index 8bf2c29..6cca0fc 100644 --- a/docker/0.1.0/Dockerfile +++ b/docker/0.1.0/Dockerfile @@ -20,6 +20,6 @@ RUN ./mvnw clean package -Dmaven.test.skip=true FROM openjdk:8-jre LABEL maintainer="d...@dubbo.apache.org" -COPY --from=0 /source/incubator-dubbo-ops-0.1/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar +COPY --from=0 /source/incubator-dubbo-admin-0.1/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] EXPOSE 8080
[incubator-dubbo-admin] branch develop updated: Update Dockerfile
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-admin.git The following commit(s) were added to refs/heads/develop by this push: new a9dafb3 Update Dockerfile a9dafb3 is described below commit a9dafb34c77d7edd99b772b371aea506efcc3de3 Author: Huang YunKun AuthorDate: Thu May 23 13:23:02 2019 +0800 Update Dockerfile Fix docker build folder name issue --- docker/0.1.0/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/0.1.0/Dockerfile b/docker/0.1.0/Dockerfile index 13bd0aa..8bf2c29 100644 --- a/docker/0.1.0/Dockerfile +++ b/docker/0.1.0/Dockerfile @@ -15,11 +15,11 @@ FROM openjdk:8-jdk RUN mkdir /source && wget https://github.com/apache/incubator-dubbo-ops/archive/0.1.zip && unzip 0.1.zip -d /source -WORKDIR /source/incubator-dubbo-ops-0.1 +WORKDIR /source/incubator-dubbo-admin-0.1 RUN ./mvnw clean package -Dmaven.test.skip=true FROM openjdk:8-jre LABEL maintainer="d...@dubbo.apache.org" COPY --from=0 /source/incubator-dubbo-ops-0.1/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] -EXPOSE 8080 \ No newline at end of file +EXPOSE 8080
[incubator-dubbo-admin] branch develop updated: Add dockerfile for dockerhub autobuild (#357)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-admin.git The following commit(s) were added to refs/heads/develop by this push: new 2ca36bf Add dockerfile for dockerhub autobuild (#357) 2ca36bf is described below commit 2ca36bfacf3f6c01e8d91ca9d78f66cbfbfe139e Author: Huang YunKun AuthorDate: Thu May 23 13:04:02 2019 +0800 Add dockerfile for dockerhub autobuild (#357) * add build file * all use maven wrapper --- docker/0.1.0/Dockerfile | 25 + docker/0.2.0/Dockerfile | 25 + docker/stack.yml| 32 3 files changed, 82 insertions(+) diff --git a/docker/0.1.0/Dockerfile b/docker/0.1.0/Dockerfile new file mode 100644 index 000..13bd0aa --- /dev/null +++ b/docker/0.1.0/Dockerfile @@ -0,0 +1,25 @@ +# 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. + +FROM openjdk:8-jdk +RUN mkdir /source && wget https://github.com/apache/incubator-dubbo-ops/archive/0.1.zip && unzip 0.1.zip -d /source +WORKDIR /source/incubator-dubbo-ops-0.1 +RUN ./mvnw clean package -Dmaven.test.skip=true + +FROM openjdk:8-jre +LABEL maintainer="d...@dubbo.apache.org" +COPY --from=0 /source/incubator-dubbo-ops-0.1/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar +ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] +EXPOSE 8080 \ No newline at end of file diff --git a/docker/0.2.0/Dockerfile b/docker/0.2.0/Dockerfile new file mode 100644 index 000..7b496b1 --- /dev/null +++ b/docker/0.2.0/Dockerfile @@ -0,0 +1,25 @@ +# 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. + +FROM openjdk:8-jdk +RUN mkdir /source && wget https://github.com/apache/incubator-dubbo-admin/archive/0.2.0.zip && unzip 0.2.0.zip -d /source +WORKDIR /source/incubator-dubbo-admin-0.2.0 +RUN ./mvnw clean package -Dmaven.test.skip=true + +FROM openjdk:8-jre +LABEL maintainer="d...@dubbo.apache.org" +COPY --from=0 /source/incubator-dubbo-admin-0.2.0/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar +ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] +EXPOSE 8080 \ No newline at end of file diff --git a/docker/stack.yml b/docker/stack.yml new file mode 100644 index 000..6e29327 --- /dev/null +++ b/docker/stack.yml @@ -0,0 +1,32 @@ +# 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. +#
[incubator-dubbo] branch master updated: Add remoteApplicationName in RpcContext (#3816)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new b70b3ea Add remoteApplicationName in RpcContext (#3816)
b70b3ea is described below
commit b70b3eac9ec3323b64ac9596982a09affc01989d
Author: yizhenqiang
AuthorDate: Wed Apr 10 11:18:33 2019 +0800
Add remoteApplicationName in RpcContext (#3816)
---
.../src/main/java/org/apache/dubbo/rpc/RpcContext.java | 13 +
.../java/org/apache/dubbo/rpc/filter/ContextFilter.java | 6 --
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
index 7c10081..fa63b7e 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
@@ -85,6 +85,9 @@ public class RpcContext {
private InetSocketAddress localAddress;
private InetSocketAddress remoteAddress;
+
+private String remoteApplicationName;
+
@Deprecated
private List> invokers;
@Deprecated
@@ -149,6 +152,7 @@ public class RpcContext {
copy.arguments = this.arguments;
copy.localAddress = this.localAddress;
copy.remoteAddress = this.remoteAddress;
+copy.remoteApplicationName = this.remoteApplicationName;
copy.invokers = this.invokers;
copy.invoker = this.invoker;
copy.invocation = this.invocation;
@@ -407,6 +411,15 @@ public class RpcContext {
return this;
}
+public String getRemoteApplicationName() {
+return remoteApplicationName;
+}
+
+public RpcContext setRemoteApplicationName(String remoteApplicationName) {
+this.remoteApplicationName = remoteApplicationName;
+return this;
+}
+
/**
* get remote address string.
*
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
index 7f30151..fe85da0 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
@@ -29,6 +29,8 @@ import org.apache.dubbo.rpc.RpcInvocation;
import java.util.HashMap;
import java.util.Map;
+import static org.apache.dubbo.common.Constants.REMOTE_APPLICATION_KEY;
+
/**
* ContextFilter set the provider RpcContext with invoker, invocation, local
port it is using and host for
* current execution thread.
@@ -59,8 +61,8 @@ public class ContextFilter implements Filter {
.setInvoker(invoker)
.setInvocation(invocation)
//.setAttachments(attachments) // merged from dubbox
-.setLocalAddress(invoker.getUrl().getHost(),
-invoker.getUrl().getPort());
+.setLocalAddress(invoker.getUrl().getHost(),
invoker.getUrl().getPort())
+
.setRemoteApplicationName(invoker.getUrl().getParameter(REMOTE_APPLICATION_KEY));
// merged from dubbox
// we may already added some attachments into RpcContext before this
filter (e.g. in rest protocol)
[incubator-dubbo] branch master updated: remove duplicated import (#3440)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new 5ab3138 remove duplicated import (#3440) 5ab3138 is described below commit 5ab31388171a41727e5678bf48e7c3ea84edd96b Author: kezhenxu94 AuthorDate: Fri Feb 8 21:45:05 2019 +0800 remove duplicated import (#3440) --- .../main/java/org/apache/dubbo/registry/support/AbstractRegistry.java| 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java index bc119d0..9230951 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java @@ -25,7 +25,6 @@ import org.apache.dubbo.common.utils.ConcurrentHashSet; import org.apache.dubbo.common.utils.ConfigUtils; import org.apache.dubbo.common.utils.NamedThreadFactory; import org.apache.dubbo.common.utils.UrlUtils; -import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.Registry;
[incubator-dubbo] branch master updated: polish pom.xml (remove test profile and jvm permSize args) (#3407)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new b09a150 polish pom.xml (remove test profile and jvm permSize args) (#3407) b09a150 is described below commit b09a150d3d54590c2203d5c7da25ff925a9521dc Author: Huang YunKun AuthorDate: Thu Jan 31 17:40:07 2019 +0800 polish pom.xml (remove test profile and jvm permSize args) (#3407) --- pom.xml | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 7812620..cbf2687 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 2.2 2.23.4 --server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8 +-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m false @@ -196,17 +196,6 @@ -test - - -.project - - - -dubbo-test - - - checkstyle [1.8,)
[incubator-dubbo] branch master updated: Clean pom.xml file #3186 (#3211)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new ea45921 Clean pom.xml file #3186 (#3211) ea45921 is described below commit ea459212218696808fbf6cbbd579e31f748eec17 Author: kezhenxu94 AuthorDate: Thu Jan 31 17:07:53 2019 +0800 Clean pom.xml file #3186 (#3211) * update as requested * add meta space size arguments --- pom.xml | 40 +--- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index 8f1a39b..7812620 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 2.23.4 -server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8 --Djava.net.preferIPv4Stack=true +-Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m false true @@ -196,17 +196,6 @@ -java6 - -3.0.2 -2.22.1 -2.7 -3.1 -3.0.1 -2.10.1 - - - test @@ -218,33 +207,6 @@ -hudson - - - -org.apache.maven.plugins -maven-surefire-plugin - -true - - - - - - -java8-vm-args - -[1.8,) - - - - --server -Xms256m -Xmx512m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Dfile.encoding=UTF-8 --Djava.net.preferIPv4Stack=true - - - - checkstyle [1.8,)
[incubator-dubbo-website] branch asf-site updated: Add contributor information for biyuhao (#170)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new a236a80 Add contributor information for biyuhao (#170) a236a80 is described below commit a236a80c2d991171c29fef4218cce8245fe752d4 Author: Yuhao Bi AuthorDate: Thu Nov 1 09:58:32 2018 +0800 Add contributor information for biyuhao (#170) --- docs/en-us/developers/developers_dev.md | 2 ++ docs/zh-cn/developers/developers_dev.md | 10 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/en-us/developers/developers_dev.md b/docs/en-us/developers/developers_dev.md index 752bfbf..888ab41 100644 --- a/docs/en-us/developers/developers_dev.md +++ b/docs/en-us/developers/developers_dev.md @@ -35,3 +35,5 @@ This page shows Dubbo developers. Please file PR to add or change items. | -- | --- | | | | leyou240 | <https://github.com/leyou240> | | +8 | | chenzhiguo | <https://github.com/chenzhiguo> | | +8 | +| biyuhao| <https://github.com/biyuhao>| Asiainfo-sec | +8 | + diff --git a/docs/zh-cn/developers/developers_dev.md b/docs/zh-cn/developers/developers_dev.md index 7a46deb..b3a3ae6 100644 --- a/docs/zh-cn/developers/developers_dev.md +++ b/docs/zh-cn/developers/developers_dev.md @@ -31,7 +31,9 @@ ### 贡献者 -| Github ID | Github URL | 组织 | 时区 | -| -- | --- | | | -| leyou240 | <https://github.com/leyou240> | | +8 | -| chenzhiguo | <https://github.com/chenzhiguo> | | +8 | +| Github ID | Github URL | 组织 | 时区 | +| -- | --- | | | +| leyou240 | <https://github.com/leyou240> | | +8 | +| chenzhiguo | <https://github.com/chenzhiguo> | | +8 | +| biyuhao| <https://github.com/biyuhao>| Asiainfo-sec | +8 | +
[incubator-dubbo-website] branch asf-site updated: Revert "Delete guide_dev.md"
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 3bca78f Revert "Delete guide_dev.md" 3bca78f is described below commit 3bca78f071a88fb79220b58ae8bc3a2c841337a2 Author: Huang Yunkun AuthorDate: Wed Oct 31 10:12:12 2018 +0800 Revert "Delete guide_dev.md" This reverts commit adb1d2927004dcaa0815ed95200aefc0a6d8a44c. --- docs/zh-cn/developers/guide_dev.md | 66 ++ 1 file changed, 66 insertions(+) diff --git a/docs/zh-cn/developers/guide_dev.md b/docs/zh-cn/developers/guide_dev.md new file mode 100644 index 000..7063606 --- /dev/null +++ b/docs/zh-cn/developers/guide_dev.md @@ -0,0 +1,66 @@ +## Contributing to Dubbo + +Dubbo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. + +### Sign the Contributor License Agreement +Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. + +### Contact + + Mailing list + +The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe. + +- [d...@dubbo.incubator.apache.org](mailto:dev-subscr...@dubbo.incubator.apache.org): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo. +- [comm...@dubbo.incubator.apache.org](mailto:commits-subscr...@dubbo.incubator.apache.org): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development. +- [notificat...@dubbo.incubator.apache.org](mailto:notification-subscr...@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list. + +### Reporting issue + +Please follow the [template](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues. + +### Code Conventions +Our code style is almost in line with the standard java conventions (Popular IDE's default setting satisfy this), with the following additional restricts: +* If there are more than 120 characters in current line, start a new line. + +* Make sure all new .java files to have a simple Javadoc class comment with at least a @date tag identifying birth, and preferably at least a paragraph on what the class is for. + +* Add the ASF license header comment to all new .java files (copy from existing files in the project) + +* Make sure no @author tag added to the file you contribute since @author tag is not used at Apache, other ways such as cvs will record all your contributions fairly. + +* Add some Javadocs and, if you change the namespace, some XSD doc elements. + +* A few unit tests should be added for a new feature or an important bugfix. + +* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). + +* When writing a commit message please follow these conventions, if you are fixing an existing issue please add Fixes #XXX at the end of the commit message (where XXX is the issue number). + +### Contribution flow + +This is a rough outline of what a contributor's workflow looks like: + +* Fork the current repository +* Create a topic branch from where to base the contribution. This is usually master. +* Make commits of logical units. +* Make sure commit messages are in the proper format (see below). +* Push changes in a topic branch to your forked repository. +* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md) +* Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below: +``` +git remote add upstream g...@github.com:apache/incubator-dubbo.git +git fetch upstream +git rebase upstream/master +git checkout -b your_awesome_patch +... add some work +git push origin your_awesome_
[incubator-dubbo-website] branch asf-site updated: Delete guide_dev.md
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new adb1d29 Delete guide_dev.md adb1d29 is described below commit adb1d2927004dcaa0815ed95200aefc0a6d8a44c Author: Huang YunKun AuthorDate: Wed Oct 31 10:08:52 2018 +0800 Delete guide_dev.md --- docs/zh-cn/developers/guide_dev.md | 66 -- 1 file changed, 66 deletions(-) diff --git a/docs/zh-cn/developers/guide_dev.md b/docs/zh-cn/developers/guide_dev.md deleted file mode 100644 index 7063606..000 --- a/docs/zh-cn/developers/guide_dev.md +++ /dev/null @@ -1,66 +0,0 @@ -## Contributing to Dubbo - -Dubbo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. - -### Sign the Contributor License Agreement -Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. - -### Contact - - Mailing list - -The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe. - -- [d...@dubbo.incubator.apache.org](mailto:dev-subscr...@dubbo.incubator.apache.org): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo. -- [comm...@dubbo.incubator.apache.org](mailto:commits-subscr...@dubbo.incubator.apache.org): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development. -- [notificat...@dubbo.incubator.apache.org](mailto:notification-subscr...@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list. - -### Reporting issue - -Please follow the [template](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues. - -### Code Conventions -Our code style is almost in line with the standard java conventions (Popular IDE's default setting satisfy this), with the following additional restricts: -* If there are more than 120 characters in current line, start a new line. - -* Make sure all new .java files to have a simple Javadoc class comment with at least a @date tag identifying birth, and preferably at least a paragraph on what the class is for. - -* Add the ASF license header comment to all new .java files (copy from existing files in the project) - -* Make sure no @author tag added to the file you contribute since @author tag is not used at Apache, other ways such as cvs will record all your contributions fairly. - -* Add some Javadocs and, if you change the namespace, some XSD doc elements. - -* A few unit tests should be added for a new feature or an important bugfix. - -* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). - -* When writing a commit message please follow these conventions, if you are fixing an existing issue please add Fixes #XXX at the end of the commit message (where XXX is the issue number). - -### Contribution flow - -This is a rough outline of what a contributor's workflow looks like: - -* Fork the current repository -* Create a topic branch from where to base the contribution. This is usually master. -* Make commits of logical units. -* Make sure commit messages are in the proper format (see below). -* Push changes in a topic branch to your forked repository. -* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md) -* Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below: -``` -git remote add upstream g...@github.com:apache/incubator-dubbo.git -git fetch upstream -git rebase upstream/master -git checkout -b your_awesome_patch -... add some work -git push origin your_awesome_patch -``` -* Submit a pull request to apache/incubator-dubbo and wait for the reply. - -Thanks
[incubator-dubbo] branch 2.6.3-release updated: Update CHANGES.md
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch 2.6.3-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.6.3-release by this push: new e4aea68 Update CHANGES.md e4aea68 is described below commit e4aea68c97fd1552fc0f790b36788b6f0101cc7c Author: Huang YunKun AuthorDate: Fri Jul 27 14:03:26 2018 +0800 Update CHANGES.md polish --- CHANGES.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 02b55f2..400a664 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ # Release Notes ## 2.6.3 -Eahancements / Features +Enhancements / Features - Support implicit delivery of attachments from provider to consumer, #889 - Support inject Spring bean to SPI by bean type, #1837 @@ -10,7 +10,7 @@ Eahancements / Features - Remove validation key from provider url on Consumer side, config depedently, #1386 - Introducing the Bootstrap module as a unified entry for Dubbo startup and resource destruction, #1820 - Open TCP_NODELAY on Netty 3, #1746 -- Support specify proxy type on provide side, #1873 +- Support specify proxy type on provider side, #1873 - Support dbindex in redis, #1831 - Upgrade tomcat to 8.5.31, #1781 @@ -31,7 +31,7 @@ Performance Tuning - ChannelState branch prediction optimization. #1643 - Optimize AtomicPositiveInteger, less memory and compute cost, #348 -- Introduce embeded Threadlocal to replace the JDK implementation, #1745 +- Introduce embedded Threadlocal to replace the JDK implementation, #1745 Hessian-lite @@ -44,13 +44,13 @@ Issues and Pull Requests, check [milestone-2.6.3](https://github.com/apache/incu ## 2.6.2 1. Hessian-lite serialization: revert locale serialization for compatibility, #1413 -2. Asset transfer to ASF, includeing pom, license, DISCLAIMER and so on, #1491 +2. Asset transfer to ASF, including pom, license, DISCLAIMER and so on, #1491 3. Introduce of new dispatcher policy: EagerThreadpool, #1568 4. Separate monitor data with group and version, #1407 5. Spring Boot Enhancenment, #1611 -6. Gaceful shutdown enhancement +6. Graceful shutdown enhancement - Remove exporter destroy logic in AnnotationBean. - Waiting for registry notification on consumer side by checking channel state. 7. Simplify consumer/provider side check in RpcContext, #1444. -Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). \ No newline at end of file +Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15).
[incubator-dubbo-ops] branch master updated: Fix bugs for no applications, services && enhance script start.sh
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/master by this push:
new 3dc581f Fix bugs for no applications, services && enhance script
start.sh
3dc581f is described below
commit 3dc581f938eb84ae424cb7b2c63f0f8571150a03
Author: huadong
AuthorDate: Tue Jul 24 22:55:43 2018 +0800
Fix bugs for no applications, services && enhance script start.sh
* Fix no log output by adding package dependency of slf4j-log4j12.
* Fix no charts,applications and services issue
* Enhance script start.sh
---
dubbo-monitor-simple/pom.xml | 5 -
.../main/resources/META-INF/assembly/bin/start.sh| 20 +---
.../internal/com.alibaba.dubbo.container.Container | 2 +-
.../src/main/resources/conf/dubbo.properties | 4 ++--
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/dubbo-monitor-simple/pom.xml b/dubbo-monitor-simple/pom.xml
index 0443934..0a422d3 100644
--- a/dubbo-monitor-simple/pom.xml
+++ b/dubbo-monitor-simple/pom.xml
@@ -59,9 +59,12 @@ limitations under the License.
slf4j-api
+ org.slf4j
+ slf4j-log4j12
+
+
javax.servlet
javax.servlet-api
-provided
diff --git
a/dubbo-monitor-simple/src/main/resources/META-INF/assembly/bin/start.sh
b/dubbo-monitor-simple/src/main/resources/META-INF/assembly/bin/start.sh
index 3b491f0..026903a 100755
--- a/dubbo-monitor-simple/src/main/resources/META-INF/assembly/bin/start.sh
+++ b/dubbo-monitor-simple/src/main/resources/META-INF/assembly/bin/start.sh
@@ -5,10 +5,16 @@ cd ..
DEPLOY_DIR=`pwd`
CONF_DIR=$DEPLOY_DIR/conf
+
SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties |
tr -d '\r'`
SERVER_PROTOCOL=`sed '/dubbo.protocol.name/!d;s/.*=//' conf/dubbo.properties |
tr -d '\r'`
-SERVER_HOST=`sed '/dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties | tr
-d '\r'`
-SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | tr
-d '\r'`
+if [ -z "$SERVER_HOST" ]; then
+SERVER_HOST=`sed '/dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties |
tr -d '\r'`
+fi
+
+if [ -z "$SERVER_PORT" ]; then
+SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties |
tr -d '\r'`
+fi
LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d
'\r'`
if [ -z "$SERVER_HOST" ]; then
@@ -48,7 +54,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
LIB_DIR=$DEPLOY_DIR/lib
LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"`
-JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true
"
JAVA_DEBUG_OPTS=""
if [ "$1" = "debug" ]; then
JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "
@@ -90,3 +96,11 @@ echo "OK!"
PIDS=`ps -f | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}'`
echo "PID: $PIDS"
echo "STDOUT: $STDOUT_FILE"
+
+if [ "$1" = "run" ]; then
+while ps -p $PIDS > /dev/null
+do
+echo -e ".\c"
+sleep 1
+done
+fi
diff --git
a/dubbo-monitor-simple/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container
b/dubbo-monitor-simple/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container
index 2e6beaa..b3bfcf6 100644
---
a/dubbo-monitor-simple/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container
+++
b/dubbo-monitor-simple/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container
@@ -1,2 +1,2 @@
registry=com.alibaba.dubbo.monitor.simple.container.RegistryContainer
-jetty=com.alibaba.dubbo.monitor.simple.container.JettyContainer
\ No newline at end of file
+jetty-monitor=com.alibaba.dubbo.monitor.simple.container.JettyContainer
\ No newline at end of file
diff --git a/dubbo-monitor-simple/src/main/resources/conf/dubbo.properties
b/dubbo-monitor-simple/src/main/resources/conf/dubbo.properties
index ef75f17..9bece5f 100644
--- a/dubbo-monitor-simple/src/main/resources/conf/dubbo.properties
+++ b/dubbo-monitor-simple/src/main/resources/conf/dubbo.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-dubbo.container=log4j,spring,registry,jetty
+dubbo.container=log4j,spring,registry,jetty-monitor
dubbo.application.name=simple-monitor
dubbo.application.owner=dubbo
#dubbo.registry.address=mu
[incubator-dubbo-ops] branch master updated: Update i18n and helpUrl configuration
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/master by this push:
new adef23a Update i18n and helpUrl configuration
adef23a is described below
commit adef23a1fbf2d0451bd04b5fe35a70e45c89914a
Author: QingDeng
AuthorDate: Tue Jul 24 10:54:03 2018 +0800
Update i18n and helpUrl configuration
* Add $helpUrl configuration & Fix provider detail page error.
---
.../java/com/alibaba/dubboadmin/governance/util/WebConstants.java | 5 +
.../main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java| 1 +
.../java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java | 2 ++
dubbo-admin/src/main/resources/i18n/message.properties | 3 +--
dubbo-admin/src/main/resources/i18n/message_en.properties | 6 ++
dubbo-admin/src/main/resources/i18n/message_zh.properties | 6 ++
.../i18n/{message_zh.properties => message_zh_CN.properties}| 6 ++
dubbo-admin/src/main/resources/i18n/message_zh_TW.properties| 6 ++
8 files changed, 33 insertions(+), 2 deletions(-)
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java
index c08f405..9d6cc3f 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java
@@ -57,6 +57,11 @@ public class WebConstants {
* Operation record page The default page record shows the number of
records
*/
public static final Integer OPRATION_RECORDS_PAGE_SIZE = 100;
+
+/**
+ * Help Url
+ */
+public static final String
HELP_URL="https://github.com/apache/incubator-dubbo-ops;;
Map context;
public static final Map mapper = new HashMap<>();
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java
index ff7bd64..4cab02f 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java
@@ -68,6 +68,7 @@ public class BaseController {
model.addAttribute("rootContextPath", new
RootContextPath(request.getContextPath()));
model.addAttribute("tool", tool);
model.addAttribute("_method", methodName);
+model.addAttribute("helpUrl", WebConstants.HELP_URL);
model.addAttribute("_type", type);
}
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java
index 63c3215..b6bb565 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java
@@ -28,6 +28,7 @@ import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import com.alibaba.dubboadmin.governance.service.ConsumerService;
import com.alibaba.dubboadmin.governance.service.ProviderService;
+import com.alibaba.dubboadmin.governance.util.WebConstants;
import com.alibaba.dubboadmin.registry.common.domain.Consumer;
import com.alibaba.dubboadmin.registry.common.domain.Provider;
import com.alibaba.dubboadmin.web.pulltool.RootContextPath;
@@ -77,6 +78,7 @@ public class IndexController {
model.addAttribute("providers", pList.size());
model.addAttribute("consumers", cList.size());
model.addAttribute("applications", applications.size());
+model.addAttribute("helpUrl", WebConstants.HELP_URL);
model.addAttribute("tool", new Tool());
return "home/screen/index";
diff --git a/dubbo-admin/src/main/resources/i18n/message.properties
b/dubbo-admin/src/main/resources/i18n/message.properties
index 6222972..a9fd83f 100644
--- a/dubbo-admin/src/main/resources/i18n/message.properties
+++ b/dubbo-admin/src/main/resources/i18n/message.properties
@@ -13,5 +13,4 @@
# 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.
-#
-
+#
\ No newline at end of file
diff --git a/dubbo-admin/src/main/resources/i18n/message_en.properties
b/dubbo-admin/src/main/resources/i18n/message_en.properties
index 13e2af9..431bca0 100644
--- a/dubbo-admin/src/main/resources/i18n/message_en.properties
+++ b/dubbo-admin/src/main/resources/i18n/message_en.properties
@@ -
