Browse Source

去掉client-launcher, 移入client-adapter中重命名为example, 调整其他相关模块结构

mcy 6 years ago
parent
commit
1b88430f71

+ 6 - 6
client-launcher/pom.xml → 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">
     <parent>
-        <artifactId>canal</artifactId>
+        <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
         <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
-    <artifactId>canal.client-launcher</artifactId>
+    <artifactId>example</artifactId>
     <packaging>jar</packaging>
-    <name>canal client launcher module for otter ${project.version}</name>
+    <name>canal client adapter example module for otter ${project.version}</name>
+
     <dependencies>
         <dependency>
             <groupId>com.alibaba.otter</groupId>
@@ -21,7 +22,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
-            <version>${project.version}</version>
+            <version>${canal_version}</version>
         </dependency>
         <!-- 单独引入rocketmq依赖 -->
         <dependency>
@@ -144,5 +145,4 @@
             </build>
         </profile>
     </profiles>
-
-</project>
+</project>

+ 0 - 0
client-launcher/src/main/assembly/dev.xml → client-adapter/example/src/main/assembly/dev.xml


+ 0 - 0
client-launcher/src/main/assembly/release.xml → client-adapter/example/src/main/assembly/release.xml


+ 0 - 0
client-launcher/src/main/bin/startup.bat → client-adapter/example/src/main/bin/startup.bat


+ 0 - 0
client-launcher/src/main/bin/startup.sh → client-adapter/example/src/main/bin/startup.sh


+ 0 - 0
client-launcher/src/main/bin/stop.sh → client-adapter/example/src/main/bin/stop.sh


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/ClientLauncher.java


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/AbstractCanalAdapterWorker.java


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterKafkaWorker.java


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterLoader.java


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterRocketMQWorker.java


+ 0 - 0
client-launcher/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java → client-adapter/example/src/main/java/com/alibaba/otter/canal/client/adapter/loader/CanalAdapterWorker.java


+ 18 - 0
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

+ 1 - 1
client-launcher/src/main/resources/logback.xml → client-adapter/example/src/main/resources/logback.xml

@@ -36,7 +36,7 @@
 
 	<logger name="com.alibaba.otter.canal.client" additivity="false">
 		<level value="INFO" />
-		<!--<appender-ref ref="STDOUT"/>-->
+		<appender-ref ref="STDOUT"/>
 		<appender-ref ref="CANAL-ROOT" />
 	</logger>
     

+ 1 - 0
client-adapter/pom.xml

@@ -24,6 +24,7 @@
         <module>logger</module>
         <module>hbase</module>
         <module>launcher</module>
+        <module>example</module>
     </modules>
 
     <build>

+ 0 - 24
client-launcher/src/main/resources/canal-client.yml

@@ -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"}

+ 0 - 1
pom.xml

@@ -119,7 +119,6 @@
         <module>example</module>
         <module>prometheus</module>
         <module>client-adapter</module>
-        <module>client-launcher</module>
     </modules>
 
     <dependencyManagement>