模块化mq connector (#2562)

* add connector module, add kafka producer connector module for server

* add rocketMQ producer connector module for server

* add rabbitMQ producer connector module for server

* optimize code, add annotation

* add canal message consumer connector for canal-adapter module

deployer/src/main/resources/canal.properties

@@ -21,7 +21,7 @@ canal.zkServers =
 # flush data to zk
 canal.zookeeper.flush.period = 1000
 canal.withoutNetty = false
-# tcp, kafka, RocketMQ
+# tcp, kafka, rocketMQ, rabbitMQ
 canal.serverMode = tcp
 # flush meta cursor/parse position to file
 canal.file.data.dir = ${canal.conf.dir}
@@ -86,10 +86,6 @@ canal.instance.tsdb.snapshot.interval = 24
 # purge snapshot expire , default 360 hour(15 days)
 canal.instance.tsdb.snapshot.expire = 360
 
-# aliyun ak/sk , support rds/mq
-canal.aliyun.accessKey =
-canal.aliyun.secretKey =
-
 #################################################
 ######### 		destinations		#############
 #################################################
@@ -111,35 +107,54 @@ canal.instance.global.spring.xml = classpath:spring/file-instance.xml
 #canal.instance.global.spring.xml = classpath:spring/default-instance.xml
 
 ##################################################
-######### 		     MQ 		     #############
+######### 	      MQ Properties      #############
 ##################################################
-canal.mq.servers = 127.0.0.1:6667
-canal.mq.retries = 0
-canal.mq.batchSize = 16384
-canal.mq.maxRequestSize = 1048576
-canal.mq.lingerMs = 100
-canal.mq.bufferMemory = 33554432
-canal.mq.canalBatchSize = 50
-canal.mq.canalGetTimeout = 100
-canal.mq.parallelThreadSize = 8
-canal.mq.flatMessage = true
-canal.mq.compressionType = none
-canal.mq.acks = all
-#canal.mq.properties. =
-canal.mq.producerGroup = test
-# Set this value to "cloud", if you want open message trace feature in aliyun.
-canal.mq.accessChannel = local
-# aliyun mq namespace
-#canal.mq.namespace =
-canal.mq.vhost=
-canal.mq.exchange=
-canal.mq.username=
-canal.mq.password=
-canal.mq.aliyunuid=
+canal.mq.flat.message = true
 canal.mq.database.hash = true
+canal.mq.parallel.thread.size = 8
+canal.mq.canal.batch.size = 50
+canal.mq.canal.fetch.timeout = 100
+# Set this value to "cloud", if you want open message trace feature in aliyun.
+canal.mq.access.channel = local
+
+# aliyun ak/sk , support rds/mq
+canal.aliyun.accessKey =
+canal.aliyun.secretKey =
+canal.aliyun.uid=
+
 ##################################################
-#########     Kafka Kerberos Info    #############
+######### 		     Kafka 		     #############
 ##################################################
+kafka.bootstrap.servers = 127.0.0.1:9092
+kafka.acks = all
+kafka.compression.type = none
+kafka.batch.size = 16384
+kafka.linger.ms = 1
+kafka.max.request.size = 1048576
+kafka.buffer.memory = 33554432
+kafka.max.in.flight.requests.per.connection = 1
+kafka.retries = 0
+
 canal.mq.kafka.kerberos.enable = false
-canal.mq.kafka.kerberos.krb5FilePath = "../conf/kerberos/krb5.conf"
-canal.mq.kafka.kerberos.jaasFilePath = "../conf/kerberos/jaas.conf"
+canal.mq.kafka.kerberos.krb5.file = "../conf/kerberos/krb5.conf"
+canal.mq.kafka.kerberos.jaas.file = "../conf/kerberos/jaas.conf"
+
+##################################################
+######### 		    RocketMQ	     #############
+##################################################
+rocketmq.producer.group = test
+rocketmq.enable.message.trace = false
+rocketmq.customized.trace.topic =
+rocketmq.namespace =
+rocketmq.namesrv.addr = 127.0.0.1:9876
+rocketmq.retry.times.when.send.failed = 0
+rocketmq.vip.channel.enabled = false
+
+##################################################
+######### 		    RabbitMQ	     #############
+##################################################
+rabbitmq.host =
+rabbitmq.virtual.host =
+rabbitmq.exchange =
+rabbitmq.username =
+rabbitmq.password =

deployer/src/main/resources/logback.xml

@@ -73,11 +73,15 @@
 		<level value="INFO" />
 		<appender-ref ref="CANAL-META" />
 	</logger>
-	<logger name="com.alibaba.otter.canal.kafka" additivity="false">
+	<logger name="com.alibaba.otter.canal.connector.kafka" additivity="false">
 		<level value="INFO" />
 		<appender-ref ref="CANAL-ROOT" />
 	</logger>
-	<logger name="com.alibaba.otter.canal.rabbitmq" additivity="false">
+	<logger name="com.alibaba.otter.canal.connector.rocketmq" additivity="false">
+		<level value="INFO" />
+		<appender-ref ref="CANAL-ROOT" />
+	</logger>
+	<logger name="com.alibaba.otter.canal.connector.rabbitmq" additivity="false">
 		<level value="INFO" />
 		<appender-ref ref="CANAL-ROOT" />
 	</logger>