You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/10/01 14:48:00 UTC
[dubbo] branch 2.7.4-release updated (a43643d -> 7d65897)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from a43643d Remove the outdated and misleading comment (#5132)
new 781ec63 update LICENSE: include the MIT license text of referenced code.
new 805e2da remove or replace unreachable URL links.
new 7d65897 add Apache License header.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 22 ++++++++++++++++++++--
.../org/apache/dubbo/common/utils/ConfigUtils.java | 1 -
.../apache/dubbo/common/bytecode/WrapperTest.java | 6 ------
.../apache/dubbo/common/utils/ConfigUtilsTest.java | 2 +-
.../dubbo/config/AbstractServiceConfigTest.java | 13 ++++++-------
.../builders/AbstractServiceBuilderTest.java | 4 ++--
.../org/apache/dubbo/config/url/UrlTestBase.java | 2 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 1 -
.../serialize/gson/GsonJsonObjectOutputTest.java | 2 +-
.../fastjson/FastJsonObjectOutputTest.java | 3 ++-
licenseCheck.sh | 16 ++++++++++++++++
11 files changed, 49 insertions(+), 23 deletions(-)
[dubbo] 01/03: update LICENSE: include the MIT license text of
referenced code.
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 781ec637da9f1d16733fc811ea333d9153a40ae0
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Sep 30 14:39:42 2019 +0800
update LICENSE: include the MIT license text of referenced code.
---
LICENSE | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/LICENSE b/LICENSE
index 11eea3b..3b1199b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -222,6 +222,24 @@ This product contains a modified portion of 'Netty', an event-driven asynchronou
For the org.apache.dubbo.common.utils.CIDRUtils :
-This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils',
- under a "MIT License" license, see https://github.com/edazdarevic/CIDRUtils/blob/master/CIDRUtils.java
+This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils' published at
+https://github.com/edazdarevic/CIDRUtils. The project is licensed under a MIT License:
+ * The MIT License
+ *
+ * Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
[dubbo] 02/03: remove or replace unreachable URL links.
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 805e2daebd7f05229281f074ed85dc9dbf090c14
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Sep 30 14:42:11 2019 +0800
remove or replace unreachable URL links.
---
.../java/org/apache/dubbo/common/utils/ConfigUtils.java | 1 -
.../java/org/apache/dubbo/common/bytecode/WrapperTest.java | 6 ------
.../java/org/apache/dubbo/common/utils/ConfigUtilsTest.java | 2 +-
.../org/apache/dubbo/config/AbstractServiceConfigTest.java | 13 ++++++-------
.../dubbo/config/builders/AbstractServiceBuilderTest.java | 4 ++--
.../test/java/org/apache/dubbo/config/url/UrlTestBase.java | 2 +-
.../org/apache/dubbo/remoting/codec/ExchangeCodecTest.java | 1 -
.../common/serialize/gson/GsonJsonObjectOutputTest.java | 2 +-
.../common/serialize/fastjson/FastJsonObjectOutputTest.java | 3 ++-
9 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java
index 072b456..c1f4711 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java
@@ -260,7 +260,6 @@ public class ConfigUtils {
String errMsg = String.format("only 1 %s file is expected, but %d dubbo.properties files found on class path: %s",
fileName, list.size(), list.toString());
logger.warn(errMsg);
- // throw new IllegalStateException(errMsg); // see http://code.alibabatech.com/jira/browse/DUBBO-133
}
// fall back to use method getResourceAsStream
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java
index 75f8972..d3c4d90 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java
@@ -113,9 +113,6 @@ public class WrapperTest {
});
}
- /**
- * see http://code.alibabatech.com/jira/browse/DUBBO-571
- */
@Test
public void test_getDeclaredMethodNames_ContainExtendsParentMethods() throws Exception {
assertArrayEquals(new String[]{"hello",}, Wrapper.getWrapper(Parent1.class).getMethodNames());
@@ -123,9 +120,6 @@ public class WrapperTest {
assertArrayEquals(new String[]{}, Wrapper.getWrapper(Son.class).getDeclaredMethodNames());
}
- /**
- * see http://code.alibabatech.com/jira/browse/DUBBO-571
- */
@Test
public void test_getMethodNames_ContainExtendsParentMethods() throws Exception {
assertArrayEquals(new String[]{"hello", "world"}, Wrapper.getWrapper(Son.class).getMethodNames());
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java
index 21b9417..1f82a52 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java
@@ -229,7 +229,7 @@ public class ConfigUtilsTest {
}
- @Disabled("see http://code.alibabatech.com/jira/browse/DUBBO-133")
+ @Disabled("Not know why disabled, the original link explaining this was reachable.")
@Test
public void testLoadPropertiesMultiFileNotRootPathException() throws Exception {
try {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
index 3f12e44..ed5144d 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java
@@ -25,16 +25,15 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import static org.apache.dubbo.rpc.Constants.EXPORTER_LISTENER_KEY;
+import static org.apache.dubbo.rpc.Constants.SERVICE_FILTER_KEY;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.apache.dubbo.rpc.Constants.SERVICE_FILTER_KEY;
-import static org.apache.dubbo.rpc.Constants.EXPORTER_LISTENER_KEY;
public class AbstractServiceConfigTest {
@Test
@@ -75,11 +74,11 @@ public class AbstractServiceConfigTest {
@Test
public void testDocument() throws Exception {
ServiceConfig serviceConfig = new ServiceConfig();
- serviceConfig.setDocument("http://dubbo.io");
- assertThat(serviceConfig.getDocument(), equalTo("http://dubbo.io"));
+ serviceConfig.setDocument("http://dubbo.apache.org");
+ assertThat(serviceConfig.getDocument(), equalTo("http://dubbo.apache.org"));
Map<String, String> parameters = new HashMap<String, String>();
AbstractServiceConfig.appendParameters(parameters, serviceConfig);
- assertThat(parameters, hasEntry("document", "http%3A%2F%2Fdubbo.io"));
+ assertThat(parameters, hasEntry("document", "http%3A%2F%2Fdubbo.apache.org"));
}
@Test
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractServiceBuilderTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractServiceBuilderTest.java
index 59dee6e..d07fdd9 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractServiceBuilderTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractServiceBuilderTest.java
@@ -75,8 +75,8 @@ class AbstractServiceBuilderTest {
@Test
void document() {
ServiceBuilder builder = new ServiceBuilder();
- builder.document("http://dubbo.io");
- Assertions.assertEquals("http://dubbo.io", builder.build().getDocument());
+ builder.document("http://dubbo.apache.org");
+ Assertions.assertEquals("http://dubbo.apache.org", builder.build().getDocument());
}
@Test
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
index 950b89e..1a313bb 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java
@@ -66,7 +66,7 @@ public class UrlTestBase {
{"deprecated", "deprecated", "boolean", false, true, "", "", "", "", ""},
{"dynamic", "dynamic", "boolean", true, false, "", "", "", "", ""},
{"accesslog", "accesslog", "string", "", "haominTest", "", "", "", "", ""},
- {"document", "document", "string", "", "http://b2b-doc.alibaba-inc.com/display/RC/dubbo_devguide.htm?testquery=你好你好", "", "", "", "", ""},
+ {"document", "document", "string", "", "http://dubbo.apache.org/zh-cn/docs/user/quick-start.html?testquery=你好你好", "", "", "", "", ""},
{"weight", "weight", "int", 0, 90, "", "", "", "", ""},
//{"filter", "service.filter", "string", "", "", "", "", "", "", ""},
diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
index d4af378..4b074ba 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
@@ -402,7 +402,6 @@ public class ExchangeCodecTest extends TelnetCodecTest {
// Assertions.assertEquals(response.getProtocolVersion(), obj.getVersion());
}
- // http://code.alibabatech.com/jira/browse/DUBBO-392
@Test
public void testMessageLengthGreaterThanMessageActualLength() throws Exception {
Channel channel = getCliendSideChannel(url);
diff --git a/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java b/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java
index 5de73c1..0ff2633 100644
--- a/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java
+++ b/dubbo-serialization/dubbo-serialization-gson/src/test/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutputTest.java
@@ -126,7 +126,7 @@ public class GsonJsonObjectOutputTest {
@Test
public void testWriteObject() throws IOException, ClassNotFoundException {
- Image image = new Image("http://dubbo.io/logo.png", "logo", 300, 480, Image.Size.SMALL);
+ Image image = new Image("http://dubbo.apache.org/img/dubbo_white.png", "logo", 300, 480, Image.Size.SMALL);
this.gsonJsonObjectOutput.writeObject(image);
this.flushToInput();
diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
index c851855..48fb1ce 100644
--- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
+++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.common.serialize.fastjson;
import org.apache.dubbo.common.serialize.model.media.Image;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -124,7 +125,7 @@ public class FastJsonObjectOutputTest {
@Test
public void testWriteObject() throws IOException, ClassNotFoundException {
- Image image = new Image("http://dubbo.io/logo.png", "logo", 300, 480, Image.Size.SMALL);
+ Image image = new Image("http://dubbo.apache.org/img/dubbo_white.png", "logo", 300, 480, Image.Size.SMALL);
this.fastJsonObjectOutput.writeObject(image);
this.flushToInput();
[dubbo] 03/03: add Apache License header.
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7d65897d44bd5477e2b3588b734fd8aaceae28a6
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Sep 30 14:42:29 2019 +0800
add Apache License header.
---
licenseCheck.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/licenseCheck.sh b/licenseCheck.sh
index da0aa17..ba39660 100755
--- a/licenseCheck.sh
+++ b/licenseCheck.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+#
+# 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.
+#
APPEND_ARG=""
FOLDER="./"