whatsmars-otter-mq

whatsmars-mq/pom.xml

@@ -22,8 +22,7 @@
         <module>whatsmars-mq-rocketmq-broker</module>
         <module>whatsmars-mq-rocketmq-tools</module>
         <module>whatsmars-mq-rocketmq-spring</module>
-        <module>whatsmars-otter-extend</module>
-        <module>whatsmars-mq-pure</module>
+        <module>whatsmars-otter-mq</module>
     </modules>
 
     <properties>

whatsmars-mq/whatsmars-mq-pure/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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>whatsmars-mq</artifactId>
-        <groupId>org.hongxi</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>whatsmars-mq-pure</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-client</artifactId>
-            <version>${rocketmq.version}</version>
-        </dependency>
-    </dependencies>
-
-
-</project>
\ No newline at end of file

whatsmars-mq/whatsmars-otter-extend/pom.xml → whatsmars-mq/whatsmars-otter-mq/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>whatsmars-otter-extend</artifactId>
+    <artifactId>whatsmars-otter-mq</artifactId>
 
     <properties>
         <otter.version>4.2.16</otter.version>
@@ -27,9 +27,10 @@
             <version>${otter.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hongxi</groupId>
-            <artifactId>whatsmars-mq-pure</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>${rocketmq.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

whatsmars-mq/whatsmars-otter-extend/src/main/java/org/hongxi/whatsmars/otter/extend/MQEventProcessor.java → whatsmars-mq/whatsmars-otter-mq/src/main/java/org/hongxi/whatsmars/otter/extend/MQEventProcessor.java

@@ -5,7 +5,7 @@ import com.alibaba.otter.node.extend.processor.AbstractEventProcessor;
 import com.alibaba.otter.shared.etl.model.EventColumn;
 import com.alibaba.otter.shared.etl.model.EventData;
 import com.alibaba.otter.shared.etl.model.EventType;
-import org.hongxi.whatsmars.common.rocketmq.RocketMQTemplate;
+import org.hongxi.whatsmars.otter.extend.rocketmq.RocketMQTemplate;
 import org.hongxi.whatsmars.otter.extend.support.Column;
 import org.hongxi.whatsmars.otter.extend.support.OtterData;
 import org.springframework.util.StringUtils;

whatsmars-mq/whatsmars-mq-pure/src/main/java/org/hongxi/whatsmars/common/rocketmq/BaseConsumer.java → whatsmars-mq/whatsmars-otter-mq/src/main/java/org/hongxi/whatsmars/otter/extend/rocketmq/BaseConsumer.java

-package org.hongxi.whatsmars.common.rocketmq;
+package org.hongxi.whatsmars.otter.extend.rocketmq;
 
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.*;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.client.log.ClientLogger;
-import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.logging.InternalLogger;
 

whatsmars-mq/whatsmars-mq-pure/src/main/java/org/hongxi/whatsmars/common/rocketmq/MessagingException.java → whatsmars-mq/whatsmars-otter-mq/src/main/java/org/hongxi/whatsmars/otter/extend/rocketmq/MessagingException.java

-package org.hongxi.whatsmars.common.rocketmq;
+package org.hongxi.whatsmars.otter.extend.rocketmq;
 
 import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.help.FAQUrl;

whatsmars-mq/whatsmars-mq-pure/src/main/java/org/hongxi/whatsmars/common/rocketmq/RocketMQTemplate.java → whatsmars-mq/whatsmars-otter-mq/src/main/java/org/hongxi/whatsmars/otter/extend/rocketmq/RocketMQTemplate.java

-package org.hongxi.whatsmars.common.rocketmq;
+package org.hongxi.whatsmars.otter.extend.rocketmq;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;

whatsmars-mq/whatsmars-mq-pure/src/test/java/org/hongxi/whatsmars/common/rocketmq/RocketMQTest.java → whatsmars-mq/whatsmars-otter-mq/src/test/java/org/hongxi/whatsmars/otter/extend/rocketmq/RocketMQTest.java

-package org.hongxi.whatsmars.common.rocketmq;
+package org.hongxi.whatsmars.otter.extend.rocketmq;
 
 import org.apache.rocketmq.client.producer.SendResult;
 import org.junit.Test;

whatsmars-mq/whatsmars-mq-pure/src/test/java/org/hongxi/whatsmars/common/rocketmq/TestConsumer.java → whatsmars-mq/whatsmars-otter-mq/src/test/java/org/hongxi/whatsmars/otter/extend/rocketmq/TestConsumer.java

-package org.hongxi.whatsmars.common.rocketmq;
+package org.hongxi.whatsmars.otter.extend.rocketmq;
 
 import org.apache.rocketmq.common.message.MessageExt;