From 9c3abe0156095d55c050cd87939330039edc0aed Mon Sep 17 00:00:00 2001
From: Pil0tXia <xiatian@apache.org>
Date: Sun, 14 Apr 2024 19:54:16 +0800
Subject: [PATCH] Deprecate `eventMesh.connector.plugin.type` and sort
 properties

---
 .../config/samples/eventmesh_v1_runtime.yaml     |  7 +++----
 eventmesh-runtime/conf/eventmesh.properties      | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml b/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml
index ee94d606fb..82f4a46ab2 100644
--- a/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml
+++ b/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml
@@ -35,11 +35,13 @@ data:
     eventMesh.server.cluster=COMMON
     eventMesh.server.name=EVENTMESH-runtime
     eventMesh.sysid=0000
+    eventMesh.server.tcp.port=10000
     eventMesh.server.http.port=10105
     eventMesh.server.grpc.port=10205
+    # HTTP Admin Server
+    eventMesh.server.admin.http.port=10106
     ########################## eventMesh tcp configuration ############################
     eventMesh.server.tcp.enabled=true
-    eventMesh.server.tcp.port=10000
     eventMesh.server.tcp.readerIdleSeconds=120
     eventMesh.server.tcp.writerIdleSeconds=120
     eventMesh.server.tcp.allIdleSeconds=120
@@ -85,9 +87,6 @@ data:
     eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255.255/32
     eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
 
-    #connector plugin
-    eventMesh.connector.plugin.type=standalone
-
     #storage plugin
     eventMesh.storage.plugin.type=standalone
 
diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
index cabe3f9bc5..134b46f048 100644
--- a/eventmesh-runtime/conf/eventmesh.properties
+++ b/eventmesh-runtime/conf/eventmesh.properties
@@ -21,11 +21,14 @@ eventMesh.server.provide.protocols=HTTP,TCP,GRPC
 eventMesh.server.cluster=COMMON
 eventMesh.server.name=EVENTMESH-runtime
 eventMesh.sysid=0000
+eventMesh.server.tcp.port=10000
 eventMesh.server.http.port=10105
 eventMesh.server.grpc.port=10205
+# HTTP Admin Server
+eventMesh.server.admin.http.port=10106
+
 ########################## EventMesh TCP Configuration ##########################
 eventMesh.server.tcp.enabled=true
-eventMesh.server.tcp.port=10000
 eventMesh.server.tcp.readerIdleSeconds=120
 eventMesh.server.tcp.writerIdleSeconds=120
 eventMesh.server.tcp.allIdleSeconds=120
@@ -57,8 +60,6 @@ eventMesh.server.retry.sync.pushRetryDelayInMills=500
 eventMesh.server.retry.pushRetryQueueSize=10000
 eventMesh.server.retry.plugin.type=default
 
-# runtime admin
-eventMesh.server.admin.http.port=10106
 # metaStorage
 eventMesh.server.metaStorage.metaStorageIntervalInMills=10000
 eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000
@@ -73,9 +74,7 @@ eventMesh.server.rebalanceRedirect.sleepIntervalInMills=200
 eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255.255/32
 eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
 
-# connector plugin
-eventMesh.connector.plugin.type=standalone
-
+########################## EventMesh Plugin Configuration ##########################
 # storage plugin
 eventMesh.storage.plugin.type=standalone
 
@@ -91,6 +90,7 @@ eventMesh.metaStorage.plugin.type=nacos
 eventMesh.metaStorage.plugin.server-addr=127.0.0.1:8848
 eventMesh.metaStorage.plugin.username=nacos
 eventMesh.metaStorage.plugin.password=nacos
+
 # metaStorage plugin: nacos
 #eventMesh.metaStorage.nacos.endpoint=
 #eventMesh.metaStorage.nacos.accessKey=
@@ -137,9 +137,9 @@ eventMesh.trace.plugin=zipkin
 eventMesh.webHook.admin.start=true
 # Webhook event configuration storage mode. Currently, only file and nacos are supported
 eventMesh.webHook.operationMode=file
-# The file storage path of the file storage mode. If #{eventmeshhome} is written, it is in the eventmesh root directory
+# The file storage path of the file storage mode. If #{eventMeshHome} is written, it is in the EventMesh root directory
 eventMesh.webHook.fileMode.filePath= #{eventMeshHome}/webhook
-# Nacos storage mode, and the configuration naming rule is eventmesh webHook. nacosMode. {nacos native configuration key} please see the specific configuration [nacos github api](https://github.com/alibaba/nacos/blob/develop/api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java)
+# Nacos storage mode, and the configuration naming rule is EventMesh webHook. nacosMode. {nacos native configuration key} please see the specific configuration [nacos github api](https://github.com/alibaba/nacos/blob/develop/api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java)
 ## Address of Nacos
 eventMesh.webHook.nacosMode.serverAddr=127.0.0.1:8848
 # Webhook CloudEvent sending mode. This property is the same as the eventMesh.storage.plugin.type configuration.