From 1b88430f71ca814badc85ae9582b5c8b3b4a8f5f Mon Sep 17 00:00:00 2001 From: mcy Date: Wed, 24 Oct 2018 12:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89client-launcher,=20=E7=A7=BB?= =?UTF-8?q?=E5=85=A5client-adapter=E4=B8=AD=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BAexample,=20=E8=B0=83=E6=95=B4=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example}/pom.xml | 12 +++++----- .../example}/src/main/assembly/dev.xml | 0 .../example}/src/main/assembly/release.xml | 0 .../example}/src/main/bin/startup.bat | 0 .../example}/src/main/bin/startup.sh | 0 .../example}/src/main/bin/stop.sh | 0 .../otter/canal/client/ClientLauncher.java | 0 .../loader/AbstractCanalAdapterWorker.java | 0 .../loader/CanalAdapterKafkaWorker.java | 0 .../adapter/loader/CanalAdapterLoader.java | 0 .../loader/CanalAdapterRocketMQWorker.java | 0 .../adapter/loader/CanalAdapterWorker.java | 0 .../src/main/resources/canal-client.yml | 18 ++++++++++++++ .../example}/src/main/resources/logback.xml | 2 +- client-adapter/pom.xml | 1 + .../src/main/resources/canal-client.yml | 24 ------------------- pom.xml | 1 - 17 files changed, 26 insertions(+), 32 deletions(-) rename {client-launcher => client-adapter/example}/pom.xml (96%) rename {client-launcher => client-adapter/example}/src/main/assembly/dev.xml (100%) rename {client-launcher => client-adapter/example}/src/main/assembly/release.xml (100%) rename {client-launcher => client-adapter/example}/src/main/bin/startup.bat (100%) rename {client-launcher => client-adapter/example}/src/main/bin/startup.sh (100%) rename {client-launcher => client-adapter/example}/src/main/bin/stop.sh (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java (100%) rename {client-launcher => client-adapter/example}/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java (100%) create mode 100644 client-adapter/example/src/main/resources/canal-client.yml rename {client-launcher => client-adapter/example}/src/main/resources/logback.xml (97%) delete mode 100644 client-launcher/src/main/resources/canal-client.yml diff --git a/client-launcher/pom.xml b/client-adapter/example/pom.xml similarity index 96% rename from client-launcher/pom.xml rename to client-adapter/example/pom.xml index 78c1f164..3c68087a 100644 --- a/client-launcher/pom.xml +++ b/client-adapter/example/pom.xml @@ -3,15 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - canal + canal.client-adapter com.alibaba.otter 1.1.1-SNAPSHOT 4.0.0 com.alibaba.otter - canal.client-launcher + example jar - canal client launcher module for otter ${project.version} + canal client adapter example module for otter ${project.version} + com.alibaba.otter @@ -21,7 +22,7 @@ com.alibaba.otter canal.client - ${project.version} + ${canal_version} @@ -144,5 +145,4 @@ - - + \ No newline at end of file diff --git a/client-launcher/src/main/assembly/dev.xml b/client-adapter/example/src/main/assembly/dev.xml similarity index 100% rename from client-launcher/src/main/assembly/dev.xml rename to client-adapter/example/src/main/assembly/dev.xml diff --git a/client-launcher/src/main/assembly/release.xml b/client-adapter/example/src/main/assembly/release.xml similarity index 100% rename from client-launcher/src/main/assembly/release.xml rename to client-adapter/example/src/main/assembly/release.xml diff --git a/client-launcher/src/main/bin/startup.bat b/client-adapter/example/src/main/bin/startup.bat similarity index 100% rename from client-launcher/src/main/bin/startup.bat rename to client-adapter/example/src/main/bin/startup.bat diff --git a/client-launcher/src/main/bin/startup.sh b/client-adapter/example/src/main/bin/startup.sh similarity index 100% rename from client-launcher/src/main/bin/startup.sh rename to client-adapter/example/src/main/bin/startup.sh diff --git a/client-launcher/src/main/bin/stop.sh b/client-adapter/example/src/main/bin/stop.sh similarity index 100% rename from client-launcher/src/main/bin/stop.sh rename to client-adapter/example/src/main/bin/stop.sh diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java diff --git a/client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java b/client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java similarity index 100% rename from client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java rename to client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java diff --git a/client-adapter/example/src/main/resources/canal-client.yml b/client-adapter/example/src/main/resources/canal-client.yml new file mode 100644 index 00000000..de24e756 --- /dev/null +++ b/client-adapter/example/src/main/resources/canal-client.yml @@ -0,0 +1,18 @@ +canalServerHost: 127.0.0.1:11111 +#zookeeperHosts: slave1:2181 +#bootstrapServers: slave1:6667,slave2:6667 #or rocketmq nameservers:host1:9876;host2:9876 +flatMessage: false + +canalInstances: +- instance: example + adapterGroups: + - outAdapters: + - name: logger + +#mqTopics: +#- mqMode: rocketmq +# topic: example +# groups: +# - groupId: example +# outAdapters: +# - name: logger diff --git a/client-launcher/src/main/resources/logback.xml b/client-adapter/example/src/main/resources/logback.xml similarity index 97% rename from client-launcher/src/main/resources/logback.xml rename to client-adapter/example/src/main/resources/logback.xml index 665954f7..e74c84f0 100644 --- a/client-launcher/src/main/resources/logback.xml +++ b/client-adapter/example/src/main/resources/logback.xml @@ -36,7 +36,7 @@ - + diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml index aafe6395..7ca65de1 100644 --- a/client-adapter/pom.xml +++ b/client-adapter/pom.xml @@ -24,6 +24,7 @@ logger hbase launcher + example diff --git a/client-launcher/src/main/resources/canal-client.yml b/client-launcher/src/main/resources/canal-client.yml deleted file mode 100644 index d2cb2175..00000000 --- a/client-launcher/src/main/resources/canal-client.yml +++ /dev/null @@ -1,24 +0,0 @@ -#canalServerHost: 127.0.0.1:11111 -#zookeeperHosts: slave1:2181 -bootstrapServers: slave1:6667,slave2:6667 #or rocketmq nameservers:host1:9876;host2:9876 -flatMessage: true - -#canalInstances: -#- instance: example -# adapterGroups: -# - outAdapters: -# - name: logger -# - name: hbase -# hosts: slave1:2181 -# properties: {znodeParent: "/hbase-unsecure"} - -mqTopics: -- mqMode: rocketmq - topic: example - groups: - - groupId: example - outAdapters: - - name: logger -# - name: hbase -# hosts: slave1:2181 -# properties: {znodeParent: "/hbase-unsecure"} diff --git a/pom.xml b/pom.xml index dc200785..27038086 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,6 @@ example prometheus client-adapter - client-launcher