From 18f9da1a6c9695e8d0fbb4ce65dfbf4f03aa34dc Mon Sep 17 00:00:00 2001 From: He Wang Date: Mon, 18 Oct 2021 15:04:37 +0800 Subject: [PATCH] update package name --- .editorconfig | 15 + README.md | 27 +- client/pom.xml | 59 --- common/pom.xml | 91 ++-- logproxy-client/pom.xml | 60 +++ .../clogproxy/client/LogProxyClient.java | 1 - .../config/AbstractConnectionConfig.java | 0 .../clogproxy/client/config/ClientConf.java | 0 .../client/config/ConnectionConfig.java | 0 .../clogproxy/client/config/DRCConfig.java | 0 .../client/config/ObReaderConfig.java | 0 .../client/connection/ClientHandler.java | 0 .../client/connection/ClientStream.java | 0 .../client/connection/Connection.java | 0 .../client/connection/ConnectionFactory.java | 0 .../client/connection/ConnectionParams.java | 0 .../client/connection/NamedThreadFactory.java | 0 .../client/connection/NettyEventLoopUtil.java | 0 .../client/connection/StreamContext.java | 0 .../clogproxy/client/constants/DataType.java | 0 .../clogproxy/client/enums/DBType.java | 0 .../clogproxy/client/enums/ErrorCode.java | 0 .../client/exception/DRCClientException.java | 0 .../exception/DRCClientRunTimeException.java | 0 .../exception/LogProxyClientException.java | 0 .../clogproxy/client/fliter/DataFilter.java | 0 .../client/fliter/DataFilterBase.java | 0 .../client/listener/FieldParseListener.java | 0 .../client/listener/RecordListener.java | 0 .../client/listener/StatusListener.java | 0 .../clogproxy/client/message/ByteString.java | 0 .../clogproxy/client/message/Checkpoint.java | 0 .../clogproxy/client/message/DataMessage.java | 0 .../clogproxy/client/message/LogMessage.java | 0 .../clogproxy/client/message/Message.java | 0 .../client/util/BinaryMessageUtils.java | 0 .../client/util/ClientIdGenerator.java | 0 .../clogproxy/client/util/DataFilterUtil.java | 0 .../client/util/NettyEventLoopUtil.java | 0 .../clogproxy/client/util/StringUtils.java | 0 .../clogproxy/client/util/Validator.java | 0 .../clogproxy/client/LogProxyClientTest.java | 0 .../src/test/resources/certs/ca.crt | 0 .../src/test/resources/certs/client.crt | 0 .../src/test/resources/certs/client.key | 0 pom.xml | 444 +++++++++--------- 46 files changed, 358 insertions(+), 339 deletions(-) create mode 100644 .editorconfig delete mode 100644 client/pom.xml create mode 100644 logproxy-client/pom.xml rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java (98%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/config/AbstractConnectionConfig.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/config/ClientConf.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/config/ConnectionConfig.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/config/DRCConfig.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/ClientHandler.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/ClientStream.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/Connection.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionFactory.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionParams.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/NamedThreadFactory.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/NettyEventLoopUtil.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/connection/StreamContext.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/constants/DataType.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/enums/DBType.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/enums/ErrorCode.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientException.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientRunTimeException.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/exception/LogProxyClientException.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilter.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilterBase.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/listener/FieldParseListener.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/listener/RecordListener.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/listener/StatusListener.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/message/ByteString.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/message/Checkpoint.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/message/DataMessage.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/message/LogMessage.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/message/Message.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/BinaryMessageUtils.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/ClientIdGenerator.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/DataFilterUtil.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/NettyEventLoopUtil.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/StringUtils.java (100%) rename {client => logproxy-client}/src/main/java/com/oceanbase/clogproxy/client/util/Validator.java (100%) rename {client => logproxy-client}/src/test/java/com/oceanbase/clogproxy/client/LogProxyClientTest.java (100%) rename {client => logproxy-client}/src/test/resources/certs/ca.crt (100%) rename {client => logproxy-client}/src/test/resources/certs/client.crt (100%) rename {client => logproxy-client}/src/test/resources/certs/client.key (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..2b63cf3 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# This file is for unifying the coding style for different editors and IDEs +# See editorconfig.org + +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.java] +indent_size = 4 diff --git a/README.md b/README.md index 050828f..80fc4d4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ OceanBase Log Client --------------- -OceanBase Log Client is a Java client for [oblogproxy](https://github.com/oceanbase/oblogproxy). It uses [netty](https://github.com/netty/netty) to connect to the log proxy server and receive the incremental change log in real time. +OceanBase Log Client is a library for obtaining log of [OceanBase](https://github.com/oceanbase/oceanbase). There are modules as following: + +- `common`: some common utils +- `logproxy-client`: the client for [oblogproxy](https://github.com/oceanbase/oblogproxy) Communication --------------- @@ -19,9 +22,9 @@ Example for Maven: ```xml - com.oceanbase.logproxy.client - client - x.y.z + com.oceanbase.logclient + logproxy-client + x.y.z ``` @@ -29,16 +32,16 @@ If you'd rather like the latest snapshots of the upcoming major version, use our ```xml - com.oceanbase.logproxy.client - client - x.y.z-SNAPSHOT + com.oceanbase.logclient + logproxy-client + x.y.z-SNAPSHOT sonatype-snapshots Sonatype Snapshot Repository - https://oss.sonatype.org/content/repositories/snapshots/ + https://s01.oss.sonatype.org/content/repositories/snapshots/ true @@ -68,13 +71,13 @@ LogProxyClient client = new LogProxyClient("127.0.0.1", 2983, config); // add handler client.addListener(new RecordListener() { - - @Override + + @Override public void notify(LogMessage message){ // process } - - @Override + + @Override public void onException(LogProxyClientException e) { if (e.needStop()) { // handle error and stop client diff --git a/client/pom.xml b/client/pom.xml deleted file mode 100644 index 779f519..0000000 --- a/client/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - - com.oceanbase.logproxy.client - logproxy-client - 1.0.1-SNAPSHOT - ../pom.xml - - - client - jar - - ${project.groupId}:${project.artifactId} - - - - com.oceanbase.logproxy.client - common - ${project.version} - - - - - org.slf4j - slf4j-api - - - org.slf4j - log4j-over-slf4j - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - jul-to-slf4j - - - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - - - junit - junit - test - - - diff --git a/common/pom.xml b/common/pom.xml index 315e8c0..9bf6b7f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,52 +1,53 @@ - - 4.0.0 + + 4.0.0 - - com.oceanbase.logproxy.client - logproxy-client - 1.0.1-SNAPSHOT - ../pom.xml - + + com.oceanbase.logclient + logclient + 1.0.0-SNAPSHOT + ../pom.xml + - common - jar + common + jar + ${project.groupId}:${project.artifactId} + Common Utils for OceanBase Log Client. - ${project.groupId}:${project.artifactId} + + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + commons-codec + commons-codec + + + com.google.guava + guava + - - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - commons-codec - commons-codec - - - com.google.guava - guava - + + + io.netty + netty-all + - - - io.netty - netty-all - - - - - com.google.protobuf - protobuf-java - - - org.lz4 - lz4-java - - + + + com.google.protobuf + protobuf-java + + + org.lz4 + lz4-java + + diff --git a/logproxy-client/pom.xml b/logproxy-client/pom.xml new file mode 100644 index 0000000..234d6d4 --- /dev/null +++ b/logproxy-client/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + com.oceanbase.logclient + logclient + 1.0.0-SNAPSHOT + ../pom.xml + + + logproxy-client + jar + ${project.groupId}:${project.artifactId} + The Client for OceanBase Log Proxy. + + + + com.oceanbase.logclient + common + ${project.version} + + + + + org.slf4j + slf4j-api + + + org.slf4j + log4j-over-slf4j + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + + + junit + junit + test + + + diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java similarity index 98% rename from client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java index ac5a58a..6918b99 100644 --- a/client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java +++ b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/LogProxyClient.java @@ -18,7 +18,6 @@ import com.oceanbase.clogproxy.client.listener.RecordListener; import com.oceanbase.clogproxy.client.listener.StatusListener; import com.oceanbase.clogproxy.client.util.ClientIdGenerator; import com.oceanbase.clogproxy.client.util.Validator; -import com.oceanbase.clogproxy.common.packet.LogType; import com.oceanbase.clogproxy.common.packet.ProtocolVersion; import io.netty.handler.ssl.SslContext; diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/config/AbstractConnectionConfig.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/AbstractConnectionConfig.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/config/AbstractConnectionConfig.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/AbstractConnectionConfig.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/config/ClientConf.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ClientConf.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/config/ClientConf.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ClientConf.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/config/ConnectionConfig.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ConnectionConfig.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/config/ConnectionConfig.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ConnectionConfig.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/config/DRCConfig.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/DRCConfig.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/config/DRCConfig.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/DRCConfig.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientHandler.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientHandler.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientHandler.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientHandler.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientStream.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientStream.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientStream.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ClientStream.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/Connection.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/Connection.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/Connection.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/Connection.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionFactory.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionFactory.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionFactory.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionFactory.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionParams.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionParams.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionParams.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/ConnectionParams.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/NamedThreadFactory.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/NamedThreadFactory.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/NamedThreadFactory.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/NamedThreadFactory.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/NettyEventLoopUtil.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/NettyEventLoopUtil.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/NettyEventLoopUtil.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/NettyEventLoopUtil.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/connection/StreamContext.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/StreamContext.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/connection/StreamContext.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/connection/StreamContext.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/constants/DataType.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/constants/DataType.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/constants/DataType.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/constants/DataType.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/enums/DBType.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/enums/DBType.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/enums/DBType.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/enums/DBType.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/enums/ErrorCode.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/enums/ErrorCode.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/enums/ErrorCode.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/enums/ErrorCode.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientException.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientException.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientException.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientException.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientRunTimeException.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientRunTimeException.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientRunTimeException.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/DRCClientRunTimeException.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/exception/LogProxyClientException.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/LogProxyClientException.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/exception/LogProxyClientException.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/exception/LogProxyClientException.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilter.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilter.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilter.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilter.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilterBase.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilterBase.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilterBase.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/fliter/DataFilterBase.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/listener/FieldParseListener.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/FieldParseListener.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/listener/FieldParseListener.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/FieldParseListener.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/listener/RecordListener.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/RecordListener.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/listener/RecordListener.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/RecordListener.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/listener/StatusListener.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/StatusListener.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/listener/StatusListener.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/listener/StatusListener.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/message/ByteString.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/ByteString.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/message/ByteString.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/ByteString.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/message/Checkpoint.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/Checkpoint.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/message/Checkpoint.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/Checkpoint.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/message/DataMessage.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/DataMessage.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/message/DataMessage.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/DataMessage.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/message/LogMessage.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/LogMessage.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/message/LogMessage.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/LogMessage.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/message/Message.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/Message.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/message/Message.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/message/Message.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/BinaryMessageUtils.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/BinaryMessageUtils.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/BinaryMessageUtils.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/BinaryMessageUtils.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/ClientIdGenerator.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/ClientIdGenerator.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/ClientIdGenerator.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/ClientIdGenerator.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/DataFilterUtil.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/DataFilterUtil.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/DataFilterUtil.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/DataFilterUtil.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/NettyEventLoopUtil.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/NettyEventLoopUtil.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/NettyEventLoopUtil.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/NettyEventLoopUtil.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/StringUtils.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/StringUtils.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/StringUtils.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/StringUtils.java diff --git a/client/src/main/java/com/oceanbase/clogproxy/client/util/Validator.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/Validator.java similarity index 100% rename from client/src/main/java/com/oceanbase/clogproxy/client/util/Validator.java rename to logproxy-client/src/main/java/com/oceanbase/clogproxy/client/util/Validator.java diff --git a/client/src/test/java/com/oceanbase/clogproxy/client/LogProxyClientTest.java b/logproxy-client/src/test/java/com/oceanbase/clogproxy/client/LogProxyClientTest.java similarity index 100% rename from client/src/test/java/com/oceanbase/clogproxy/client/LogProxyClientTest.java rename to logproxy-client/src/test/java/com/oceanbase/clogproxy/client/LogProxyClientTest.java diff --git a/client/src/test/resources/certs/ca.crt b/logproxy-client/src/test/resources/certs/ca.crt similarity index 100% rename from client/src/test/resources/certs/ca.crt rename to logproxy-client/src/test/resources/certs/ca.crt diff --git a/client/src/test/resources/certs/client.crt b/logproxy-client/src/test/resources/certs/client.crt similarity index 100% rename from client/src/test/resources/certs/client.crt rename to logproxy-client/src/test/resources/certs/client.crt diff --git a/client/src/test/resources/certs/client.key b/logproxy-client/src/test/resources/certs/client.key similarity index 100% rename from client/src/test/resources/certs/client.key rename to logproxy-client/src/test/resources/certs/client.key diff --git a/pom.xml b/pom.xml index b537fea..6de7b40 100644 --- a/pom.xml +++ b/pom.xml @@ -1,228 +1,228 @@ - - 4.0.0 - - com.oceanbase.logproxy.client - logproxy-client - 1.0.1-SNAPSHOT - pom - - ${project.groupId}:${project.artifactId} - The Java Client for OceanBase LogProxy. + + 4.0.0 + + com.oceanbase.logclient + logclient + 1.0.0-SNAPSHOT + pom + + ${project.groupId}:${project.artifactId} + OceanBase Log Client. + https://github.com/oceanbase/oblogclient + + + + Mulan Public Licenseļ¼ŒVersion 2 + http://license.coscl.org.cn/MulanPSL2/ + + + + + + He Wang + wanghechn@qq.com + OceanBase + 8 + + + + + scm:git:https://github.com/oceanbase/oblogclient.git + scm:git:https://github.com/oceanbase/oblogclient.git https://github.com/oceanbase/oblogclient - - - - Mulan Public Licenseļ¼ŒVersion 2 - http://license.coscl.org.cn/MulanPSL2/ - - - - - - He Wang - wanghechn@qq.com - OceanBase - https://open.oceanbase.com - 8 - - - - - scm:git:https://github.com/oceanbase/oblogclient.git - scm:git:https://github.com/oceanbase/oblogclient.git - https://github.com/oceanbase/oblogclient - HEAD + HEAD - - UTF-8 - ${encoding} - ${encoding} - - 1.8 - ${java.version} - ${java.version} - - 3.12.0 - 4.4 - 1.15 - 31.0.1-jre - 4.1.68.Final - 3.18.1 - 1.8.0 - 1.7.32 - 1.2.6 - 4.13.1 - - - - common - client - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - org.apache.commons - commons-collections4 - ${commons-collection.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - com.google.guava - guava - ${guava.version} - - - - - io.netty - netty-all - ${netty.version} - - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - org.lz4 - lz4-java - ${lz4.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - slf4j-log4j12 - org.slf4j - - - - - - - junit - junit - ${junit.version} - test - - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - - - + + UTF-8 + ${encoding} + ${encoding} + + 1.8 + ${java.version} + ${java.version} + + 3.12.0 + 4.4 + 1.15 + 31.0.1-jre + 4.1.68.Final + 3.18.1 + 1.8.0 + 1.7.32 + 1.2.6 + 4.13.1 + + + + common + logproxy-client + + + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + org.apache.commons + commons-collections4 + ${commons-collection.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + com.google.guava + guava + ${guava.version} + + + + + io.netty + netty-all + ${netty.version} + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + org.lz4 + lz4-java + ${lz4.version} + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + slf4j-api + org.slf4j + + + slf4j-log4j12 + org.slf4j + + + + + + + junit + junit + ${junit.version} + test + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${maven.compiler.source} + ${maven.compiler.target} + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + + + -- GitLab