diff --git a/README.md b/README.md index f733fc63ae20bf0c1e2bf6b981e08e5fae846666..0ddad187f5e93b12d74998d189dd5bfb4b17188f 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ whatsmars-dubbo | 高性能分布式RPC框架 whatsmars-elasticjob | 分布式调度框架 whatsmars-elasticsearch | Elasticsearch whatsmars-mq | 消息中间件RocketMQ,Kafka等 +whatsmars-netty | 广泛使用的NIO框架 whatsmars-redis | Redis客户端简单封装 whatsmars-rpc | Transporter & Codec & Serialization whatsmars-shardingsphere | 分布式数据库中间件 diff --git a/pom.xml b/pom.xml index bcef97798bc1be140695bec2647d7a9a6a5cea45..0ecd621083246e2c89faa15bb6369abb6a0c412b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ whatsmars-zk whatsmars-spring-data whatsmars-archetypes + whatsmars-netty diff --git a/whatsmars-rpc/whatsmars-netty/README.md b/whatsmars-netty/README.md similarity index 100% rename from whatsmars-rpc/whatsmars-netty/README.md rename to whatsmars-netty/README.md diff --git a/whatsmars-rpc/whatsmars-netty/pom.xml b/whatsmars-netty/pom.xml similarity index 80% rename from whatsmars-rpc/whatsmars-netty/pom.xml rename to whatsmars-netty/pom.xml index 1f3f22908ad8c3dbeda9abd66aaaad586c50e2da..883abe86eaab56c5bf34b1e02c9674310866a0fe 100644 --- a/whatsmars-rpc/whatsmars-netty/pom.xml +++ b/whatsmars-netty/pom.xml @@ -3,7 +3,7 @@ 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"> - whatsmars-rpc + whatsmars-parent org.hongxi Rocket.S9 @@ -16,15 +16,10 @@ io.netty netty-all - - org.slf4j - slf4j-api - ch.qos.logback logback-classic - \ No newline at end of file diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/discard/DiscardServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/echo/EchoServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/BigIntegerDecoder.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/BigIntegerDecoder.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/BigIntegerDecoder.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/BigIntegerDecoder.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialClientInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/FactorialServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/NumberEncoder.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/NumberEncoder.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/NumberEncoder.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/factorial/NumberEncoder.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/file/HttpStaticFileServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/helloworld/HttpHelloWorldServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopClientInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/snoop/HttpSnoopServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadClientInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/http/upload/HttpUploadServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEcho.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEcho.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEcho.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEcho.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/localecho/LocalEchoServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Main.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Main.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Main.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Main.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Message.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Message.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Message.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Message.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageBuffer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageBuffer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageBuffer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageBuffer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageProcessor.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageProcessor.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageProcessor.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageProcessor.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReader.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReader.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReader.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReader.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReaderFactory.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReaderFactory.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReaderFactory.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageReaderFactory.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageWriter.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageWriter.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageWriter.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/MessageWriter.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/QueueIntFlip.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/QueueIntFlip.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/QueueIntFlip.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/QueueIntFlip.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Server.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Server.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Server.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Server.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Socket.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Socket.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Socket.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/Socket.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketAcceptor.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketAcceptor.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketAcceptor.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketAcceptor.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketProcessor.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketProcessor.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketProcessor.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/SocketProcessor.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/WriteProxy.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/WriteProxy.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/WriteProxy.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/WriteProxy.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpHeaders.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpHeaders.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpHeaders.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpHeaders.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReader.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReader.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReader.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReader.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReaderFactory.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReaderFactory.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReaderFactory.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpMessageReaderFactory.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpUtil.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpUtil.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpUtil.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/nio/http/HttpUtil.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/objectecho/ObjectEchoServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/portunification/PortUnificationServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/redis/RedisClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatClientInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/securechat/SecureChatServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetClientInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerInitializer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerInitializer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerInitializer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/telnet/TelnetServerInitializer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClient.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClient.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClient.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClient.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClientHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClientHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClientHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeClientHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServer.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServer.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServer.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServer.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServerHandler.java b/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServerHandler.java similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServerHandler.java rename to whatsmars-netty/src/main/java/org/hongxi/whatsmars/netty/uptime/UptimeServerHandler.java diff --git a/whatsmars-rpc/whatsmars-netty/src/main/resources/logback.xml b/whatsmars-netty/src/main/resources/logback.xml similarity index 100% rename from whatsmars-rpc/whatsmars-netty/src/main/resources/logback.xml rename to whatsmars-netty/src/main/resources/logback.xml diff --git a/whatsmars-rpc/pom.xml b/whatsmars-rpc/pom.xml index 28709adc00007e0a85c6c1d43e80d1d4a3cea8d9..ecaf121002f0d0cb0a46cd6c8694e86fca8f03dc 100644 --- a/whatsmars-rpc/pom.xml +++ b/whatsmars-rpc/pom.xml @@ -17,7 +17,6 @@ whatsmars-remoting whatsmars-serialization - whatsmars-netty