[incubator-servicecomb-service-center] branch master updated: Fix Capitalization of the ServiceName in the Service list (#345)
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 f55a89c Fix Capitalization of the ServiceName in the Service list
(#345)
f55a89c is described below
commit f55a89ceacb4bebf79c33c917402076b2aeaed2d
Author: Mohammad Asif Siddiqui
AuthorDate: Wed May 9 12:06:50 2018 +0530
Fix Capitalization of the ServiceName in the Service list (#345)
---
.../app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js | 2 +-
.../app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
b/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
index 979523c..8257944 100644
--- a/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
+++ b/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
@@ -24,7 +24,7 @@ angular.module('serviceCenter.sc')
serviceInfo.data.services.forEach(function(services){
if(services.serviceId == serviceId){
$scope.serviceDetail = {
- serviceName: services.serviceName.toUpperCase(),
+ serviceName: services.serviceName,
status: services.status.toLowerCase(),
appId: services.appId.toLowerCase(),
version: services.version,
diff --git
a/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
b/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
index 6343a4d..4d12872 100644
--- a/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
+++ b/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
@@ -101,7 +101,7 @@ angular.module('serviceCenter.sc', [])
var headers =
{"X-ConsumerId": service.serviceId};
if(filter &&
service.status.toLowerCase() === filter) {
var
servicesList = {
-
serviceName:
service.serviceName.charAt(0).toUpperCase()+service.serviceName.slice(1).toLowerCase(),
+
serviceName: service.serviceName,
status:
service.status.toLowerCase(),
appId:
service.appId.toLowerCase(),
version: service.version,
@@ -124,7 +124,7 @@ angular.module('serviceCenter.sc', [])
}
if(!filter){
var
servicesList = {
-
serviceName:
service.serviceName.charAt(0).toUpperCase()+service.serviceName.slice(1).toLowerCase(),
+
serviceName: service.serviceName,
status:
service.status.toLowerCase(),
appId:
service.appId.toLowerCase(),
version: service.version,
--
To stop receiving notification emails like this one, please contact
little...@apache.org.
[incubator-servicecomb-service-center] 01/01: Merge pull request #344 from little-cui/master
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)
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-website] 01/02: [SCB-560]Adding guide of how to use gitter (#83)
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 e2ba3f306f58a81a45c37fa8a7bd6a21907dbab9
Author: Zen Lin
AuthorDate: Wed May 9 10:02:26 2018 +0800
[SCB-560]Adding guide of how to use gitter (#83)
Signed-off-by: linzhinan
---
_data/navigation.yml| 2 ++
_developers/cn/use-gitter.md| 65
assets/images/login-gitter.PNG | Bin 0 -> 263969 bytes
assets/images/login-gitter1.PNG | Bin 0 -> 20445 bytes
assets/images/login-gitter2.PNG | Bin 0 -> 265187 bytes
assets/images/login-gitter3.PNG | Bin 0 -> 72881 bytes
assets/images/login-gitter4.PNG | Bin 0 -> 20680 bytes
7 files changed, 67 insertions(+)
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 2d5401c..6b66f25 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -292,6 +292,8 @@ t:
url: /cn/developers/subscribe-mail-list/
- title: "JIRA使用方法"
url: /cn/developers/use-jira/
+ - title: "Gitter 使用方法"
+url: /cn/developers/use-gitter/
- title: "设置代码仓库写权限"
url: /cn/developers/setup-committer-rights/
- title: "Servicecomb发版指南"
diff --git a/_developers/cn/use-gitter.md b/_developers/cn/use-gitter.md
new file mode 100644
index 000..3a0dcdf
--- /dev/null
+++ b/_developers/cn/use-gitter.md
@@ -0,0 +1,65 @@
+---
+title: "Gitter 使用指南"
+lang: cn
+ref: use-gitter
+permalink: /cn/developers/use-gitter/
+excerpt: "介绍如何使用Gitter参与到ServiceComb开源开发"
+last_modified_at: 2018-02-28T11:26:43-20:46
+---
+
+{% include toc %}
+
+## Gitter简介
+
+Gitter 是一款可支持Markdown的针对开发者的即时通讯软件，可无缝关联到
github，可在聊天中关联Github上的PR，可留存讨论的相关历史记录，可查询历史记录，支持中英文。
+
+ServiceComb 和很多其他的开源项目一样，使用 Gitter 作为技术交流和社区发展的即时通讯媒介，本文介绍如何使用 Gitter 参与到
ServiceComb 的开源开发和社区发展中。
+
+## 使用链接登录
+
+在浏览器 输入
[https://gitter.im/ServiceCombUsers/Lobby](https://gitter.im/ServiceCombUsers/Lobby)
，会自动跳转到Gitter上ServiceComb社区的聊天室界面，如下：
+
+{: .align-center}
+
+如上红圈所示，点击 `SIGN IN TO START TALKING` 进行登录，可支持两种登录方式，Github账号或Twitter账号，笔者使用
Github账号进行登录，如下：
+
+{: .align-center}
+
+点击红圈处后，输入Github账号和密码既可登录进聊天室，从此开始进行技术或社区讨论：
+
+{: .align-center}
+
+红圈1：当前社区的Github代码库上的最近的activity；
+
+红圈2：当前社区Gitter聊天室已加入的所有人；
+
+红圈3：搜索其他社区或者当前聊天室的相关话题记录；
+
+红圈4：发送聊天消息。
+
+至此，就可以像使用微信一样，使用Gitter，并获得比微信更加令开发者和技术人员舒服的功能，如，直接提及某个Activity进行讨论，直接搜索历史聊天记录等。
+
+已经加入聊天室的伙伴别忘记点击右上角的五角星进行点赞，这样会让本聊天室更容易被您自己找到。
+
+{: .align-center}
+
+
+
+只是使用Gitter来进行技术讨论或咨询的伙伴，以上功能就足够了，从此可以像使用微信一样游刃有余地使用，如对Gitter有兴趣或者希望创建私有聊天室的伙伴，可以参考：
+
+[http://www.gitter.net.cn/book/gitter/roomsettings-1.html](http://www.gitter.net.cn/book/gitter/roomsettings-1.html)
+
+
+## 安装手机客户端
+
+您可以下载Gitter的手机客户端，在手机上也随时随地的参与到技术讨论中，下载链接：
+
+[https://gitter.im/home](https://gitter.im/home)
+
+## 在Gitter上搜索并加入ServiceComb社区聊天室
+
+已经在使用Gitter的伙伴，直接登录Gitter后，搜索 `ServiceComb` ，如下图：
+
+{: .align-center}
+
+点击`ServiceComb Users Community` 加入聊天室，其他的功能使用同上一章节，这里不赘述。
diff --git a/assets/images/login-gitter.PNG b/assets/images/login-gitter.PNG
new file mode 100644
index 000..595f5cd
Binary files /dev/null and b/assets/images/login-gitter.PNG differ
diff --git a/assets/images/login-gitter1.PNG b/assets/images/login-gitter1.PNG
new file mode 100644
index 000..f074928
Binary files /dev/null and b/assets/images/login-gitter1.PNG differ
diff --git a/assets/images/login-gitter2.PNG b/assets/images/login-gitter2.PNG
new file mode 100644
index 000..4434078
Binary files /dev/null and b/assets/images/login-gitter2.PNG differ
diff --git a/assets/images/login-gitter3.PNG b/assets/images/login-gitter3.PNG
new file mode 100644
index 000..4c6ab5d
Binary files /dev/null and b/assets/images/login-gitter3.PNG differ
diff --git a/assets/images/login-gitter4.PNG b/assets/images/login-gitter4.PNG
new file mode 100644
index 000..4f9bfbe
Binary files /dev/null and b/assets/images/login-gitter4.PNG differ
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[incubator-servicecomb-website] branch asf-site updated (da7f4be -> 741a215)
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 da7f4be Publish the website
new e2ba3f3 [SCB-560]Adding guide of how to use gitter (#83)
new 741a215 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:
_data/navigation.yml | 2 +
_developers/cn/use-gitter.md | 65 ++
assets/images/login-gitter.PNG | Bin 0 -> 263969 bytes
assets/images/login-gitter1.PNG| Bin 0 -> 20445 bytes
assets/images/login-gitter2.PNG| Bin 0 -> 265187 bytes
assets/images/login-gitter3.PNG| Bin 0 -> 72881 bytes
assets/images/login-gitter4.PNG| Bin 0 -> 20680 bytes
content/assets/images/login-gitter.PNG | Bin 0 -> 263969 bytes
content/assets/images/login-gitter1.PNG| Bin 0 -> 20445 bytes
content/assets/images/login-gitter2.PNG| Bin 0 -> 265187 bytes
content/assets/images/login-gitter3.PNG| Bin 0 -> 72881 bytes
content/assets/images/login-gitter4.PNG| Bin 0 -> 20680 bytes
content/cn/developers/index.html | 11 ++
content/cn/developers/release-guide/index.html | 11 ++
.../developers/setup-committer-rights/index.html | 11 ++
.../setup-develop-environment/index.html | 11 ++
content/cn/developers/submit-codes/index.html | 11 ++
.../cn/developers/subscribe-mail-list/index.html | 11 ++
.../developers/{use-jira => use-gitter}/index.html | 102 ++--
content/cn/developers/use-jira/index.html | 11 ++
content/feed.xml | 2 +-
content/sitemap.xml| 132 +++--
22 files changed, 280 insertions(+), 100 deletions(-)
create mode 100644 _developers/cn/use-gitter.md
create mode 100644 assets/images/login-gitter.PNG
create mode 100644 assets/images/login-gitter1.PNG
create mode 100644 assets/images/login-gitter2.PNG
create mode 100644 assets/images/login-gitter3.PNG
create mode 100644 assets/images/login-gitter4.PNG
create mode 100644 content/assets/images/login-gitter.PNG
create mode 100644 content/assets/images/login-gitter1.PNG
create mode 100644 content/assets/images/login-gitter2.PNG
create mode 100644 content/assets/images/login-gitter3.PNG
create mode 100644 content/assets/images/login-gitter4.PNG
copy content/cn/developers/{use-jira => use-gitter}/index.html (68%)
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[incubator-servicecomb-website] 02/02: Publish the website
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 741a2150aae149f64281ad0fc4a3ba524c09d8fa
Author: Willem Jiang
AuthorDate: Wed May 9 11:04:42 2018 +0800
Publish the website
---
content/assets/images/login-gitter.PNG | Bin 0 -> 263969 bytes
content/assets/images/login-gitter1.PNG| Bin 0 -> 20445 bytes
content/assets/images/login-gitter2.PNG| Bin 0 -> 265187 bytes
content/assets/images/login-gitter3.PNG| Bin 0 -> 72881 bytes
content/assets/images/login-gitter4.PNG| Bin 0 -> 20680 bytes
content/cn/developers/index.html | 11 ++
content/cn/developers/release-guide/index.html | 11 ++
.../developers/setup-committer-rights/index.html | 11 ++
.../setup-develop-environment/index.html | 11 ++
content/cn/developers/submit-codes/index.html | 11 ++
.../cn/developers/subscribe-mail-list/index.html | 11 ++
.../developers/{use-jira => use-gitter}/index.html | 102 ++--
content/cn/developers/use-jira/index.html | 11 ++
content/feed.xml | 2 +-
content/sitemap.xml| 132 +++--
15 files changed, 213 insertions(+), 100 deletions(-)
diff --git a/content/assets/images/login-gitter.PNG
b/content/assets/images/login-gitter.PNG
new file mode 100644
index 000..595f5cd
Binary files /dev/null and b/content/assets/images/login-gitter.PNG differ
diff --git a/content/assets/images/login-gitter1.PNG
b/content/assets/images/login-gitter1.PNG
new file mode 100644
index 000..f074928
Binary files /dev/null and b/content/assets/images/login-gitter1.PNG differ
diff --git a/content/assets/images/login-gitter2.PNG
b/content/assets/images/login-gitter2.PNG
new file mode 100644
index 000..4434078
Binary files /dev/null and b/content/assets/images/login-gitter2.PNG differ
diff --git a/content/assets/images/login-gitter3.PNG
b/content/assets/images/login-gitter3.PNG
new file mode 100644
index 000..4c6ab5d
Binary files /dev/null and b/content/assets/images/login-gitter3.PNG differ
diff --git a/content/assets/images/login-gitter4.PNG
b/content/assets/images/login-gitter4.PNG
new file mode 100644
index 000..4f9bfbe
Binary files /dev/null and b/content/assets/images/login-gitter4.PNG differ
diff --git a/content/cn/developers/index.html b/content/cn/developers/index.html
index e00cf3a..3621fb3 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/index.html
@@ -316,6 +316,17 @@
+ Gitter 使用方法
+
+
+
+
+
+
+
+
+
+
设置代码仓库写权限
diff --git a/content/cn/developers/release-guide/index.html
b/content/cn/developers/release-guide/index.html
index f12d01e..dfa36a4 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -318,6 +318,17 @@
+ Gitter 使用方法
+
+
+
+
+
+
+
+
+
+
设置代码仓库写权限
diff --git a/content/cn/developers/setup-committer-rights/index.html
b/content/cn/developers/setup-committer-rights/index.html
index 85f5eff..6d4d693 100644
--- a/content/cn/developers/setup-committer-rights/index.html
+++ b/content/cn/developers/setup-committer-rights/index.html
@@ -316,6 +316,17 @@
+ Gitter 使用方法
+
+
+
+
+
+
+
+
+
+
设置代码仓库写权限
diff --git a/content/cn/developers/setup-develop-environment/index.html
b/content/cn/developers/setup-develop-environment/index.html
index 1063837..36a048e 100644
--- a/content/cn/developers/setup-develop-environment/index.html
+++ b/content/cn/developers/setup-develop-environment/index.html
@@ -316,6 +316,17 @@
+ Gitter 使用方法
+
+
+
+
+
+
+
+
+
+
设置代码仓库写权限
diff --git a/content/cn/developers/submit-codes/index.html
b/content/cn/developers/submit-codes/index.html
index 0c50799..e4d3e88 100644
--- a/content/cn/developers/submit-codes/index.html
+++ b/content/cn/developers/submit-codes/index.html
@@ -316,6 +316,17 @@
+ Gitter 使用方法
+
+
+
+
+
+
+
+
+
+
设置代码仓库写权限
diff --git a/content/cn/developers/subscribe-mail-list/index.html
b/content/cn/developers/subscribe-mail-list/index.html
index 609d411..4ee1318 100644
--- a/content/cn/developers/subscribe-mail-list/index.html
+++ b/content/cn/developers/subscribe-mail-list/index.html
@@ -316,6 +316,17 @@
+ Gitter 使用
[incubator-servicecomb-service-center] branch master updated: SCB-561 Support ipv6 (#343)
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 != nil || ep != "[fe8
[incubator-servicecomb-website] branch master updated: [SCB-560]Adding guide of how to use gitter (#83)
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 e552a5c [SCB-560]Adding guide of how to use gitter (#83)
e552a5c is described below
commit e552a5cd1ff0d309ef15b945b583ca954c194392
Author: Zen Lin
AuthorDate: Wed May 9 10:02:26 2018 +0800
[SCB-560]Adding guide of how to use gitter (#83)
Signed-off-by: linzhinan
---
_data/navigation.yml| 2 ++
_developers/cn/use-gitter.md| 65
assets/images/login-gitter.PNG | Bin 0 -> 263969 bytes
assets/images/login-gitter1.PNG | Bin 0 -> 20445 bytes
assets/images/login-gitter2.PNG | Bin 0 -> 265187 bytes
assets/images/login-gitter3.PNG | Bin 0 -> 72881 bytes
assets/images/login-gitter4.PNG | Bin 0 -> 20680 bytes
7 files changed, 67 insertions(+)
diff --git a/_data/navigation.yml b/_data/navigation.yml
index b3a083d..d4b9b41 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -292,6 +292,8 @@ t:
url: /cn/developers/subscribe-mail-list/
- title: "JIRA使用方法"
url: /cn/developers/use-jira/
+ - title: "Gitter 使用方法"
+url: /cn/developers/use-gitter/
- title: "设置代码仓库写权限"
url: /cn/developers/setup-committer-rights/
- title: "Servicecomb发版指南"
diff --git a/_developers/cn/use-gitter.md b/_developers/cn/use-gitter.md
new file mode 100644
index 000..3a0dcdf
--- /dev/null
+++ b/_developers/cn/use-gitter.md
@@ -0,0 +1,65 @@
+---
+title: "Gitter 使用指南"
+lang: cn
+ref: use-gitter
+permalink: /cn/developers/use-gitter/
+excerpt: "介绍如何使用Gitter参与到ServiceComb开源开发"
+last_modified_at: 2018-02-28T11:26:43-20:46
+---
+
+{% include toc %}
+
+## Gitter简介
+
+Gitter 是一款可支持Markdown的针对开发者的即时通讯软件，可无缝关联到
github，可在聊天中关联Github上的PR，可留存讨论的相关历史记录，可查询历史记录，支持中英文。
+
+ServiceComb 和很多其他的开源项目一样，使用 Gitter 作为技术交流和社区发展的即时通讯媒介，本文介绍如何使用 Gitter 参与到
ServiceComb 的开源开发和社区发展中。
+
+## 使用链接登录
+
+在浏览器 输入
[https://gitter.im/ServiceCombUsers/Lobby](https://gitter.im/ServiceCombUsers/Lobby)
，会自动跳转到Gitter上ServiceComb社区的聊天室界面，如下：
+
+{: .align-center}
+
+如上红圈所示，点击 `SIGN IN TO START TALKING` 进行登录，可支持两种登录方式，Github账号或Twitter账号，笔者使用
Github账号进行登录，如下：
+
+{: .align-center}
+
+点击红圈处后，输入Github账号和密码既可登录进聊天室，从此开始进行技术或社区讨论：
+
+{: .align-center}
+
+红圈1：当前社区的Github代码库上的最近的activity；
+
+红圈2：当前社区Gitter聊天室已加入的所有人；
+
+红圈3：搜索其他社区或者当前聊天室的相关话题记录；
+
+红圈4：发送聊天消息。
+
+至此，就可以像使用微信一样，使用Gitter，并获得比微信更加令开发者和技术人员舒服的功能，如，直接提及某个Activity进行讨论，直接搜索历史聊天记录等。
+
+已经加入聊天室的伙伴别忘记点击右上角的五角星进行点赞，这样会让本聊天室更容易被您自己找到。
+
+{: .align-center}
+
+
+
+只是使用Gitter来进行技术讨论或咨询的伙伴，以上功能就足够了，从此可以像使用微信一样游刃有余地使用，如对Gitter有兴趣或者希望创建私有聊天室的伙伴，可以参考：
+
+[http://www.gitter.net.cn/book/gitter/roomsettings-1.html](http://www.gitter.net.cn/book/gitter/roomsettings-1.html)
+
+
+## 安装手机客户端
+
+您可以下载Gitter的手机客户端，在手机上也随时随地的参与到技术讨论中，下载链接：
+
+[https://gitter.im/home](https://gitter.im/home)
+
+## 在Gitter上搜索并加入ServiceComb社区聊天室
+
+已经在使用Gitter的伙伴，直接登录Gitter后，搜索 `ServiceComb` ，如下图：
+
+{: .align-center}
+
+点击`ServiceComb Users Community` 加入聊天室，其他的功能使用同上一章节，这里不赘述。
diff --git a/assets/images/login-gitter.PNG b/assets/images/login-gitter.PNG
new file mode 100644
index 000..595f5cd
Binary files /dev/null and b/assets/images/login-gitter.PNG differ
diff --git a/assets/images/login-gitter1.PNG b/assets/images/login-gitter1.PNG
new file mode 100644
index 000..f074928
Binary files /dev/null and b/assets/images/login-gitter1.PNG differ
diff --git a/assets/images/login-gitter2.PNG b/assets/images/login-gitter2.PNG
new file mode 100644
index 000..4434078
Binary files /dev/null and b/assets/images/login-gitter2.PNG differ
diff --git a/assets/images/login-gitter3.PNG b/assets/images/login-gitter3.PNG
new file mode 100644
index 000..4c6ab5d
Binary files /dev/null and b/assets/images/login-gitter3.PNG differ
diff --git a/assets/images/login-gitter4.PNG b/assets/images/login-gitter4.PNG
new file mode 100644
index 000..4f9bfbe
Binary files /dev/null and b/assets/images/login-gitter4.PNG differ
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[incubator-servicecomb-java-chassis] branch master updated: [SCB-529] producer download file from byte[]
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 cd87c96 [SCB-529] producer download file from byte[]
cd87c96 is described below
commit cd87c96310795e1e56a69a2d23cbfe3b2f65b28f
Author: wujimin
AuthorDate: Sat May 5 11:07:14 2018 +0800
[SCB-529] producer download file from byte[]
---
.../demo/springmvc/client/DownloadSchemaIntf.java | 2 +
.../demo/springmvc/client/TestDownload.java| 3 ++
.../demo/springmvc/server/DownloadSchema.java | 12 ++
.../converter/impl/part/BytesToPartConverter.java | 47 ++
.../impl/part/TestBytesToPartConverter.java| 34 +---
5 files changed, 84 insertions(+), 14 deletions(-)
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/DownloadSchemaIntf.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/DownloadSchemaIntf.java
index 48b9a0f..93e67ee 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/DownloadSchemaIntf.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/DownloadSchemaIntf.java
@@ -33,5 +33,7 @@ public interface DownloadSchemaIntf {
ReadStreamPart entityInputStream(String content);
+ ReadStreamPart bytes(String content);
+
ReadStreamPart netInputStream(String content);
}
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
index 6472171..c782b68 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
@@ -117,6 +117,9 @@ public class TestDownload {
futures.add(checkFile(intf.entityInputStream(content)));
futures.add(checkFuture(templateGet("entityInputStream").saveAsString()));
+futures.add(checkFile(intf.bytes(content)));
+futures.add(checkFuture(templateGet("bytes").saveAsString()));
+
futures.add(checkFile(intf.netInputStream(content)));
futures.add(checkFuture(templateGet("netInputStream").saveAsString()));
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java
index c6124d2..5631663 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java
@@ -157,6 +157,18 @@ public class DownloadSchema {
.body(new
ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
}
+ @GetMapping(path = "/bytes")
+ @ApiResponses({
+ @ApiResponse(code = 200, response = File.class, message = ""),
+ })
+ public ResponseEntity bytes(String content) throws IOException {
+return ResponseEntity
+.ok()
+.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE)
+.header(HttpHeaders.CONTENT_DISPOSITION,
"attachment;filename=bytes.txt")
+.body(content.getBytes(StandardCharsets.UTF_8));
+ }
+
@GetMapping(path = "/netInputStream")
@ApiResponses({
@ApiResponse(code = 200, response = File.class, message = ""),
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java
new file mode 100644
index 000..4426504
--- /dev/null
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed u
[incubator-servicecomb-service-center] branch asifdxtreme-patch-1 deleted (was b385bb3)
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 #342 from little-cui/559
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 c071d7ad70e83962f22d5b5845f466a1be8eb48d Merge: 8cebb17 32f89e9 Author: Mohammad Asif Siddiqui AuthorDate: Tue May 8 14:23:12 2018 +0530 Merge pull request #342 from little-cui/559 SCB-559 Instances count that show in Service Center frontend is incorrect server/core/backend/store/defer_instance.go | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- 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
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-service-center] branch master updated (8cebb17 -> c071d7a)
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 8cebb17 Merge pull request #341 from little-cui/master add 32f89e9 SCB-559 Instances count that show in Service Center frontend is incorrect new c071d7a Merge pull request #342 from little-cui/559 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: server/core/backend/store/defer_instance.go | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact asifdxtr...@apache.org.
[incubator-servicecomb-service-center] branch master updated (ef3193e -> 8cebb17)
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 ef3193e Update beego version 1.8.0 (#340) add c22c0e8 SCB-549 Do not check the instance endpoint whether belong to other service new 8cebb17 Merge pull request #341 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: 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-saga] branch master updated: SCB-342 Add TLS support for gRPC (#181)
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-saga.git
The following commit(s) were added to refs/heads/master by this push:
new 1b4a9cc SCB-342 Add TLS support for gRPC (#181)
1b4a9cc is described below
commit 1b4a9ccfa6e2238b0a93da67121a30ec1fcafa9d
Author: Yang, Bo
AuthorDate: Tue May 8 16:46:54 2018 +0800
SCB-342 Add TLS support for gRPC (#181)
Add TLS support for communication between alpha server and omega.
ClientAuth(MutualAuth) is also supported.
---
alpha/alpha-server/pom.xml | 4 +
.../servicecomb/saga/alpha/server/AlphaConfig.java | 12 +-
.../saga/alpha/server/GrpcServerConfig.java| 75 ++
.../saga/alpha/server/GrpcStartable.java | 48 +++-
.../src/main/resources/application.yaml| 12 +-
.../alpha-server/src/main/resources/ssl.properties | 17 ++
.../saga/alpha/server/AlphaIntegrationTest.java| 39 +++-
alpha/alpha-server/src/test/resources/ca.crt | 29 +++
alpha/alpha-server/src/test/resources/client.crt | 27 +++
alpha/alpha-server/src/test/resources/client.pem | 52 +
alpha/alpha-server/src/test/resources/server.crt | 27 +++
alpha/alpha-server/src/test/resources/server.pem | 52 +
omega/omega-connector/omega-connector-grpc/pom.xml | 4 +
.../omega/connector/grpc/AlphaClusterConfig.java | 72 ++
.../grpc/LoadBalancedClusterMessageSender.java | 68 +-
.../src/main/resources/ssl.properties | 17 ++
...LoadBalanceClusterMessageSenderWithTLSTest.java | 134 +++
.../grpc/LoadBalancedClusterMessageSenderTest.java | 127 +--
.../LoadBalancedClusterMessageSenderTestBase.java | 175 ++
.../omega-connector-grpc/src/test/resources/ca.crt | 29 +++
.../src/test/resources/client.crt | 27 +++
.../src/test/resources/client.pem | 52 +
.../src/test/resources/server.crt | 27 +++
.../src/test/resources/server.pem | 52 +
.../saga/omega/spring/OmegaSpringConfig.java | 15 +-
pom.xml| 8 +-
.../booking/src/main/resources/application.yaml| 6 +
.../car/src/main/resources/application.yaml| 7 +
saga-demo/booking/pom.xml | 4 +
saga-distribution/src/release/LICENSE | 20 +-
saga-distribution/src/release/NOTICE | 5 +
.../src/release/licenses/LICENSE-boringssl | 251 +
.../src/release/licenses/NOTICE-netty-tcnative | 29 +++
33 files changed, 1375 insertions(+), 148 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index e1d6a8c..c4a7bd5 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -130,6 +130,10 @@
javax.interceptor
javax.interceptor-api
+
+ io.netty
+ netty-tcnative-boringssl-static
+
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
index 6889c9f..e45acdd 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
@@ -81,8 +81,12 @@ class AlphaConfig {
}
@Bean
- TxConsistentService txConsistentService(@Value("${alpha.server.port:8080}")
int port,
+ GrpcServerConfig grpcServerConfig() { return new GrpcServerConfig(); }
+
+ @Bean
+ TxConsistentService txConsistentService(
@Value("${alpha.event.pollingInterval:500}") int eventPollingInterval,
+ GrpcServerConfig serverConfig,
ScheduledExecutorService scheduler,
TxEventRepository eventRepository,
CommandRepository commandRepository,
@@ -96,15 +100,15 @@ class AlphaConfig {
TxConsistentService consistentService = new
TxConsistentService(eventRepository);
-ServerStartable startable = buildGrpc(port, consistentService,
omegaCallbacks);
+ServerStartable startable = buildGrpc(serverConfig, consistentService,
omegaCallbacks);
new Thread(startable::start).start();
return consistentService;
}
- private ServerStartable buildGrpc(int port, TxConsistentService
txConsistentService,
+ private ServerStartable buildGrpc(GrpcServerConfig serverConfig,
TxConsistentService txConsistentService,
Map> omegaCallbacks) {
-return new GrpcStartable(port,
+return new GrpcStartable(serverConfig,
new GrpcTxEventEndpointImpl(txConsistentService, omegaCallbacks));
}
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
b/alpha/alpha-server/src/main/java/org/apache/servicec
[incubator-servicecomb-java-chassis] branch master updated (f649c00 -> 48481f7)
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
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
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
a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/d
[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
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;
@Ignore
public class SpringMvcIntegrationTestBase {
@@ -329,
[incubator-servicecomb-java-chassis] 04/05: SCB-504 fix pr comment
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
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
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.
