diff --git a/dubbo-config/src/test/resources/simple_consumer.xml b/dubbo-config/src/test/resources/simple_consumer.xml index efdd984c16..2bb8bc10bb 100644 --- a/dubbo-config/src/test/resources/simple_consumer.xml +++ b/dubbo-config/src/test/resources/simple_consumer.xml @@ -20,9 +20,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + - + diff --git a/dubbo-config/src/test/resources/simple_provider.xml b/dubbo-config/src/test/resources/simple_provider.xml index 3f9d2d2583..02c8468e6c 100644 --- a/dubbo-config/src/test/resources/simple_provider.xml +++ b/dubbo-config/src/test/resources/simple_provider.xml @@ -20,11 +20,11 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + - + - + diff --git a/dubbo-registry-multicast/pom.xml b/dubbo-registry-multicast/pom.xml new file mode 100644 index 0000000000..1ba53d0413 --- /dev/null +++ b/dubbo-registry-multicast/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-multicast + jar + Dubbo Multicast Registry Module + The multicast registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + \ No newline at end of file diff --git a/dubbo-registry-zookeeper/pom.xml b/dubbo-registry-zookeeper/pom.xml new file mode 100644 index 0000000000..f4b68ee996 --- /dev/null +++ b/dubbo-registry-zookeeper/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-zookeeper + jar + Dubbo Zookeeper Registry Module + The zookeeper registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + org.apache.zookeeper + zookeeper + 3.3.3 + + + \ No newline at end of file diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index ea5694bc3d..73b3183a80 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -31,5 +31,10 @@ dubbo-cluster ${project.parent.version} + + org.apache.zookeeper + zookeeper + 3.3.3 + \ No newline at end of file diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/SimpleRegistryService.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/SimpleRegistryService.java index 9aa37d76db..e6a6946aa5 100644 --- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/SimpleRegistryService.java +++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/support/SimpleRegistryService.java @@ -25,6 +25,7 @@ import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubbo.common.utils.NetUtils; import com.alibaba.dubbo.registry.NotifyListener; +import com.alibaba.dubbo.registry.RegistryService; import com.alibaba.dubbo.rpc.RpcContext; /** @@ -73,7 +74,7 @@ public class SimpleRegistryService extends AbstractRegistryService { logger.info("[subscribe] service: "+service + ",client:"+ client); } List urls = getRegistered().get(service); - if ((com.alibaba.dubbo.registry.RegistryService.class.getName() + ":0.0.0").equals(service) + if ((RegistryService.class.getName() + ":0.0.0").equals(service) && (urls == null || urls.size() == 0)) { register(service, new URL("dubbo", NetUtils.getLocalHost(), diff --git a/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-grizzly/pom.xml new file mode 100644 index 0000000000..1ba53d0413 --- /dev/null +++ b/dubbo-remoting-grizzly/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-multicast + jar + Dubbo Multicast Registry Module + The multicast registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + \ No newline at end of file diff --git a/dubbo-remoting-mina/pom.xml b/dubbo-remoting-mina/pom.xml new file mode 100644 index 0000000000..1ba53d0413 --- /dev/null +++ b/dubbo-remoting-mina/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-multicast + jar + Dubbo Multicast Registry Module + The multicast registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + \ No newline at end of file diff --git a/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-hessian/pom.xml new file mode 100644 index 0000000000..1ba53d0413 --- /dev/null +++ b/dubbo-rpc-hessian/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-multicast + jar + Dubbo Multicast Registry Module + The multicast registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + \ No newline at end of file diff --git a/dubbo-rpc-rmi/pom.xml b/dubbo-rpc-rmi/pom.xml new file mode 100644 index 0000000000..1ba53d0413 --- /dev/null +++ b/dubbo-rpc-rmi/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.alibaba + dubbo-parent + 2.0.8-SNAPSHOT + + dubbo-registry-multicast + jar + Dubbo Multicast Registry Module + The multicast registry module of dubbo project + + + com.alibaba + dubbo-registry + ${project.parent.version} + + + \ No newline at end of file diff --git a/dubbo/pom.xml b/dubbo/pom.xml index 4963508b01..070efed0a5 100644 --- a/dubbo/pom.xml +++ b/dubbo/pom.xml @@ -58,12 +58,18 @@ true - com.alibaba:hessian.lite + com.alibaba:hessian.lite com.alibaba:dubbo-common com.alibaba:dubbo-remoting + com.alibaba:dubbo-remoting-mina + com.alibaba:dubbo-remoting-grizzly com.alibaba:dubbo-rpc + com.alibaba:dubbo-rpc-rmi + com.alibaba:dubbo-rpc-hessian com.alibaba:dubbo-cluster com.alibaba:dubbo-registry + com.alibaba:dubbo-registry-multicast + com.alibaba:dubbo-registry-zookeeper com.alibaba:dubbo-monitor com.alibaba:dubbo-config com.alibaba:dubbo-container diff --git a/pom.xml b/pom.xml index 1fefcf6af3..cf18fec4d6 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,15 @@ dubbo-common dubbo-remoting + dubbo-remoting-mina + dubbo-remoting-grizzly dubbo-rpc + dubbo-rpc-rmi + dubbo-rpc-hessian dubbo-cluster dubbo-registry + dubbo-registry-multicast + dubbo-registry-zookeeper dubbo-monitor dubbo-config dubbo-container @@ -48,6 +54,7 @@ 1.4.1 1.1.6 3.1 + 3.3.3 1.2.16 1.6.2 @@ -112,6 +119,11 @@ bsf-api ${bsf_version} + + org.apache.zookeeper + zookeeper + ${zookeeper_version} + log4j