Refactor package name

apache · Dec 12, 2017 · 55a68a3 · 55a68a3
1 parent 05461a4
commit 55a68a3
Show file tree

Hide file tree

Showing 38 changed files with 132 additions and 109 deletions.
diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -39,23 +39,6 @@
             <artifactId>dubbo</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dubbo-qos</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.netty</groupId>
-            <artifactId>netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
@@ -76,5 +59,15 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.35.Final</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -39,23 +39,6 @@
             <artifactId>dubbo</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dubbo-qos</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.netty</groupId>
-            <artifactId>netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
@@ -76,5 +59,15 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.35.Final</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dubbo-maven/pom.xml b/dubbo-maven/pom.xml
@@ -219,6 +219,12 @@
             <version>1.2.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/dubbo-plugin/dubbo-qos/pom.xml b/dubbo-plugin/dubbo-qos/pom.xml
@@ -37,7 +37,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.0.35.Final</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

diff --git a/.../com/alibaba/qos/command/BaseCommand.java → ...libaba/dubbo/qos/command/BaseCommand.java b/.../com/alibaba/qos/command/BaseCommand.java → ...libaba/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/...m/alibaba/qos/command/CommandContext.java → ...aba/dubbo/qos/command/CommandContext.java b/...m/alibaba/qos/command/CommandContext.java → ...aba/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/...ba/qos/command/CommandContextFactory.java → ...bo/qos/command/CommandContextFactory.java b/...ba/qos/command/CommandContextFactory.java → ...bo/qos/command/CommandContextFactory.java
@@ -1,4 +1,4 @@
-package com.alibaba.qos.command;
+package com.alibaba.dubbo.qos.command;
 
 /**
  * @author qinliujie

diff --git a/.../alibaba/qos/command/CommandExecutor.java → ...ba/dubbo/qos/command/CommandExecutor.java b/.../alibaba/qos/command/CommandExecutor.java → ...ba/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/...alibaba/qos/command/CommandImpl/Help.java → ...a/dubbo/qos/command/CommandImpl/Help.java b/...alibaba/qos/command/CommandImpl/Help.java → ...a/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/...m/alibaba/qos/command/CommandImpl/Ls.java → ...aba/dubbo/qos/command/CommandImpl/Ls.java b/...m/alibaba/qos/command/CommandImpl/Ls.java → ...aba/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/...baba/qos/command/CommandImpl/Offline.java → ...ubbo/qos/command/CommandImpl/Offline.java b/...baba/qos/command/CommandImpl/Offline.java → ...ubbo/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/...ibaba/qos/command/CommandImpl/Online.java → ...dubbo/qos/command/CommandImpl/Online.java b/...ibaba/qos/command/CommandImpl/Online.java → ...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/...alibaba/qos/command/CommandImpl/Quit.java → ...a/dubbo/qos/command/CommandImpl/Quit.java b/...alibaba/qos/command/CommandImpl/Quit.java → ...a/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/...a/qos/command/DefaultCommandExecutor.java → ...o/qos/command/DefaultCommandExecutor.java b/...a/qos/command/DefaultCommandExecutor.java → ...o/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/...a/qos/command/NoSuchCommandException.java → ...o/qos/command/NoSuchCommandException.java b/...a/qos/command/NoSuchCommandException.java → ...o/qos/command/NoSuchCommandException.java
@@ -1,4 +1,4 @@
-package com.alibaba.qos.command;
+package com.alibaba.dubbo.qos.command;
 
 /**
  * @author qinliujie

diff --git a/...m/alibaba/qos/command/annotation/Cmd.java → ...aba/dubbo/qos/command/annotation/Cmd.java b/...m/alibaba/qos/command/annotation/Cmd.java → ...aba/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/...s/command/decoder/HttpCommandDecoder.java → ...s/command/decoder/HttpCommandDecoder.java b/...s/command/decoder/HttpCommandDecoder.java → ...s/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/...command/decoder/TelnetCommandDecoder.java → ...command/decoder/TelnetCommandDecoder.java b/...command/decoder/TelnetCommandDecoder.java → ...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/...ibaba/qos/command/util/CommandHelper.java → ...dubbo/qos/command/util/CommandHelper.java b/...ibaba/qos/command/util/CommandHelper.java → ...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/...ava/com/alibaba/qos/common/Constants.java → ...m/alibaba/dubbo/qos/common/Constants.java b/...ava/com/alibaba/qos/common/Constants.java → ...m/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/...ava/com/alibaba/qos/server/DubboLogo.java → ...m/alibaba/dubbo/qos/server/DubboLogo.java b/...ava/com/alibaba/qos/server/DubboLogo.java → ...m/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/...n/java/com/alibaba/qos/server/Server.java → .../com/alibaba/dubbo/qos/server/Server.java b/...n/java/com/alibaba/qos/server/Server.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/...os/server/handler/HttpProcessHandler.java → ...os/server/handler/HttpProcessHandler.java b/...os/server/handler/HttpProcessHandler.java → ...os/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/...erver/handler/LocalHostPermitHandler.java → ...erver/handler/LocalHostPermitHandler.java b/...erver/handler/LocalHostPermitHandler.java → ...erver/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/...qos/server/handler/QosProcessHandler.java → ...qos/server/handler/QosProcessHandler.java b/...qos/server/handler/QosProcessHandler.java → ...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/.../server/handler/TelnetProcessHandler.java → .../server/handler/TelnetProcessHandler.java b/.../server/handler/TelnetProcessHandler.java → .../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/...va/com/alibaba/qos/textui/TComponent.java → .../alibaba/dubbo/qos/textui/TComponent.java b/...va/com/alibaba/qos/textui/TComponent.java → .../alibaba/dubbo/qos/textui/TComponent.java
@@ -1,4 +1,4 @@
-package com.alibaba.qos.textui;
+package com.alibaba.dubbo.qos.textui;
 
 /**
  * 命令行控件<br/>

diff --git a/...main/java/com/alibaba/qos/textui/TKv.java → ...ava/com/alibaba/dubbo/qos/textui/TKv.java b/...main/java/com/alibaba/qos/textui/TKv.java → ...ava/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/.../java/com/alibaba/qos/textui/TLadder.java → ...com/alibaba/dubbo/qos/textui/TLadder.java b/.../java/com/alibaba/qos/textui/TLadder.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/...n/java/com/alibaba/qos/textui/TTable.java → .../com/alibaba/dubbo/qos/textui/TTable.java b/...n/java/com/alibaba/qos/textui/TTable.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/...in/java/com/alibaba/qos/textui/TTree.java → ...a/com/alibaba/dubbo/qos/textui/TTree.java b/...in/java/com/alibaba/qos/textui/TTree.java → ...a/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;