Skip to content

Commit

Permalink
Merge pull request #35 from li-shen/master
Browse files Browse the repository at this point in the history 
merge various changes
  • Loading branch information
@li-shen
li-shen committed Mar 31, 2015
2 parents 24b0b92 + 5d07ea7 commit 46aad35
Show file tree
Hide file tree
Showing 72 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion dubbo-admin/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-admin</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-cluster/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-cluster</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-common/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-common</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-config-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
View file
Expand Up @@ -45,7 +45,7 @@
import com.alibaba.dubbo.rpc.Protocol;
import com.alibaba.dubbo.rpc.ProxyFactory;
import com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory;
import com.alibaba.dubbo.rpc.protocol.ServiceClassHolder;
import com.alibaba.dubbo.rpc.ServiceClassHolder;
import com.alibaba.dubbo.rpc.service.GenericService;
import com.alibaba.dubbo.rpc.support.ProtocolUtils;

Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-spring/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-config-spring</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-config</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-javaconfig/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-javaconfig</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-jetty/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-jetty</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-log4j/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-log4j</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-logback/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-logback</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-spring/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container-spring</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-container</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-demo-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-consumer/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-demo-consumer</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-provider/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-demo-provider</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-demo</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/dubbo-filter-cache/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-filter-cache</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/dubbo-filter-validation/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-filter-validation</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-filter</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/dubbo-monitor-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-monitor-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/dubbo-monitor-default/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-monitor-default</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-monitor</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-default/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry-default</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-multicast/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry-multicast</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-redis/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry-redis</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-zookeeper/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry-zookeeper</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-registry</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-grizzly/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-grizzly</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-http/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-http</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-mina/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-mina</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-netty/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-netty</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-p2p/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-p2p</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/pom.xml
View file
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-remoting</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-api/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-rpc-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ...ubbo/rpc/protocol/ServiceClassHolder.java → ...alibaba/dubbo/rpc/ServiceClassHolder.java
View file
@@ -1,4 +1,4 @@
package com.alibaba.dubbo.rpc.protocol;
package com.alibaba.dubbo.rpc;

/**
* TODO this is just a workround for rest protocol, and now we just ensure it works in the most common dubbo usages
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-default/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-rpc-default</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-hessian/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-rpc-hessian</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-http/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-rpc-http</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-injvm/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.8.4-SNAPSHOT</version>
<version>2.8.4</version>
</parent>
<artifactId>dubbo-rpc-injvm</artifactId>
<packaging>jar</packaging>
Expand Down

0 comments on commit 46aad35

Please sign in to comment.