Merge pull request #1570, fix annotation demo in dubbo-test.
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 971ab42..84a1df7 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 @@
}
@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 4f5d520..e705925 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 @@
}
@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 042da5e..af60941 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 name="annotation-consumer"/>
-dubbo.application.application-id.name=annotation-consumer
-#<dubbo:registry id="registry-id" address="multicast://224.5.6.7:1234"/>
-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 0c14b04..4cd684c 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 id="application-id" name="dubbo-annotation-provider"/>
-dubbo.application.application-id.name=xxx
-#<dubbo:registry id="registry-id" address="multicast://224.5.6.7:1234"/>
-dubbo.registry.registry-id.address=zookeeper://127.0.0.1:2181
-#<dubbo:protocol id="protocol-id" name="dubbo" port="12345"/>
+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 7bab0f5..371e315 100644
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@ -183,6 +183,30 @@
<version>3.2.2</version>
</dependency>
<dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-hessian2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-fst</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-fastjson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-kryo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-jdk</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
