Skip to content

Commit 7647361

Browse files
serverglenserverglen
authored
Remove incubator (#122)
1 parent 5373e25 commit 7647361

File tree

42 files changed

+155
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+155
-155
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ $ npm install
2525

2626
1. Clone this repository
2727
```sh
28-
git clone https://github.com/apache/incubator-brpc-website.git
28+
git clone https://github.com/apache/brpc-website.git
2929
```
3030
2. Change to root directory:
3131
```sh
32-
cd incubator-brpc-website
32+
cd brpc-website
3333
```
3434
3. Run
3535
```sh
@@ -52,7 +52,7 @@ Please sent your PR to the master branch instead of asf-site.
5252
The structure of /content folder is as follows in which the files you will mainly modify. Take adding a new committer info to the **Community** page and adding a new bRPC release version info to **Download bRPC** page as an example, just find the `index.md` documents in their corresponding subfolder of /content then modify them. Or just click the **Edit this page/编辑本页** button on their pages and modify them directly. Modifying other files or pages is similar.
5353

5454
```
55-
incubator-brpc-website
55+
brpc-website
5656
- content
5757
| - en
5858
| | - docs

‎config.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ qrcode = "https://gw.alipayobjects.com/mdn/rms_91f3e6/afts/img/A*NyEzRp3Xq28AAAA
8989
version_menu = "Releases"
9090

9191
# Repository configuration (URLs for in-page links to opening issues and suggesting changes)
92-
github_repo = "https://github.com/apache/incubator-brpc-website"
92+
github_repo = "https://github.com/apache/brpc-website"
9393
# An optional link to a related project repo. For example, the sibling repository where your product code lives.
94-
github_project_repo = "https://github.com/apache/incubator-brpc"
94+
github_project_repo = "https://github.com/apache/brpc"
9595

9696
# Specify a value here if your content directory is not in your repo's root directory
9797
# github_subdir = ""
@@ -126,18 +126,18 @@ footer_about_disable = true
126126
[params.ui.feedback]
127127
enable = false
128128
# The responses that the user sees after clicking "yes" (the page was helpful) or "no" (the page was not helpful).
129-
yes = 'Glad to hear it! Please <a href="https://github.com/apache/incubator-brpc-website/issues/new">tell us how we can improve</a>.'
130-
no = 'Sorry to hear that. Please <a href="https://github.com/apache/incubator-brpc-website/issues/new/">tell us how we can improve</a>.'
129+
yes = 'Glad to hear it! Please <a href="https://github.com/apache/brpc-website/issues/new">tell us how we can improve</a>.'
130+
no = 'Sorry to hear that. Please <a href="https://github.com/apache/brpc-website/issues/new/">tell us how we can improve</a>.'
131131

132132
[[menu.main]]
133133
name = "GitHub"
134134
weight = 10
135-
url = "https://github.com/apache/incubator-brpc/"
135+
url = "https://github.com/apache/brpc/"
136136

137137
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
138138
[[params.links.user]]
139139
name = "GitHub"
140-
url = "https://github.com/apache/incubator-brpc"
140+
url = "https://github.com/apache/brpc"
141141
icon = "fab fa-github"
142142
desc = "Development takes place here!"
143143

‎content/en/_index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
+++
55

66
{{< blocks/cover image_anchor="top" height="max" color="primary" >}}
7-
<img src="/images/brpc_logo_w.svg" class="brpc-logo" style="max-width:95%" />
7+
<img src="/images/brpc_logo_ww.svg" class="brpc-logo" style="max-width:95%" />
88
<h3 style="margin:20px" >An industrial-grade RPC framework for building reliable and high-performance services.</h3>
99
<div class="mx-auto">
1010
<a class="btn btn-lg btn-primary font-weight-bold my-4" href="{{< relref "/docs" >}}">
@@ -24,7 +24,7 @@ <h3 style="margin:20px" >An industrial-grade RPC framework for building reliable
2424
Get bRPC
2525
</a>
2626
27-
<a class="btn btn-lg btn-primary mr-3 mb-4 my-3" href="https://github.com/apache/incubator-brpc">
27+
<a class="btn btn-lg btn-primary mr-3 mb-4 my-3" href="https://github.com/apache/brpc">
2828
<i class="fas fa-ellipsis-h"></i>
2929
</a>
3030
-->
@@ -70,7 +70,7 @@ <h3 class="section-head">You can use it to:</h3>
7070
<img src="/images/egg-logo.png" style="max-width:100%" alt="The Apache Software Foundation" title="The Apache Software Foundation">
7171
</p>
7272
<h4>
73-
bRPC is an <a href="http://incubator.apache.org/">Apache</a> incubation project.
73+
bRPC is an <a href="http://incubator.apache.org/">Apache</a> Top-Level Project.
7474
</h4>
7575
<h6>
7676
Apache Annotator is an effort undergoing incubation at The <a href="https://apache.org/">Apache Software Foundation (ASF)</a>

‎content/en/docs/C++ Base/bRPC Training Materials/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ date: 2021-08-12
66
description: >
77
bRPC Training Materials.
88
---
9-
* [bRPC外功修炼宝典](https://github.com/apache/incubator-brpc/blob/master/docs/cn/brpc_intro.pptx)
10-
* [A tutorial on building large-scale services](https://github.com/apache/incubator-brpc/blob/master/docs/en/tutorial_on_building_services.pptx)
11-
* [bRPC Internal](https://github.com/apache/incubator-brpc/blob/master/docs/en/brpc_internal.pptx)
9+
* [bRPC外功修炼宝典](https://github.com/apache/brpc/blob/master/docs/cn/brpc_intro.pptx)
10+
* [A tutorial on building large-scale services](https://github.com/apache/brpc/blob/master/docs/en/tutorial_on_building_services.pptx)
11+
* [bRPC Internal](https://github.com/apache/brpc/blob/master/docs/en/brpc_internal.pptx)

‎content/en/docs/Client/Access UB/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ brpc可通过多种方式访问用ub搭建的服务。
1010

1111
# ubrpc (by protobuf)
1212

13-
r31687后，brpc支持通过protobuf访问ubrpc，不需要baidu-rpc-ub，也不依赖idl-compiler。（也可以让protobuf服务被ubrpc client访问，方法见[使用ubrpc的服务](https://github.com/apache/incubator-brpc/blob/master/docs/cn/nshead_service.md#使用ubrpc的服务)）。
13+
r31687后，brpc支持通过protobuf访问ubrpc，不需要baidu-rpc-ub，也不依赖idl-compiler。（也可以让protobuf服务被ubrpc client访问，方法见[使用ubrpc的服务](https://github.com/apache/brpc/blob/master/docs/cn/nshead_service.md#使用ubrpc的服务)）。
1414

1515
**步骤：**
1616

‎content/en/docs/Client/Basics/_index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -616,22 +616,22 @@ Due to maintaining costs, even very large scale clusters are deployed with "just
616616
617617
## Circuit breaker
618618
619-
Check out [circuit_breaker](https://github.com/apache/incubator-brpc/blob/master/docs/cn/circuit_breaker.md) for more details.
619+
Check out [circuit_breaker](https://github.com/apache/brpc/blob/master/docs/cn/circuit_breaker.md) for more details.
620620
621621
## Protocols
622622
623623
The default protocol used by Channel is baidu_std, which is changeable by setting ChannelOptions.protocol. The field accepts both enum and string.
624624
625625
Supported protocols:
626626
627-
- PROTOCOL_BAIDU_STD or "baidu_std", which is [the standard binary protocol inside Baidu](https://github.com/apache/incubator-brpc/blob/master/docs/cn/baidu_std.md), using single connection by default.
627+
- PROTOCOL_BAIDU_STD or "baidu_std", which is [the standard binary protocol inside Baidu](https://github.com/apache/brpc/blob/master/docs/cn/baidu_std.md), using single connection by default.
628628
- PROTOCOL_HTTP or "http", which is http/1.0 or http/1.1, using pooled connection by default (Keep-Alive).
629629
- Methods for accessing ordinary http services are listed in [Access http/h2](../access-httph2/).
630-
- Methods for accessing pb services by using http:json or http:proto are listed in [http/h2 derivatives](https://github.com/apache/incubator-brpc/blob/master/docs/en/http_derivatives.md)
630+
- Methods for accessing pb services by using http:json or http:proto are listed in [http/h2 derivatives](https://github.com/apache/brpc/blob/master/docs/en/http_derivatives.md)
631631
- PROTOCOL_H2 or ”h2", which is http/2, using single connection by default.
632632
- Methods for accessing ordinary h2 services are listed in [Access http/h2](../access-httph2/).
633-
- Methods for accessing pb services by using h2:json or h2:proto are listed in [http/h2 derivatives](https://github.com/apache/incubator-brpc/blob/master/docs/en/http_derivatives.md)
634-
- "h2:grpc", which is the protocol of [gRPC](https://grpc.io) and based on h2, using single connection by default, check out [h2:grpc](https://github.com/apache/incubator-brpc/blob/master/docs/en/http_derivatives.md#h2grpc) for details.
633+
- Methods for accessing pb services by using h2:json or h2:proto are listed in [http/h2 derivatives](https://github.com/apache/brpc/blob/master/docs/en/http_derivatives.md)
634+
- "h2:grpc", which is the protocol of [gRPC](https://grpc.io) and based on h2, using single connection by default, check out [h2:grpc](https://github.com/apache/brpc/blob/master/docs/en/http_derivatives.md#h2grpc) for details.
635635
- PROTOCOL_THRIFT or "thrift", which is the protocol of [apache thrift](https://thrift.apache.org), using pooled connection by default, check out [Access thrift](../access-thrift/) for details.
636636
- PROTOCOL_MEMCACHE or "memcache", which is binary protocol of memcached, using **single connection** by default. Check out [Access memcached](../access-memcached/) for details.
637637
- PROTOCOL_REDIS or "redis", which is protocol of redis 1.2+ (the one supported by hiredis), using **single connection** by default. Check out [Access Redis](../access-redis/) for details.
@@ -765,7 +765,7 @@ public:
765765
766766
When the user calls the RPC interface with a single connection to the same server, the framework guarantee that once the TCP connection has been established, the first request on the connection will contain the authentication string generated by `GenerateCredential`. Subsequent requests will not carried that string. The entire sending process is still highly concurrent since it won't wait for the authentication result. If the verification succeeds, all requests return without error. Otherwise, if the verification fails, generally the server will close the connection and those requests will receive the corresponding error.
767767
768-
Currently only those protocols support client authentication: [baidu_std](https://github.com/apache/incubator-brpc/blob/master/docs/cn/) (default protocol), HTTP, hulu_pbrpc, ESP. For customized protocols, generally speaking, users could call the `Authenticator`'s interface to generate authentication string during the request packing process in order to support authentication.
768+
Currently only those protocols support client authentication: [baidu_std](https://github.com/apache/brpc/blob/master/docs/cn/) (default protocol), HTTP, hulu_pbrpc, ESP. For customized protocols, generally speaking, users could call the `Authenticator`'s interface to generate authentication string during the request packing process in order to support authentication.
769769
770770
## Reset
771771

‎content/en/docs/DownloadBRPC/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ See the License for the specific language governing permissions and
3131
limitations under the License.
3232
{% endcomment %}
3333
-->
34-
## Apache bRPC (incubating) Downloads
34+
## Apache bRPC Downloads
3535

36-
Apache bRPC (incubating) is released as a source artifact.
36+
Apache bRPC is released as a source artifact.
3737
We are pleased to announce our 1.3.0 release as below.
3838

3939

‎content/en/docs/RPC in depth/New Protocol/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: >
1010

1111
brpc server supports all protocols in the same port, and it makes deployment and maintenance more convenient in most of the time. Since the format of different protocols is very different, it is hard to support all protocols in the same port unambiguously. In consider of decoupling and extensibility, it is also hard to build a multiplexer for all protocols. Thus our way is to classify all protocols into three categories and try one by one:
1212

13-
- First-class protocol: Special characters are marked in front of the protocol data, for example, the data of protocol [baidu_std](https://github.com/apache/incubator-brpc/blob/master/docs/cn/baidu_std.md) and hulu_pbrpc begins with 'PRPC' and 'HULU' respectively. Parser just check first four characters to know whether the protocol is matched. This class of protocol is checked first and all these protocols can share one TCP connection.
13+
- First-class protocol: Special characters are marked in front of the protocol data, for example, the data of protocol [baidu_std](https://github.com/apache/brpc/blob/master/docs/cn/baidu_std.md) and hulu_pbrpc begins with 'PRPC' and 'HULU' respectively. Parser just check first four characters to know whether the protocol is matched. This class of protocol is checked first and all these protocols can share one TCP connection.
1414
- Second-class protocol: Some complex protocols without special marked characters can only be detected after several input data are parsed. Currently only HTTP is classified into this category.
1515
- Third-class protocol: Special characters are in the middle of the protocol data, such as the magic number of nshead protocol is the 25th-28th characters. It is complex to handle this case because without reading first 28 bytes, we cannot determine whether the protocol is nshead. If it is tried before http, http messages less than 28 bytes may not be parsed, since the parser consider it as an incomplete nshead message.
1616

@@ -24,7 +24,7 @@ Unlike the server side that protocols must be dynamically determined based on th
2424

2525
brpc is designed to add new protocols at any time, just proceed as follows:
2626

27-
> The protocol that begins with nshead has unified support, just read [this](https://github.com/apache/incubator-brpc/blob/master/docs/cn/nshead_service.md).
27+
> The protocol that begins with nshead has unified support, just read [this](https://github.com/apache/brpc/blob/master/docs/cn/nshead_service.md).
2828
2929
## add ProtocolType
3030

‎content/en/docs/Server/Basics/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ As a correspondence, if cntl->response_attachment() is not empty and pb response
304304

305305
Server detects supported protocols automatically, without assignment from users. `cntl->protocol()` gets the protocol being used. Server is able to accept connections with different protocols from one port, users don't need to assign different ports for different protocols. Even one connection may transport messages in multiple protocols, although we rarely do this (and not recommend). Supported protocols:
306306

307-
- [The standard protocol used in Baidu](https://github.com/apache/incubator-brpc/blob/master/docs/cn/baidu_std.md), shown as "baidu_std", enabled by default.
307+
- [The standard protocol used in Baidu](https://github.com/apache/brpc/blob/master/docs/cn/baidu_std.md), shown as "baidu_std", enabled by default.
308308

309309
- [Streaming RPC](../../client/streaming-rpc/), shown as "streaming_rpc", enabled by default.
310310

@@ -350,7 +350,7 @@ Server detects supported protocols automatically, without assignment from users.
350350

351351
As the name implies, messages in this protocol are composed by nshead+mcpack, the mcpack does not include special fields. Different from implementations based on NsheadService by users, this protocol uses mcpack2pb which makes the service capable of handling both mcpack and pb with one piece of code. Due to lack of fields to carry ErrorText, server can only close connections when errors occur.
352352

353-
- Read [Implement NsheadService](https://github.com/apache/incubator-brpc/blob/master/docs/cn/nshead_service.md) for UB related protocols.
353+
- Read [Implement NsheadService](https://github.com/apache/brpc/blob/master/docs/cn/nshead_service.md) for UB related protocols.
354354

355355
If you need more protocols, contact us.
356356

‎content/en/docs/bvar/bvar-c++/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ int expose_as(const butil::StringPiece& prefix, const butil::StringPiece& name);
163163
```
164164
# Export All Variables
165165

166-
Common needs for exporting are querying by HTTP API and writing into local file, the former is provided by brpc [/vars](https://github.com/apache/incubator-brpc/blob/master/docs/cn/vars.md) service, the latter has been implemented in bvar, and it's turned off by default. A couple of methods can activate this function：
166+
Common needs for exporting are querying by HTTP API and writing into local file, the former is provided by brpc [/vars](https://github.com/apache/brpc/blob/master/docs/cn/vars.md) service, the latter has been implemented in bvar, and it's turned off by default. A couple of methods can activate this function：
167167

168-
- Using [gflags](https://github.com/apache/incubator-brpc/blob/master/docs/cn/flags.md) to parse the input params. We can add `-bvar_dump` during the starup of program or we can dynamically change the params thru brpc [/flags](https://github.com/apache/incubator-brpc/blob/master/docs/cn/flags.md) service after starup. gflags parsing is as below
168+
- Using [gflags](https://github.com/apache/brpc/blob/master/docs/cn/flags.md) to parse the input params. We can add `-bvar_dump` during the starup of program or we can dynamically change the params thru brpc [/flags](https://github.com/apache/brpc/blob/master/docs/cn/flags.md) service after starup. gflags parsing is as below
169169
```C++
170170
#include <gflags/gflags.h>
171171
...
@@ -207,7 +207,7 @@ Common needs for exporting are querying by HTTP API and writing into local file,
207207

208208
such like we modify the gflags as below：
209209

210-
[![img](https://github.com/apache/incubator-brpc/raw/master/docs/images/bvar_dump_flags_2.png)](https://github.com/apache/incubator-brpc/blob/master/docs/images/bvar_dump_flags_2.png)
210+
[![img](https://github.com/apache/brpc/raw/master/docs/images/bvar_dump_flags_2.png)](https://github.com/apache/brpc/blob/master/docs/images/bvar_dump_flags_2.png)
211211

212212
exporting file will be like：
213213
```

0 commit comments

Comments
 (0)