This is an automated email from the ASF dual-hosted git repository. zhoubo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-connect.git
commit 30b02f4de300c556f10863e85b64a1eea68165cd Author: laohu <[email protected]> AuthorDate: Wed Jun 5 08:13:43 2019 +0800 change package name --- pom.xml | 48 ---------------------- .../apache/rocketmq/connect}/activemq/Config.java | 2 +- .../rocketmq/connect}/activemq/Replicator.java | 5 +-- .../activemq/connector/ActivemqConnector.java | 5 ++- .../connect}/activemq/connector/ActivemqTask.java | 8 ++-- .../activemq/pattern/PatternProcessor.java | 11 +++-- 6 files changed, 15 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index b021330..f22c291 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,6 @@ <version>1.0.0</version> <name>connect-activemq</name> - <description>Redis Replicator is a redis RDB and Command parser written in java. - It can parse,filter,broadcast the RDB and Command events in a real time manner - and resent to Apache RocketMQ, then consumer could subscribe topic to receive data. - </description> <url>https://github.com/apache/incubator-rocketmq-externals/tree/master/rocketmq-connect-activemq</url> <licenses> @@ -33,36 +29,6 @@ </license> </licenses> - <developers> - <developer> - <name>Leon Chen</name> - <email>[email protected]</email> - <organization>moilioncircle</organization> - <organizationUrl>http://www.moilioncircle.com/</organizationUrl> - <roles> - <role>Developer</role> - </roles> - <timezone>+8</timezone> - </developer> - - <developer> - <name>Adrian Yao</name> - <email>[email protected]</email> - <organization>unstudy</organization> - <timezone>+8</timezone> - </developer> - - <developer> - <name>Rick Zhang</name> - <email>[email protected]</email> - <organization>treefinance.com.cn</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>+8</timezone> - </developer> - </developers> - <issueManagement> <system>jira</system> <url>https://issues.apache.org/jira/browse/RocketMQ</url> @@ -185,12 +151,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.5</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.openmessaging</groupId> <artifactId>openmessaging-connect-runtime</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -210,8 +170,6 @@ <artifactId>fastjson</artifactId> <version>1.2.51</version> </dependency> - <!-- <dependency> <groupId>io.javalin</groupId> <artifactId>javalin</artifactId> - <version>1.3.0</version> </dependency> --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -248,12 +206,6 @@ <version>2.0</version> </dependency> - <dependency> - <groupId>org.glassfish.main.javaee-api</groupId> - <artifactId>javax.jms</artifactId> - <version>3.1.2.2</version> - </dependency> - </dependencies> </project> diff --git a/src/main/java/io/openmessaging/activemq/Config.java b/src/main/java/org/apache/rocketmq/connect/activemq/Config.java similarity index 98% rename from src/main/java/io/openmessaging/activemq/Config.java rename to src/main/java/org/apache/rocketmq/connect/activemq/Config.java index 10a5d9f..15a95a7 100644 --- a/src/main/java/io/openmessaging/activemq/Config.java +++ b/src/main/java/org/apache/rocketmq/connect/activemq/Config.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.openmessaging.activemq; +package org.apache.rocketmq.connect.activemq; import java.lang.reflect.Method; import java.util.HashSet; diff --git a/src/main/java/io/openmessaging/activemq/Replicator.java b/src/main/java/org/apache/rocketmq/connect/activemq/Replicator.java similarity index 94% rename from src/main/java/io/openmessaging/activemq/Replicator.java rename to src/main/java/org/apache/rocketmq/connect/activemq/Replicator.java index 51ca6c1..499beb0 100644 --- a/src/main/java/io/openmessaging/activemq/Replicator.java +++ b/src/main/java/org/apache/rocketmq/connect/activemq/Replicator.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package io.openmessaging.activemq; +package org.apache.rocketmq.connect.activemq; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import javax.jms.Message; +import org.apache.rocketmq.connect.activemq.pattern.PatternProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.openmessaging.activemq.pattern.PatternProcessor; - public class Replicator { private static final Logger LOGGER = LoggerFactory.getLogger(Replicator.class); diff --git a/src/main/java/io/openmessaging/activemq/connector/ActivemqConnector.java b/src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqConnector.java similarity index 94% rename from src/main/java/io/openmessaging/activemq/connector/ActivemqConnector.java rename to src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqConnector.java index 1c9a530..17d3efe 100644 --- a/src/main/java/io/openmessaging/activemq/connector/ActivemqConnector.java +++ b/src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqConnector.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package io.openmessaging.activemq.connector; +package org.apache.rocketmq.connect.activemq.connector; import io.openmessaging.KeyValue; -import io.openmessaging.activemq.Config; import io.openmessaging.connector.api.Task; import io.openmessaging.connector.api.source.SourceConnector; import java.util.ArrayList; import java.util.List; +import org.apache.rocketmq.connect.activemq.Config; + public class ActivemqConnector extends SourceConnector { private KeyValue config; diff --git a/src/main/java/io/openmessaging/activemq/connector/ActivemqTask.java b/src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqTask.java similarity index 92% rename from src/main/java/io/openmessaging/activemq/connector/ActivemqTask.java rename to src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqTask.java index a04fc50..f871be5 100644 --- a/src/main/java/io/openmessaging/activemq/connector/ActivemqTask.java +++ b/src/main/java/org/apache/rocketmq/connect/activemq/connector/ActivemqTask.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.openmessaging.activemq.connector; +package org.apache.rocketmq.connect.activemq.connector; import java.util.ArrayList; import java.util.Collection; @@ -24,14 +24,14 @@ import java.util.concurrent.TimeUnit; import javax.jms.Message; +import org.apache.rocketmq.connect.activemq.Config; +import org.apache.rocketmq.connect.activemq.Replicator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSON; import io.openmessaging.KeyValue; -import io.openmessaging.activemq.Config; -import io.openmessaging.activemq.Replicator; import io.openmessaging.connector.api.data.SourceDataEntry; import io.openmessaging.connector.api.source.SourceTask; @@ -66,10 +66,10 @@ public class ActivemqTask extends SourceTask { this.config = new Config(); this.config.load(props); this.replicator = new Replicator(config); + this.replicator.start(); } catch (Exception e) { log.error("Mysql task start failed.", e); } - this.replicator.start(); } @Override diff --git a/src/main/java/io/openmessaging/activemq/pattern/PatternProcessor.java b/src/main/java/org/apache/rocketmq/connect/activemq/pattern/PatternProcessor.java similarity index 91% rename from src/main/java/io/openmessaging/activemq/pattern/PatternProcessor.java rename to src/main/java/org/apache/rocketmq/connect/activemq/pattern/PatternProcessor.java index 4b4b450..c1b282c 100644 --- a/src/main/java/io/openmessaging/activemq/pattern/PatternProcessor.java +++ b/src/main/java/org/apache/rocketmq/connect/activemq/pattern/PatternProcessor.java @@ -1,4 +1,4 @@ -package io.openmessaging.activemq.pattern; +package org.apache.rocketmq.connect.activemq.pattern; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -11,9 +11,8 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.commons.lang3.StringUtils; - -import io.openmessaging.activemq.Config; -import io.openmessaging.activemq.Replicator; +import org.apache.rocketmq.connect.activemq.Config; +import org.apache.rocketmq.connect.activemq.Replicator; public class PatternProcessor { @@ -65,7 +64,7 @@ public class PatternProcessor { } }); }catch(Exception e) { - + throw new RuntimeException(e); } } @@ -75,7 +74,7 @@ public class PatternProcessor { session.close(); connection.close(); } catch (JMSException e) { - e.printStackTrace(); + throw new RuntimeException(e); } }
