You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2018/05/17 05:03:22 UTC
[GitHub] chickenlj closed pull request #1570: [Dubbo-fixed annotation demo
fail to start].
chickenlj closed pull request #1570: [Dubbo-fixed annotation demo fail to start].
URL: https://github.com/apache/incubator-dubbo/pull/1570
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 971ab422bd..84a1df7178 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 4f5d520118..e705925205 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 042da5e509..af6094163a 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 0c14b04a23..4cd684ce7c 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 ac5c318fba..cd5990db64 100644
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@ -182,6 +182,30 @@ limitations under the License.
<artifactId>hessian-lite</artifactId>
<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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org