diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java index 971ab422bdf..84a1df71789 100644 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java +++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception { } @Configuration - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.action", multipleConfig = true) + @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.action") @PropertySource("classpath:/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties") @ComponentScan(value = {"com.alibaba.dubbo.examples.annotation.action"}) static public class ConsumerConfiguration { diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java index 4f5d5201181..e7059252050 100644 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java +++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java @@ -36,14 +36,13 @@ public static void main(String[] args) throws Exception { } @Configuration - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.impl", multipleConfig = true) + @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.impl") @PropertySource("classpath:/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties") -// @ComponentScan(value = {"com.alibaba.dubbo.examples.annotation.impl"}) static public class ProviderConfiguration { @Bean public ProviderConfig providerConfig() { ProviderConfig providerConfig = new ProviderConfig(); - providerConfig.setTimeout(1000); + providerConfig.setTimeout(5000); return providerConfig; } } diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties index 042da5e5092..af6094163ae 100644 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties +++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties @@ -1,5 +1,3 @@ -# -dubbo.application.application-id.name=annotation-consumer -# -dubbo.registry.registry-id.address=zookeeper://127.0.0.1:2181 +dubbo.application.name=annotation-consumer +dubbo.registry.address=multicast://224.5.6.7:1234 dubbo.consumer.consumer-id.timeout=3000 \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties index 0c14b04a235..4cd684ce7c1 100644 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties +++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties @@ -1,7 +1,4 @@ -# -dubbo.application.application-id.name=xxx -# -dubbo.registry.registry-id.address=zookeeper://127.0.0.1:2181 -# +dubbo.application.name=xxx +dubbo.registry.address=multicast://224.5.6.7:1234 dubbo.protocol.protocol-id.name=dubbo dubbo.protocol.protocol-id.port=20883 \ No newline at end of file diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index ac5c318fba8..cd5990db64c 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -182,6 +182,30 @@ limitations under the License. hessian-lite 3.2.2 + + com.alibaba + dubbo-serialization-api + + + com.alibaba + dubbo-serialization-hessian2 + + + com.alibaba + dubbo-serialization-fst + + + com.alibaba + dubbo-serialization-fastjson + + + com.alibaba + dubbo-serialization-kryo + + + com.alibaba + dubbo-serialization-jdk + org.hibernate hibernate-validator