From 55a68a337b35a5940122b9afc774b47c52787214 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Tue, 12 Dec 2017 21:51:21 +0800 Subject: [PATCH] Refactor package name --- dubbo-demo/dubbo-demo-consumer/pom.xml | 27 +++++++------------ dubbo-demo/dubbo-demo-provider/pom.xml | 27 +++++++------------ dubbo-maven/pom.xml | 6 +++++ dubbo-plugin/dubbo-qos/pom.xml | 1 - .../{ => dubbo}/qos/command/BaseCommand.java | 2 +- .../qos/command/CommandContext.java | 2 +- .../qos/command/CommandContextFactory.java | 2 +- .../qos/command/CommandExecutor.java | 2 +- .../qos/command/CommandImpl/Help.java | 12 ++++----- .../qos/command/CommandImpl/Ls.java | 10 +++---- .../qos/command/CommandImpl/Offline.java | 8 +++--- .../qos/command/CommandImpl/Online.java | 10 +++---- .../qos/command/CommandImpl/Quit.java | 10 +++---- .../qos/command/DefaultCommandExecutor.java | 2 +- .../qos/command/NoSuchCommandException.java | 2 +- .../qos/command/annotation/Cmd.java | 2 +- .../command/decoder/HttpCommandDecoder.java | 7 ++--- .../command/decoder/TelnetCommandDecoder.java | 7 ++--- .../qos/command/util/CommandHelper.java | 4 +-- .../{ => dubbo}/qos/common/Constants.java | 2 +- .../{ => dubbo}/qos/server/DubboLogo.java | 2 +- .../{ => dubbo}/qos/server/Server.java | 7 ++--- .../server/handler/HttpProcessHandler.java | 13 ++++----- .../handler/LocalHostPermitHandler.java | 5 ++-- .../qos/server/handler/QosProcessHandler.java | 2 +- .../server/handler/TelnetProcessHandler.java | 15 ++++++----- .../{ => dubbo}/qos/textui/TComponent.java | 2 +- .../alibaba/{ => dubbo}/qos/textui/TKv.java | 2 +- .../{ => dubbo}/qos/textui/TLadder.java | 2 +- .../{ => dubbo}/qos/textui/TTable.java | 2 +- .../alibaba/{ => dubbo}/qos/textui/TTree.java | 2 +- .../com.alibaba.dubbo.qos.command.BaseCommand | 5 ++++ .../com.alibaba.qos.command.BaseCommand | 5 ---- .../{ => dubbo}/qos/textui/TKvTest.java | 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 1 - .../rpc/protocol/ProtocolListenerWrapper.java | 2 +- dubbo/pom.xml | 21 +++++++++++++++ pom.xml | 6 +++++ 38 files changed, 132 insertions(+), 109 deletions(-) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/BaseCommand.java (83%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandContext.java (97%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandContextFactory.java (90%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandExecutor.java (89%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandImpl/Help.java (89%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandImpl/Ls.java (93%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandImpl/Offline.java (91%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandImpl/Online.java (91%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/CommandImpl/Quit.java (51%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/DefaultCommandExecutor.java (94%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/NoSuchCommandException.java (84%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/annotation/Cmd.java (93%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/decoder/HttpCommandDecoder.java (94%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/decoder/TelnetCommandDecoder.java (82%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/command/util/CommandHelper.java (93%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/common/Constants.java (90%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/DubboLogo.java (97%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/Server.java (95%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/handler/HttpProcessHandler.java (92%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/handler/LocalHostPermitHandler.java (92%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/handler/QosProcessHandler.java (98%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/server/handler/TelnetProcessHandler.java (84%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/textui/TComponent.java (82%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/textui/TKv.java (98%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/textui/TLadder.java (97%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/textui/TTable.java (99%) rename dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/{ => dubbo}/qos/textui/TTree.java (99%) create mode 100644 dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand delete mode 100644 dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.qos.command.BaseCommand rename dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/{ => dubbo}/qos/textui/TKvTest.java (94%) diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index 5dc73832d96..34ef84b06a3 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -39,23 +39,6 @@ dubbo ${project.parent.version} - - com.alibaba - dubbo-qos - ${project.parent.version} - - - org.javassist - javassist - - - org.jboss.netty - netty - - - org.apache.zookeeper - zookeeper - com.101tec zkclient @@ -76,5 +59,15 @@ org.slf4j slf4j-api + + org.apache.commons + commons-lang3 + 3.4 + + + io.netty + netty-all + 4.0.35.Final + \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index e7d26fff920..0bb988752cb 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -39,23 +39,6 @@ dubbo ${project.parent.version} - - com.alibaba - dubbo-qos - ${project.parent.version} - - - org.javassist - javassist - - - org.jboss.netty - netty - - - org.apache.zookeeper - zookeeper - com.101tec zkclient @@ -76,5 +59,15 @@ org.slf4j slf4j-api + + org.apache.commons + commons-lang3 + 3.4 + + + io.netty + netty-all + 4.0.35.Final + \ No newline at end of file diff --git a/dubbo-maven/pom.xml b/dubbo-maven/pom.xml index 9290eca21fc..b58a3921370 100644 --- a/dubbo-maven/pom.xml +++ b/dubbo-maven/pom.xml @@ -219,6 +219,12 @@ 1.2.2 provided + + org.apache.commons + commons-lang3 + 3.4 + provided + diff --git a/dubbo-plugin/dubbo-qos/pom.xml b/dubbo-plugin/dubbo-qos/pom.xml index ea6414d49ba..fb8fb8253cc 100644 --- a/dubbo-plugin/dubbo-qos/pom.xml +++ b/dubbo-plugin/dubbo-qos/pom.xml @@ -37,7 +37,6 @@ io.netty netty-all - 4.0.35.Final com.alibaba diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/BaseCommand.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java similarity index 83% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/BaseCommand.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java index bdf84d758de..f928ec4701c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/BaseCommand.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; import com.alibaba.dubbo.common.extension.SPI; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContext.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java similarity index 97% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContext.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java index c70739b1e4c..470455f174e 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContext.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; import io.netty.channel.Channel; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContextFactory.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java similarity index 90% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContextFactory.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java index 19859f08191..e905845117e 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandContextFactory.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandExecutor.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java similarity index 89% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandExecutor.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java index 775c47b105a..1f0ea5a8589 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandExecutor.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Help.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Help.java similarity index 89% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Help.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Help.java index 42620b59350..e027eefabc4 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Help.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Help.java @@ -1,10 +1,10 @@ -package com.alibaba.qos.command.CommandImpl; +package com.alibaba.dubbo.qos.command.CommandImpl; -import com.alibaba.qos.command.BaseCommand; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.annotation.Cmd; -import com.alibaba.qos.command.util.CommandHelper; -import com.alibaba.qos.textui.TTable; +import com.alibaba.dubbo.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.annotation.Cmd; +import com.alibaba.dubbo.qos.command.util.CommandHelper; +import com.alibaba.dubbo.qos.textui.TTable; import java.util.Collections; import java.util.Comparator; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Ls.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Ls.java similarity index 93% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Ls.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Ls.java index c9be340cb0f..a44456cb956 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Ls.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Ls.java @@ -1,15 +1,15 @@ -package com.alibaba.qos.command.CommandImpl; +package com.alibaba.dubbo.qos.command.CommandImpl; import com.alibaba.dubbo.config.model.ApplicationModel; import com.alibaba.dubbo.config.model.ConsumerModel; import com.alibaba.dubbo.config.model.ProviderModel; +import com.alibaba.dubbo.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.annotation.Cmd; +import com.alibaba.dubbo.qos.textui.TTable; import com.alibaba.dubbo.registry.support.ConsumerInvokerWrapper; import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; -import com.alibaba.qos.command.BaseCommand; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.annotation.Cmd; -import com.alibaba.qos.textui.TTable; import java.util.Collection; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Offline.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Offline.java similarity index 91% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Offline.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Offline.java index c48d1eb04ae..4ea6604f6f1 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Offline.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Offline.java @@ -1,17 +1,17 @@ -package com.alibaba.qos.command.CommandImpl; +package com.alibaba.dubbo.qos.command.CommandImpl; import com.alibaba.dubbo.common.extension.ExtensionLoader; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.config.model.ApplicationModel; import com.alibaba.dubbo.config.model.ProviderModel; +import com.alibaba.dubbo.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.annotation.Cmd; import com.alibaba.dubbo.registry.Registry; import com.alibaba.dubbo.registry.RegistryFactory; import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; -import com.alibaba.qos.command.BaseCommand; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.annotation.Cmd; import java.util.List; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Online.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Online.java similarity index 91% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Online.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Online.java index a31f8d50baf..1870c4228c4 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Online.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Online.java @@ -1,17 +1,17 @@ -package com.alibaba.qos.command.CommandImpl; +package com.alibaba.dubbo.qos.command.CommandImpl; import com.alibaba.dubbo.common.extension.ExtensionLoader; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.config.model.ApplicationModel; import com.alibaba.dubbo.config.model.ProviderModel; +import com.alibaba.dubbo.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.annotation.Cmd; import com.alibaba.dubbo.registry.Registry; import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; -import com.alibaba.qos.command.BaseCommand; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.annotation.Cmd; +import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; import java.util.List; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Quit.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Quit.java similarity index 51% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Quit.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Quit.java index 6dbebf6a2e1..3385e0190e6 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/CommandImpl/Quit.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandImpl/Quit.java @@ -1,9 +1,9 @@ -package com.alibaba.qos.command.CommandImpl; +package com.alibaba.dubbo.qos.command.CommandImpl; -import com.alibaba.qos.command.BaseCommand; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.annotation.Cmd; -import com.alibaba.qos.common.Constants; +import com.alibaba.dubbo.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.annotation.Cmd; +import com.alibaba.dubbo.qos.common.Constants; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/DefaultCommandExecutor.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java similarity index 94% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/DefaultCommandExecutor.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java index 93c65957397..994f77409d3 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/DefaultCommandExecutor.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; import com.alibaba.dubbo.common.extension.ExtensionLoader; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/NoSuchCommandException.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java similarity index 84% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/NoSuchCommandException.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java index 2d94dd213c1..f4a6224bd85 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/NoSuchCommandException.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command; +package com.alibaba.dubbo.qos.command; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/annotation/Cmd.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java similarity index 93% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/annotation/Cmd.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java index b38ede7e6c9..a523ce2e394 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/annotation/Cmd.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.command.annotation; +package com.alibaba.dubbo.qos.command.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/HttpCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java similarity index 94% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/HttpCommandDecoder.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java index 460a17e3d31..f6a4c496207 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/HttpCommandDecoder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java @@ -1,7 +1,8 @@ -package com.alibaba.qos.command.decoder; +package com.alibaba.dubbo.qos.command.decoder; + +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.CommandContextFactory; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.CommandContextFactory; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.QueryStringDecoder; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/TelnetCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java similarity index 82% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/TelnetCommandDecoder.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java index 3d7dec20287..368c233977c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/decoder/TelnetCommandDecoder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java @@ -1,7 +1,8 @@ -package com.alibaba.qos.command.decoder; +package com.alibaba.dubbo.qos.command.decoder; + +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.CommandContextFactory; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.CommandContextFactory; import org.apache.commons.lang3.StringUtils; /** diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/util/CommandHelper.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java similarity index 93% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/util/CommandHelper.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java index 3edb45f6c0c..c5c11cce509 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/command/util/CommandHelper.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java @@ -1,7 +1,7 @@ -package com.alibaba.qos.command.util; +package com.alibaba.dubbo.qos.command.util; import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.qos.command.BaseCommand; +import com.alibaba.dubbo.qos.command.BaseCommand; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/common/Constants.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/Constants.java similarity index 90% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/common/Constants.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/Constants.java index 96e356b79f3..9eabef1c008 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/common/Constants.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/Constants.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.common; +package com.alibaba.dubbo.qos.common; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/DubboLogo.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java similarity index 97% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/DubboLogo.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java index 8f2abc324fd..de67b8f50d7 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/DubboLogo.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.server; +package com.alibaba.dubbo.qos.server; /** * @author qinliujie diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/Server.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java similarity index 95% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/Server.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java index 2193ada733b..a49c1724cb6 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/Server.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java @@ -1,10 +1,11 @@ -package com.alibaba.qos.server; +package com.alibaba.dubbo.qos.server; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.qos.common.Constants; -import com.alibaba.qos.server.handler.QosProcessHandler; +import com.alibaba.dubbo.qos.common.Constants; +import com.alibaba.dubbo.qos.server.handler.QosProcessHandler; + import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/HttpProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java similarity index 92% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/HttpProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java index 407a26ef5e4..bc20c384226 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/HttpProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java @@ -1,12 +1,13 @@ -package com.alibaba.qos.server.handler; +package com.alibaba.dubbo.qos.server.handler; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.CommandExecutor; -import com.alibaba.qos.command.DefaultCommandExecutor; -import com.alibaba.qos.command.NoSuchCommandException; -import com.alibaba.qos.command.decoder.HttpCommandDecoder; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.CommandExecutor; +import com.alibaba.dubbo.qos.command.DefaultCommandExecutor; +import com.alibaba.dubbo.qos.command.NoSuchCommandException; +import com.alibaba.dubbo.qos.command.decoder.HttpCommandDecoder; + import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/LocalHostPermitHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java similarity index 92% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/LocalHostPermitHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java index 77f292b4b79..26918a2df09 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/LocalHostPermitHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java @@ -1,11 +1,12 @@ /** * */ -package com.alibaba.qos.server.handler; +package com.alibaba.dubbo.qos.server.handler; import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.qos.common.Constants; +import com.alibaba.dubbo.qos.common.Constants; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/QosProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/QosProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java index 20fb963e754..d8fc3ea748c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/QosProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.server.handler; +package com.alibaba.dubbo.qos.server.handler; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/TelnetProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java similarity index 84% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/TelnetProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java index ba4954d0892..3603834c55b 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/server/handler/TelnetProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java @@ -1,14 +1,15 @@ -package com.alibaba.qos.server.handler; +package com.alibaba.dubbo.qos.server.handler; import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.qos.command.CommandContext; -import com.alibaba.qos.command.CommandExecutor; -import com.alibaba.qos.command.DefaultCommandExecutor; -import com.alibaba.qos.command.NoSuchCommandException; -import com.alibaba.qos.command.decoder.TelnetCommandDecoder; -import com.alibaba.qos.common.Constants; +import com.alibaba.dubbo.qos.command.CommandContext; +import com.alibaba.dubbo.qos.command.CommandExecutor; +import com.alibaba.dubbo.qos.command.DefaultCommandExecutor; +import com.alibaba.dubbo.qos.command.NoSuchCommandException; +import com.alibaba.dubbo.qos.command.decoder.TelnetCommandDecoder; +import com.alibaba.dubbo.qos.common.Constants; + import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TComponent.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java similarity index 82% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TComponent.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java index 38f275475d9..3168e803dc8 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TComponent.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; /** * 命令行控件
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TKv.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TKv.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java index 915a76ffd43..38cd9f791c0 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TKv.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; import org.apache.commons.lang3.StringUtils; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TLadder.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java similarity index 97% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TLadder.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java index 7c77bf47217..7fd7b36f6e9 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TLadder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTable.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java similarity index 99% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTable.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java index 798fb6fd7cd..0c113ee0b01 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTable.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; import org.apache.commons.lang3.StringUtils; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTree.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java similarity index 99% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTree.java rename to dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java index b94d2ef69db..0e81254216c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/qos/textui/TTree.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; import org.apache.commons.lang3.StringUtils; diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand new file mode 100644 index 00000000000..2737e485ca9 --- /dev/null +++ b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand @@ -0,0 +1,5 @@ +online=com.alibaba.dubbo.qos.command.CommandImpl.Online +help=com.alibaba.dubbo.qos.command.CommandImpl.Help +quit=com.alibaba.dubbo.qos.command.CommandImpl.Quit +ls=com.alibaba.dubbo.qos.command.CommandImpl.Ls +offline=com.alibaba.dubbo.qos.command.CommandImpl.Offline \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.qos.command.BaseCommand b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.qos.command.BaseCommand deleted file mode 100644 index 8b7d80aa4f2..00000000000 --- a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.qos.command.BaseCommand +++ /dev/null @@ -1,5 +0,0 @@ -online=com.alibaba.qos.command.CommandImpl.Online -help=com.alibaba.qos.command.CommandImpl.Help -quit=com.alibaba.qos.command.CommandImpl.Quit -ls=com.alibaba.qos.command.CommandImpl.Ls -offline=com.alibaba.qos.command.CommandImpl.Offline \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/qos/textui/TKvTest.java b/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java similarity index 94% rename from dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/qos/textui/TKvTest.java rename to dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java index f00ba87ecb0..e016b473c11 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/qos/textui/TKvTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java @@ -1,4 +1,4 @@ -package com.alibaba.qos.textui; +package com.alibaba.dubbo.qos.textui; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml index 1f86bad1d20..f4b5e4dd9f3 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml @@ -27,7 +27,6 @@ io.netty netty-all - 4.0.35.Final diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java index a40ae4772fe..126f54de8e4 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java @@ -38,7 +38,7 @@ public class ProtocolListenerWrapper implements Protocol { static { try { - Class serverClass = Protocol.class.getClassLoader().loadClass("com.alibaba.qos.server.Server"); + Class serverClass = Protocol.class.getClassLoader().loadClass("com.alibaba.dubbo.qos.server.Server"); Method serverGetInstanceMethod = serverClass.getMethod("getInstance"); Object serverInstance = serverGetInstanceMethod.invoke(null); Method startMethod = serverClass.getMethod("start"); diff --git a/dubbo/pom.xml b/dubbo/pom.xml index 50336127672..7479822b5fa 100644 --- a/dubbo/pom.xml +++ b/dubbo/pom.xml @@ -263,6 +263,21 @@ + + com.alibaba + dubbo-qos + ${project.parent.version} + + + org.apache.commons + commons-lang3 + + + io.netty + netty-all + + + @@ -352,6 +367,7 @@ com.alibaba:dubbo-container-jetty com.alibaba:dubbo-container-log4j com.alibaba:dubbo-container-logback + com.alibaba:dubbo-qos @@ -500,6 +516,11 @@ META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter + + META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand + + diff --git a/pom.xml b/pom.xml index a6de012d27d..6084e323190 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,7 @@ 4.3.10.RELEASE 3.20.0-GA 3.2.5.Final + 4.0.35.Final 1.1.7 2.1.4 4.5.3 @@ -167,6 +168,11 @@ netty ${netty_version} + + io.netty + netty-all + ${netty4_version} + org.apache.mina mina-core