[incubator-servicecomb-service-center] 01/01: Merge pull request #344 from little-cui/master

2018-05-08 Thread asifdxtreme 
This is an automated email from the ASF dual-hosted git repository.

asifdxtreme pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git

commit 392d8cd172de731c43ea3906338537cd7e8d3d83
Merge: 08f0814 04840f1
Author: Mohammad Asif Siddiqui 
AuthorDate: Wed May 9 10:28:48 2018 +0530

Merge pull request #344 from little-cui/master

SCB-563 Fix the incorrect metric label value

 integration/health-metrics-grafana.json | 30 +++---
 server/core/backend/store/metric.go | 11 +--
 2 files changed, 24 insertions(+), 17 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
asifdxtr...@apache.org.

[incubator-servicecomb-service-center] branch master updated (08f0814 -> 392d8cd)

2018-05-08 Thread asifdxtreme 
This is an automated email from the ASF dual-hosted git repository.

asifdxtreme pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git.


from 08f0814  SCB-561 Support ipv6 (#343)
 add 04840f1  Update grafana template
 new 392d8cd  Merge pull request #344 from little-cui/master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 integration/health-metrics-grafana.json | 30 +++---
 server/core/backend/store/metric.go | 11 +--
 2 files changed, 24 insertions(+), 17 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
asifdxtr...@apache.org.

[incubator-servicecomb-service-center] branch master updated: SCB-561 Support ipv6 (#343)

2018-05-08 Thread littlecui 
This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
 new 08f0814  SCB-561 Support ipv6 (#343)
08f0814 is described below

commit 08f08147b744dcea017c3099121d8c11fdf78ef9
Author: little-cui 
AuthorDate: Wed May 9 10:06:59 2018 +0800

SCB-561 Support ipv6 (#343)

* SCB-561 Support ipv6

* SCB-561 Support ipv6

* SCB-561 Support ipv6

* SCB-561 Support ipv6
---
 etc/conf/app.conf   |  3 +++
 frontend/main.go|  6 --
 pkg/util/net.go |  6 +-
 pkg/util/net_test.go| 31 +--
 server/api.go   | 17 +
 server/core/backend/store/common.go |  1 +
 server/core/backend/store/extend.go |  2 +-
 server/core/common.go   | 24 
 server/rest/server.go   |  7 +--
 server/rpc/server.go|  7 +--
 server/server.go|  8 ++--
 server/service/schema_test.go   |  2 +-
 12 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/etc/conf/app.conf b/etc/conf/app.conf
index c2e7e88..df25c30 100644
--- a/etc/conf/app.conf
+++ b/etc/conf/app.conf
@@ -26,6 +26,9 @@ frontend_host_port = 30103
 ###
 # sever options
 ###
+# if you want to listen at ipv6 address, then set the httpaddr value like:
+# httpaddr = 2400:A480::200::159(global scope)
+# httpaddr = fe80::f816:3eff:fe17:c38b%eth0 (link-local scope)
 httpaddr = 127.0.0.1
 httpport = 30100
 
diff --git a/frontend/main.go b/frontend/main.go
index dc5a9a3..237b9ff 100644
--- a/frontend/main.go
+++ b/frontend/main.go
@@ -21,6 +21,8 @@ import (
"fmt"
 
"github.com/astaxie/beego"
+   "net"
+   "net/url"
 )
 
 type Config struct {
@@ -40,8 +42,8 @@ func main() {
flag.Parse()
 
cfg := Config{}
-   cfg.scAddr = fmt.Sprintf("http://%s:%d;, scIp, scPort)
-   cfg.frontendAddr = fmt.Sprintf("%s:%d", frontendIp, *port)
+   cfg.scAddr = fmt.Sprintf("http://%s/;, 
net.JoinHostPort(url.PathEscape(scIp), fmt.Sprint(scPort)))
+   cfg.frontendAddr = net.JoinHostPort(frontendIp, fmt.Sprint(*port))
 
// run frontend web server
Serve(cfg)
diff --git a/pkg/util/net.go b/pkg/util/net.go
index 457f9b6..777a96d 100644
--- a/pkg/util/net.go
+++ b/pkg/util/net.go
@@ -55,11 +55,7 @@ func ParseEndpoint(ep string) (string, error) {
if err != nil {
return "", err
}
-   port := u.Port()
-   if len(port) > 0 {
-   return u.Hostname() + ":" + port, nil
-   }
-   return u.Hostname(), nil
+   return u.Host, nil
 }
 
 func ParseIpPort(addr string) IpPort {
diff --git a/pkg/util/net_test.go b/pkg/util/net_test.go
index e4d41b8..0116f3d 100644
--- a/pkg/util/net_test.go
+++ b/pkg/util/net_test.go
@@ -60,10 +60,37 @@ func TestInetNtoa(t *testing.T) {
 func TestParseIpPort(t *testing.T) {
ipPort := ParseIpPort("0.0.0.0")
if ipPort.IP != "0.0.0.0" || ipPort.Port != 0 {
-   t.Fatalf("ParseIpPort(0.0.0.0) error", n3)
+   t.Fatalf("ParseIpPort(0.0.0.0) error")
}
ipPort = ParseIpPort("0.0.0.0:1")
if ipPort.IP != "0.0.0.0" || ipPort.Port != 1 {
-   t.Fatalf("ParseIpPort(0.0.0.0) error", n3)
+   t.Fatalf("ParseIpPort(0.0.0.0) error")
+   }
+}
+
+func TestParseEndpoint(t *testing.T) {
+   ep, err := ParseEndpoint("")
+   if err != nil || len(ep) > 0 {
+   t.Fatalf("ParseEndpoint(\"\") failed, err = %s, ep = %s", err, 
ep)
+   }
+   ep, err = ParseEndpoint(":s")
+   if err == nil || len(ep) > 0 {
+   t.Fatalf("ParseEndpoint(\":s\") failed, err = %s, ep = %s", 
err, ep)
+   }
+   ep, err = ParseEndpoint("rest://127.0.0.1/?a=b")
+   if err != nil || ep != "127.0.0.1" {
+   t.Fatalf("ParseEndpoint(\"rest://127.0.0.1/?a=b\") failed, err 
= %s, ep = %s", err, ep)
+   }
+   ep, err = ParseEndpoint("rest://127.0.0.1:30100/?a=b")
+   if err != nil || ep != "127.0.0.1:30100" {
+   t.Fatalf("ParseEndpoint(\"rest://127.0.0.1:30100/?a=b\") 
failed, err = %s, ep = %s", err, ep)
+   }
+   ep, err = ParseEndpoint("rest://[2400:A480::200::159]:30100/?a=b")
+   if err != nil || ep != "[2400:A480::200::159]:30100" {
+   
t.Fatalf("ParseEndpoint(\"rest://[2400:A480::200::159]:30100/?a=b\") 
failed, err = %s, ep = %s", err, ep)
+   }
+   ep, err = 
ParseEndpoint("rest://[fe80::f816:3eff:fe17:c38b%25eht0]:30100/?a=b")
+   if err !=

[incubator-servicecomb-service-center] branch asifdxtreme-patch-1 deleted (was b385bb3)

2018-05-08 Thread asifdxtreme 
This is an automated email from the ASF dual-hosted git repository.

asifdxtreme pushed a change to branch asifdxtreme-patch-1
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git.


 was b385bb3  Update the description of Service-Center in Readme

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
asifdxtr...@apache.org.

[incubator-servicecomb-service-center] 01/01: Merge pull request #341 from little-cui/master

2018-05-08 Thread asifdxtreme 
This is an automated email from the ASF dual-hosted git repository.

asifdxtreme pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git

commit 8cebb17691d23ce964b27d585e3a6ef67f1b3018
Merge: ef3193e c22c0e8
Author: Mohammad Asif Siddiqui 
AuthorDate: Tue May 8 14:22:48 2018 +0530

Merge pull request #341 from little-cui/master

SCB-549 Do not check the instance endpoint whether belong to other service

 server/service/instances.go | 43 +--
 1 file changed, 5 insertions(+), 38 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
asifdxtr...@apache.org.

[incubator-servicecomb-java-chassis] branch master updated (f649c00 -> 48481f7)

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.


from f649c00  [SCB-542] Update netty's version to 4.1.24
 new 3b38cdd  SCB-504 fix multi service center address
 new 1664e02  SCB-504 fix warnings
 new 9daca22  SCB-504 upgrade springs spring to 4.3.16 spring boot to 
1.5.12.RELEASE spring cloud to Edgware.SR3
 new bcaec8d  SCB-504 fix pr comment
 new 48481f7  SCB-504 fix pr comment

The 5 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:
 .../servicecomb/demo/edge/consumer/Consumer.java   |  6 ++--
 .../demo/springmvc/server/CodeFirstSpringmvc.java  |  6 ++--
 .../TestLastPropertyPlaceholderConfigurer.java |  2 +-
 .../zuul/tracing/SpringCloudZuulTracingTest.java   | 10 +++
 .../tests/SpringMvcIntegrationTestBase.java| 30 +--
 java-chassis-dependencies/pom.xml  | 12 ++--
 java-chassis-distribution/src/release/LICENSE  | 34 +++---
 samples/bmi/build.gradle   |  2 +-
 samples/bmi/pom.xml|  2 +-
 .../config/ServiceRegistryConfig.java  |  2 +-
 .../starter/discovery/CseDiscoveryClient.java  |  1 +
 .../discovery/CseDiscoveryClientConfiguration.java |  4 +--
 .../starter/discovery/TestCseDiscoveryClient.java  |  1 -
 13 files changed, 52 insertions(+), 60 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.

[incubator-servicecomb-java-chassis] 05/05: SCB-504 fix pr comment

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 48481f77b1179671dfc3b2d81c417b8dc4f8b0f9
Author: zhengyangyong 
AuthorDate: Thu May 3 16:50:25 2018 +0800

SCB-504 fix pr comment

Signed-off-by: zhengyangyong 
---
 .../servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
index c37c84e..611916c 100644
--- 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
+++ 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
@@ -327,7 +327,7 @@ public class SpringMvcIntegrationTestBase {
 
 ResponseEntity response = restTemplate
 .postForEntity(codeFirstUrl + "uploadWithoutAnnotation", new 
HttpEntity<>(map, headers), String.class);
-assertThat(response.getStatusCodeValue(), 
is(response.getStatusCodeValue()));
+assertThat(response.getStatusCodeValue(), is(590));
 assertThat(response.getBody(), is("CommonExceptionData [message=Cse 
Internal Server Error]"));
   }
 

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.

[incubator-servicecomb-java-chassis] 02/05: SCB-504 fix warnings

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 1664e0270d456241af892258279a9f029866e8d7
Author: zhengyangyong 
AuthorDate: Wed May 2 15:53:25 2018 +0800

SCB-504 fix warnings

Signed-off-by: zhengyangyong 
---
 .../java/org/apache/servicecomb/demo/edge/consumer/Consumer.java| 6 +++---
 .../servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java   | 6 +++---
 .../servicecomb/config/TestLastPropertyPlaceholderConfigurer.java   | 2 +-
 .../springboot/starter/discovery/CseDiscoveryClient.java| 1 +
 .../starter/discovery/CseDiscoveryClientConfiguration.java  | 4 ++--
 .../springboot/starter/discovery/TestCseDiscoveryClient.java| 1 -
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
 
b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
index 284a883..7bdbb54 100644
--- 
a/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
+++ 
b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
@@ -114,7 +114,7 @@ public class Consumer {
 }, resp -> {
   byte[] buf = new byte[1 * 1024 * 1024];
   try (InputStream is = resp.getBody()) {
-for (;;) {
+for (; ; ) {
   int len = is.read(buf);
   if (len == -1) {
 break;
@@ -125,14 +125,14 @@ public class Consumer {
   }
   return null;
 });
-Assert.isTrue(size.get() == 10 * 1024 * 1024);
+Assert.isTrue(size.get() == 10 * 1024 * 1024, "size is : " + 
String.valueOf(size.get()) + " not 10 * 1024 * 1024");
 System.out.println("test download bigFile finished");
   }
 
   protected void testDownload() {
 String url = edgePrefix + "/v2/download";
 String content = template.getForObject(url, String.class);
-Assert.isTrue("download".equals(content));
+Assert.isTrue("download".equals(content), "content is : " + content + " 
not download");
 System.out.println("test download finished");
   }
 
diff --git 
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
 
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
index 5bbd007..8cae971 100644
--- 
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
+++ 
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
@@ -85,7 +85,7 @@ public class CodeFirstSpringmvc {
   String content1 = IOUtils.toString(is1);
   String content2 = IOUtils.toString(is2);
   return String.format("%s:%s:%s\n"
-  + "%s:%s:%s",
+  + "%s:%s:%s",
   file1.getOriginalFilename(),
   file1.getContentType(),
   content1,
@@ -310,7 +310,7 @@ public class CodeFirstSpringmvc {
 return new OutputModelForTestIgnore("output_id", input.getInputId(), 
input.getContent(), input.getInputObject(),
 input.getInputJsonObject(), input.getInputIgnoreInterface(),
 new Person("outputSomeone"), new JsonObject("{\"OutputJsonKey\" : 
\"OutputJsonValue\"}"), () -> {
-});
+});
   }
 
   @SuppressWarnings("unchecked")
@@ -336,7 +336,7 @@ public class CodeFirstSpringmvc {
   public String testform(HttpServletRequest request) {
 String form1 = request.getParameter("form1");
 String form2 = request.getParameter("form2");
-Assert.notNull(form1);
+Assert.notNull(form1, "from1 is null");
 return form1 + form2;
   }
 
diff --git 
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestLastPropertyPlaceholderConfigurer.java
 
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestLastPropertyPlaceholderConfigurer.java
index a6dfc39..d3d8491 100644
--- 
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestLastPropertyPlaceholderConfigurer.java
+++ 
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestLastPropertyPlaceholderConfigurer.java
@@ -61,7 +61,7 @@ public class TestLastPropertyPlaceholderConfigurer {
   bean.resolver.resolveStringValue("${b}");
   Assert.fail("must throw exception");
 } catch (IllegalArgumentException e) {
-  Assert.assertEquals("Could not resolve placeholder 'b' in string value 
\"${b}\"", e.getMessage());
+  Assert.assertEquals("Could not resolve placeholder 'b' in value 
\"${b}\"", e.getMessage());
 }
 
 context.close();
diff --git

[incubator-servicecomb-java-chassis] 03/05: SCB-504 upgrade springs spring to 4.3.16 spring boot to 1.5.12.RELEASE spring cloud to Edgware.SR3

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 9daca22a0c4f342a81314b3e8901abb6e0b20838
Author: zhengyangyong 
AuthorDate: Wed May 2 15:55:08 2018 +0800

SCB-504 upgrade springs
spring to 4.3.16
spring boot to 1.5.12.RELEASE
spring cloud to Edgware.SR3

Signed-off-by: zhengyangyong 
---
 .../zuul/tracing/SpringCloudZuulTracingTest.java   | 13 +
 .../tests/SpringMvcIntegrationTestBase.java| 28 --
 java-chassis-dependencies/pom.xml  |  6 ++--
 java-chassis-distribution/src/release/LICENSE  | 34 +++---
 parent/pom.xml |  1 +
 samples/bmi/build.gradle   |  2 +-
 samples/bmi/pom.xml|  2 +-
 7 files changed, 37 insertions(+), 49 deletions(-)

diff --git 
a/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
 
b/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
index 06dabf5..60d8966 100644
--- 
a/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
+++ 
b/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.servicecomb.spring.cloud.zuul.tracing;
 
+import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static 
org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.OK;
 
 import java.util.Collection;
@@ -82,15 +82,18 @@ public class SpringCloudZuulTracingTest extends 
TracingTestBase {
   @Test
   public void tracesFailedCallsReceivedByZuul() throws InterruptedException {
 ResponseEntity responseEntity = 
testRestTemplate.getForEntity("/dummy/rest/oops", String.class);
-
-assertThat(responseEntity.getStatusCode(), is(INTERNAL_SERVER_ERROR));
-
+try {
+  int code = responseEntity.getStatusCode().value();
+  assertThat(code, is(590));
+  expectFailing(IllegalArgumentException.class);
+} catch (Exception ignore) {
+}
 TimeUnit.MILLISECONDS.sleep(1000);
 
 Collection tracingMessages = 
appender.pollLogs(".*\\[\\w+/\\w+/\\w*\\]\\s+INFO.*(logged tracing|/oops).*");
 assertThat(tracingMessages.size(), greaterThanOrEqualTo(2));
 
-assertThatSpansReceivedByZipkin(tracingMessages, "/dummy/rest/oops", 
"500", "/oops", "590");
+assertThatSpansReceivedByZipkin(tracingMessages, "/dummy/rest/oops", 
"/oops", "590");
   }
 
   @Test
diff --git 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
index a00dbbe..0e3df63 100644
--- 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
+++ 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
@@ -17,14 +17,12 @@
 
 package org.apache.servicecomb.demo.springmvc.tests;
 
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static 
org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
@@ -69,9 +67,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 import org.springframework.web.client.AsyncRestTemplate;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.client.UnknownHttpStatusCodeException;

[incubator-servicecomb-java-chassis] 04/05: SCB-504 fix pr comment

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit bcaec8d9306b028c9bd1650fa92cca650e261fb0
Author: zhengyangyong 
AuthorDate: Thu May 3 11:21:29 2018 +0800

SCB-504 fix pr comment

Signed-off-by: zhengyangyong 
---
 .../cloud/zuul/tracing/SpringCloudZuulTracingTest.java | 11 ---
 .../demo/springmvc/tests/SpringMvcIntegrationTestBase.java | 14 --
 java-chassis-dependencies/pom.xml  |  6 ++
 parent/pom.xml |  1 -
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git 
a/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
 
b/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
index 60d8966..35a82b1 100644
--- 
a/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
+++ 
b/integration-tests/spring-zuul-tracing-tests/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringCloudZuulTracingTest.java
@@ -81,13 +81,10 @@ public class SpringCloudZuulTracingTest extends 
TracingTestBase {
 
   @Test
   public void tracesFailedCallsReceivedByZuul() throws InterruptedException {
-ResponseEntity responseEntity = 
testRestTemplate.getForEntity("/dummy/rest/oops", String.class);
-try {
-  int code = responseEntity.getStatusCode().value();
-  assertThat(code, is(590));
-  expectFailing(IllegalArgumentException.class);
-} catch (Exception ignore) {
-}
+ResponseEntity response = 
testRestTemplate.getForEntity("/dummy/rest/oops", String.class);
+assertThat(response.getStatusCodeValue(), is(590));
+assertThat(response.getBody(), is("CommonExceptionData [message=Cse 
Internal Server Error]"));
+
 TimeUnit.MILLISECONDS.sleep(1000);
 
 Collection tracingMessages = 
appender.pollLogs(".*\\[\\w+/\\w+/\\w*\\]\\s+INFO.*(logged tracing|/oops).*");
diff --git 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
index 0e3df63..c37c84e 100644
--- 
a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
+++ 
b/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
@@ -325,10 +325,10 @@ public class SpringMvcIntegrationTestBase {
 HttpHeaders headers = new HttpHeaders();
 headers.setContentType(MediaType.MULTIPART_FORM_DATA);
 
-String result = restTemplate
-.postForObject(codeFirstUrl + "uploadWithoutAnnotation", new 
HttpEntity<>(map, headers), String.class);
-
-assertThat(result, is("CommonExceptionData [message=Cse Internal Server 
Error]"));
+ResponseEntity response = restTemplate
+.postForEntity(codeFirstUrl + "uploadWithoutAnnotation", new 
HttpEntity<>(map, headers), String.class);
+assertThat(response.getStatusCodeValue(), 
is(response.getStatusCodeValue()));
+assertThat(response.getBody(), is("CommonExceptionData [message=Cse 
Internal Server Error]"));
   }
 
   @Test
@@ -628,8 +628,10 @@ public class SpringMvcIntegrationTestBase {
 
   @Test
   public void ensureServerBlowsUp() {
-String response = restTemplate.getForObject(controllerUrl + 
"sayhi?name=throwexception", String.class);
-assertThat(response, is("{\"message\":\"Cse Internal Server Error\"}"));
+ResponseEntity response = restTemplate
+.getForEntity(controllerUrl + "sayhi?name=throwexception", 
String.class);
+assertThat(response.getStatusCodeValue(), is(590));
+assertThat(response.getBody(), is("{\"message\":\"Cse Internal Server 
Error\"}"));
   }
 
   @Test
diff --git a/java-chassis-dependencies/pom.xml 
b/java-chassis-dependencies/pom.xml
index bc45003..10cc514 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -141,6 +141,12 @@
 test
   
   
+org.hamcrest
+hamcrest-all
+1.3
+test
+  
+  
 com.dyuproject.protostuff
 protostuff-api
 1.0.7.fixed.3500
diff --git a/parent/pom.xml b/parent/pom.xml
index 1956c6c..c21b2e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,6 @@
 
   org.hamcrest
   hamcrest-all
-  1.3
   test
 
 

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.

[incubator-servicecomb-java-chassis] 01/05: SCB-504 fix multi service center address

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 3b38cdd7346cfadc7057ea232e351100aeb8464a
Author: zhengyangyong 
AuthorDate: Wed May 2 15:51:40 2018 +0800

SCB-504 fix multi service center address

Signed-off-by: zhengyangyong 
---
 .../servicecomb/serviceregistry/config/ServiceRegistryConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
 
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index eb28ed7..113fed0 100644
--- 
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ 
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -130,7 +130,7 @@ public final class ServiceRegistryConfig {
 ArrayList ipPortList = new ArrayList<>();
 uriList.forEach(anUriList -> {
   try {
-URI uri = new URI(anUriList);
+URI uri = new URI(anUriList.trim());
 this.ssl = "https".equals(uri.getScheme());
 ipPortList.add(NetUtils.parseIpPort(uri.getScheme(), 
uri.getAuthority()));
   } catch (Exception e) {

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.

[incubator-servicecomb-java-chassis] branch master updated: [SCB-542] Update netty's version to 4.1.24

2018-05-08 Thread liubao 
This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
 new f649c00  [SCB-542] Update netty's version to 4.1.24
f649c00 is described below

commit f649c002d8218b72fde160dc263edbec6ed053ff
Author: xuyiyun0929 <32084552+xuyiyun0...@users.noreply.github.com>
AuthorDate: Thu May 3 19:18:17 2018 +0800

[SCB-542] Update netty's version to 4.1.24
---
 java-chassis-dependencies/pom.xml |  2 +-
 java-chassis-distribution/src/release/LICENSE | 24 
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java-chassis-dependencies/pom.xml 
b/java-chassis-dependencies/pom.xml
index 970fc6b..e08bdbb 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -45,7 +45,7 @@
 4.5.2
 1.5.2
 1.5.12
-4.1.17.Final
+4.1.24.Final
 2.0.7.Final
 ${basedir}/../..
 5.3.2.Final
diff --git a/java-chassis-distribution/src/release/LICENSE 
b/java-chassis-distribution/src/release/LICENSE
index 62ff096..80b5830 100644
--- a/java-chassis-distribution/src/release/LICENSE
+++ b/java-chassis-distribution/src/release/LICENSE
@@ -358,19 +358,19 @@ Jackson-dataformat-XML 
(http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
 Jackson-dataformat-YAML 
(https://github.com/FasterXML/jackson-dataformats-text) 
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:bundle:2.9.5
 Javassist (http://www.javassist.org/) org.javassist:javassist:bundle:3.18.1-GA
 Log4j Implemented Over SLF4J (http://www.slf4j.org) 
org.slf4j:log4j-over-slf4j:jar:1.7.7
-Netty/Buffer (http://netty.io/netty-buffer/) 
io.netty:netty-buffer:jar:4.1.17.Final
-Netty/Codec (http://netty.io/netty-codec/) 
io.netty:netty-codec:jar:4.1.17.Final
-Netty/Codec/DNS (http://netty.io/netty-codec-dns/) 
io.netty:netty-codec-dns:jar:4.1.17.Final
-Netty/Codec/HTTP (http://netty.io/netty-codec-http/) 
io.netty:netty-codec-http:jar:4.1.17.Final
-Netty/Codec/HTTP2 (http://netty.io/netty-codec-http2/) 
io.netty:netty-codec-http2:jar:4.1.17.Final
-Netty/Codec/Socks (http://netty.io/netty-codec-socks/) 
io.netty:netty-codec-socks:jar:4.1.17.Final
-Netty/Common (http://netty.io/netty-common/) 
io.netty:netty-common:jar:4.1.17.Final
-Netty/Handler (http://netty.io/netty-handler/) 
io.netty:netty-handler:jar:4.1.17.Final
-Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/) 
io.netty:netty-handler-proxy:jar:4.1.17.Final
-Netty/Resolver (http://netty.io/netty-resolver/) 
io.netty:netty-resolver:jar:4.1.17.Final
-Netty/Resolver/DNS (http://netty.io/netty-resolver-dns/) 
io.netty:netty-resolver-dns:jar:4.1.17.Final
+Netty/Buffer (http://netty.io/netty-buffer/) 
io.netty:netty-buffer:jar:4.1.24.Final
+Netty/Codec (http://netty.io/netty-codec/) 
io.netty:netty-codec:jar:4.1.24.Final
+Netty/Codec/DNS (http://netty.io/netty-codec-dns/) 
io.netty:netty-codec-dns:jar:4.1.24.Final
+Netty/Codec/HTTP (http://netty.io/netty-codec-http/) 
io.netty:netty-codec-http:jar:4.1.24.Final
+Netty/Codec/HTTP2 (http://netty.io/netty-codec-http2/) 
io.netty:netty-codec-http2:jar:4.1.24.Final
+Netty/Codec/Socks (http://netty.io/netty-codec-socks/) 
io.netty:netty-codec-socks:jar:4.1.24.Final
+Netty/Common (http://netty.io/netty-common/) 
io.netty:netty-common:jar:4.1.24.Final
+Netty/Handler (http://netty.io/netty-handler/) 
io.netty:netty-handler:jar:4.1.24.Final
+Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/) 
io.netty:netty-handler-proxy:jar:4.1.24.Final
+Netty/Resolver (http://netty.io/netty-resolver/) 
io.netty:netty-resolver:jar:4.1.24.Final
+Netty/Resolver/DNS (http://netty.io/netty-resolver-dns/) 
io.netty:netty-resolver-dns:jar:4.1.24.Final
 Netty/TomcatNative(https://netty.io/wiki/forked-tomcat-native.html) 
io.netty:netty-tcnative-boringssl-static:2.0.7.Final
-Netty/Transport (http://netty.io/netty-transport/) 
io.netty:netty-transport:jar:4.1.17.Final
+Netty/Transport (http://netty.io/netty-transport/) 
io.netty:netty-transport:jar:4.1.24.Final
 OkHttp (https://github.com/square/okhttp/okhttp) 
com.squareup.okhttp3:okhttp:jar:3.4.1
 Okio (https://github.com/square/okio/okio) com.squareup.okio:okio:jar:1.9.0
 Prometheus Java Simpleclient 
(http://github.com/prometheus/client_java/simpleclient) 
io.prometheus:simpleclient:bundle:0.1.0

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.

[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site

2018-05-08 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 459de3d52e65921f7b7866d1a9eac94dad26cd68
Merge: 51f9ab1 80c2a61
Author: Willem Jiang 
AuthorDate: Tue May 8 14:00:42 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/developer-guide.md|  1 +
 _developers/cn/setup-committer-rights.md | 54 
 _developers/developer-guide.md   |  1 +
 _release/cn/java_chassis_downloads.md| 21 ++---
 _release/cn/saga_downloads.md| 23 +++---
 _release/cn/service_center_downloads.md  | 23 +++---
 6 files changed, 61 insertions(+), 62 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] 02/02: Publish the website

2018-05-08 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit da7f4be17177d95e408b127ae49e5be0683e9edd
Author: Willem Jiang 
AuthorDate: Tue May 8 14:02:18 2018 +0800

Publish the website
---
 content/cn/developers/index.html   |  9 ++-
 .../developers/setup-committer-rights/index.html   | 64 +++---
 .../cn/release/java-chassis-downloads/index.html   | 27 -
 content/cn/release/saga-downloads/index.html   | 29 +-
 .../cn/release/service-center-downloads/index.html | 29 +-
 content/developers/index.html  |  9 ++-
 content/feed.xml   |  2 +-
 content/sitemap.xml| 38 ++---
 8 files changed, 109 insertions(+), 98 deletions(-)

diff --git a/content/cn/developers/index.html b/content/cn/developers/index.html
index 841a898..e00cf3a 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/index.html
@@ -360,7 +360,14 @@
   
 
   
-ServiceComb 项目托管在https://github.com/apache?q=incubator-servicecomb;>Github上，其各子项目如下表所示：
+
+
+
+
+  
+
+
+ServiceComb 项目托管在https://github.com/apache?q=incubator-servicecomb;>Github上，其各子项目如下表所示：
 
 
   
diff --git a/content/cn/developers/setup-committer-rights/index.html 
b/content/cn/developers/setup-committer-rights/index.html
index 4bcd390..85f5eff 100644
--- a/content/cn/developers/setup-committer-rights/index.html
+++ b/content/cn/developers/setup-committer-rights/index.html
@@ -19,7 +19,7 @@
 
 
 
-Set Up Write Access for Committer - Apache ServiceComb 
(incubating)
+Committer权限设置 - Apache ServiceComb (incubating)
 
 
 
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
   http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/setup-committer-rights/;>
@@ -46,7 +46,7 @@
 
 
   
-  
+  
   
   
 
@@ -343,16 +343,16 @@
 
 
   http://schema.org/CreativeWork;>
-
+
 
 
-
+
 
 
   
 
   
-Set Up Write Access 
for Committer
+Committer权限设置
 
 
   
@@ -364,66 +364,66 @@
 
 
 
-  Authorize your Apache 
account
-  Authorize your Github 
account
-  Join Apache Github 
organization
+  授权 Apache 
账户
+  授权 Github 
账户
+  加入 
Apache Github 组织
 
 
   
 
 
-Congratulations for being a valuable committer to Apache ServiceComb 
projects!
+恭喜您成为Apache ServiceComb 项目宝贵的 committer !
 
-This article will guide you through setting up write access to https://github.com/apache?utf8=%E2%9C%93q=servicecombtype=language=;>Apache
 ServiceComb repositories hosted on Github.
+本文将指导您设置对 Github 上托管的 Apache ServiceComb 仓库的权限。
+
+如果您已经是Apache ServiceComb 项目的 committer，需要完成下面三个简单的步骤才能获得这些权限：
 
-You need to complete three simple steps to obtain such rights, if you are 
already an Apache ServiceComb committer:
 
-  Authorize your Apache account
-  Authorize your Github account
-  Join Apache Github organization
+  对 Apache 账号授权
+  对 Github 账号授权
+  加入 Apache Github 组织
 
 
-Open https://gitbox.apache.org/setup/;>https://gitbox.apache.org/setup/ in 
your favorite browser and you should see a page like below.
+在您喜欢的浏览器中打开 https://gitbox.apache.org/setup/;>https://gitbox.apache.org/setup/ 
，您应该能看到如下所示的页面
 
 
 
-Let's get started!
+接下来开始授权！
 
-Authorize your Apache account
-Click Start ASF Oauth link and 
follow the instructions on the page to log in with your Apache account.
+授权 Apache 账户
+点击 Start ASF Oauth 链接并按照页面上的说明使用您的 
Apache 账号登录。
 
 
 
-Authorize your Github account
-Before proceeding, enable https://github.com/settings/security;>2FA on Github for your 
account.
+授权 Github 账户
+首先需要在 Github 账号上https://github.com/settings/security;>启用2FA 
安全设置。
 
-Your Github account security page should look like the image below, if 2FA 
is set up successfully.
+如果2FA成功设置，您的Github账号安全设置页面应如下图所示。
 
 
 
-If you need help, please refer to https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/;>Github
 2FA help page
+更多安全设置资料请参考 https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/;>Github
 2FA 资料。
 
-Once your Github 2FA is set up, click Auth 
on GitHub and follow the instructions to authorize your Github 
account.
+设置好 Github 2FA后，点击 Auth on GitHub 
并按照说明授权Github 账号。
 
 
 
-Join Apache Github organization
-Open https://id.apache.org/;>https://id.apache.org/ and log 
into your Apache account.
+加入 Apache Github 组织
+打开 https://id.apache.org/;>https://id.apache.org/ 并登陆到您的 
Apache 账户。
 
-Once logged in, fill in your github username under Your Github 
Username section like below and save your changes:
+登陆后，填写您的 github 账户用户名并保存：
 
 
 
-An organisational invite will be sent to you shortly thereafter (within 30 
minutes). 
-You may visit https://github.com/apache/;>Apache on Github to see 
if you have an invitation

[incubator-servicecomb-website] branch asf-site updated (51f9ab1 -> da7f4be)

2018-05-08 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.


from 51f9ab1  Publish the website
 add 0bcc2b1  SCB-528 changed the release_guide.md encoding to UTF-8
 add 6bec35b  Polish the developer guide
 add 895b18b  SCB-551 translate set up write access for committer (#79)
 add 59041a0  SCB-554 translate doc 'saga_downloads' for website (#82)
 add 0ad0608  SCB-553 translate doc 'java_chassis_downloads' for website 
(#81)
 add d1320c3  SCB-552 translate doc 'service_center_downloads' for website 
(#80)
 add 80c2a61  updated the developer guide
 new 459de3d  Merge branch 'master' into asf-site
 new da7f4be  Publish the website

The 2 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:
 _developers/cn/developer-guide.md  |  1 +
 _developers/cn/setup-committer-rights.md   | 54 +-
 _developers/developer-guide.md |  1 +
 _release/cn/java_chassis_downloads.md  | 21 +++
 _release/cn/saga_downloads.md  | 23 
 _release/cn/service_center_downloads.md| 23 
 content/cn/developers/index.html   |  9 ++-
 .../developers/setup-committer-rights/index.html   | 64 +++---
 .../cn/release/java-chassis-downloads/index.html   | 27 -
 content/cn/release/saga-downloads/index.html   | 29 +-
 .../cn/release/service-center-downloads/index.html | 29 +-
 content/developers/index.html  |  9 ++-
 content/feed.xml   |  2 +-
 content/sitemap.xml| 38 ++---
 14 files changed, 170 insertions(+), 160 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch master updated: updated the developer guide

2018-05-08 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 80c2a61  updated the developer guide
80c2a61 is described below

commit 80c2a61145200b2dd4a197b587f340630d90d04e
Author: Willem Jiang 
AuthorDate: Tue May 8 11:06:22 2018 +0800

updated the developer guide
---
 _developers/cn/developer-guide.md | 1 +
 _developers/developer-guide.md| 1 +
 2 files changed, 2 insertions(+)

diff --git a/_developers/cn/developer-guide.md 
b/_developers/cn/developer-guide.md
index 17af31c..7741c2d 100755
--- a/_developers/cn/developer-guide.md
+++ b/_developers/cn/developer-guide.md
@@ -6,6 +6,7 @@ permalink: /cn/developers/
 excerpt: "开发者指南"
 last_modified_at: 2017-06-24T19:18:43+08:00
 ---
+{% include toc %}
 
 **ServiceComb** 
项目托管在[Github](https://github.com/apache?q=incubator-servicecomb)上，其各子项目如下表所示：
 
diff --git a/_developers/developer-guide.md b/_developers/developer-guide.md
index 392c3b6..48e7fb6 100644
--- a/_developers/developer-guide.md
+++ b/_developers/developer-guide.md
@@ -6,6 +6,7 @@ permalink: /developers/
 excerpt: "Developer Guide"
 last_modified_at: 2017-06-24T19:18:43+08:00
 ---
+{% include toc %}
 
 **ServiceComb** is hosted on 
[Github](https://github.com/apache?q=incubator-servicecomb), it has the 
following sub-projects:
 

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.