Skip to content

Commit feef695

Browse files
authored
[ISSUE #4686] Shell scripts should preserve LF line endings (#4687)
* crlf2lf * convert sh only * write easily * Some doc optimization * minor code change * add future win scrpts * add license
1 parent 7f03c10 commit feef695

File tree

7 files changed

+35
-13
lines changed

7 files changed

+35
-13
lines changed

.gitattributes

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
*.sh text eol=lf
18+
gradlew text eol=lf
19+
*.{cmd,[cC][mM][dD]} text eol=crlf
20+
*.{bat,[bB][aA][tT]} text eol=crlf

eventmesh-connectors/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Connector
44

55
A connector is an image or instance that interacts with a specific external service or underlying data source (e.g., Databases) on behalf of user applications. A connector is either a Source or a Sink.
6+
67
Connector runs as a standalone service by `main()`.
78

89
## Source

eventmesh-connectors/README_CN.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## 连接器类型
44

5-
连接器是代表用户应用程序与特定外部服务或底层数据源(例如数据库)交互的镜像或实例。连接器的类型可以是源(Source)或汇(Sink)。连接器通过 `main()` 作为一个独立服务运行
5+
连接器是代表用户应用程序与特定外部服务或底层数据源(例如数据库)交互的镜像或实例。连接器的类型可以是源(Source)或汇(Sink)。
6+
7+
连接器通过 `main()` 作为一个独立服务运行。
68

79
## 数据源(Source 端)
810

eventmesh-connectors/eventmesh-connector-mongodb/README_CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ connectorConfig:
3030
3131
## MongoDBSourceConnector:从 MongoDB 到 EventMesh
3232
33-
1. 启动你的 MongoDB 服务和 EventMesh Runtime。
34-
2. 启用 sourceConnector 并检查 `source-config.yml`(与 sink-config.yml 基本相同)。
35-
3. 启动你的 MongoDBSourceConnector,它将订阅到 mongodb 中的 `connectorConfig.collection`,并将数据发送到 EventMesh Runtime 中的 `pubSubConfig.subject`。
33+
1. 启动你的 MongoDB 服务和 EventMesh Runtime。
34+
2. 启用 sourceConnector 并检查 `source-config.yml`(与 sink-config.yml 基本相同)。
35+
3. 启动你的 MongoDBSourceConnector,它将订阅到 MongoDB 中的 `connectorConfig.collection`,并将数据发送到 EventMesh Runtime 中的 `pubSubConfig.subject`。
3636
4. 向 MongoDB 中 `yourDB` 的 `yourCol` 写入一个 CloudEvent 消息,然后你将在 EventMesh 中接收到该消息。

eventmesh-connectors/eventmesh-connector-rabbitmq/README_CN.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## RabbitMQSinkConnector:从 EventMesh 到 RabbitMQ
44

5-
1. 启动你的 RabbitMQ 服务和 EventMesh Runtime。
5+
1. 启动你的 RabbitMQ EventMesh Runtime。
66
2. 启用 sinkConnector 并检查 `sink-config.yml`
77
3. 启动你的 RabbitMQConnectorServer,它将订阅到 EventMesh Runtime 中 `pubSubConfig.subject` 中定义的主题,并将数据发送到 RabbitMQ 中的 `connectorConfig.queueName`
8-
4. 使用在 `pubSubConfig.subject` 中指定的 Topic,向 EventMesh 发送消息,然后你将在 rabbitmq 中接收到该消息。
8+
4. 使用在 `pubSubConfig.subject` 中指定的 Topic,向 EventMesh 发送消息,然后你将在 RabbitMQ 中接收到该消息。
99

1010
```yaml
1111
pubSubConfig:
@@ -26,17 +26,17 @@ connectorConfig:
2626
passwd: passwd
2727
virtualHost: coyrqpyz
2828
exchangeType: TOPIC
29-
# 使用内置的 exchangeName 或在连接到 rabbitmq 服务后创建新的 exchangeName。
29+
# 使用内置的 exchangeName 或在连接到 RabbitMQ 后创建新的 exchangeName。
3030
exchangeName: amq.topic
31-
# 如果在连接之前不存在,rabbitmq 服务将自动创建 routingKey 和 queueName。
31+
# 如果在连接之前不存在,RabbitMQ 将自动创建 routingKey 和 queueName。
3232
routingKey: eventmesh
3333
queueName: eventmesh
3434
autoAck: true
3535
```
3636
3737
## RabbitMQSourceConnector:从 RabbitMQ 到 EventMesh
3838
39-
1. 启动你的 RabbitMQ 服务和 EventMesh Runtime。
40-
2. 启用 sourceConnector 并检查 `source-config.yml`(与 sink-config.yml 基本相同)。
39+
1. 启动你的 RabbitMQ EventMesh Runtime。
40+
2. 启用 sourceConnector 并检查 `source-config.yml`(与 sink-config.yml 基本相同)。
4141
3. 启动你的 RabbitMQConnectorServer,它将订阅到 RabbitMQ 中的 `connectorConfig.queueName`,并将数据发送到 EventMesh Runtime 中的 `pubSubConfig.subject`。
4242
4. 向队列发送一个 CloudEvent 消息,然后你将在 EventMesh 中接收到该消息。

eventmesh-connectors/eventmesh-connector-redis/README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pubSubConfig:
2121
connectorConfig:
2222
connectorName: redisSink
2323
server: redis://127.0.0.1:6379
24-
# redis 中的主题
24+
# Redis 中的主题
2525
topic: SinkTopic
2626
```
2727

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ public void tryHTTPRequest() {
217217
.get(handleMsgContext.getTopic()).getHttpAuthTypeMap().get(currPushUrl);
218218

219219
WebhookUtil.setWebhookHeaders(builder, httpEntity.getContentType().getValue(),
220-
eventMeshHttpConfiguration.getEventMeshWebhookOrigin(),
221-
urlAuthType);
220+
eventMeshHttpConfiguration.getEventMeshWebhookOrigin(), urlAuthType);
222221

223222
eventMeshHTTPServer.getMetrics().getSummaryMetrics().recordPushMsg();
224223

0 commit comments

Comments
 (0)