You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by vi...@apache.org on 2019/01/03 11:25:21 UTC
[incubator-dubbo-samples] 02/03: remove RegistryDataConfig
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch samples-for-2.7.0-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git
commit 5f1e43a16b0cfbfc00de557c930f9a2a516468d7
Author: cvictory <sh...@gmail.com>
AuthorDate: Thu Jan 3 19:23:08 2019 +0800
remove RegistryDataConfig
---
.../SimpleRegistryAnnotationConsumer.java | 16 +-
.../SimpleRegistryAnnotationProvider.java | 13 +-
.../resources/spring/dubbo-consumer.properties | 1 -
.../resources/spring/dubbo-provider.properties | 1 -
.../pom.xml | 11 +-
.../registry/nosimple/EmbeddedZooKeeper.java | 250 +++++++++++++++++++++
.../SimpleRegistryPropertiesConsumer.java} | 53 ++---
.../SimpleRegistryPropertiesProvider.java} | 43 +---
.../simplified/registry/nosimple/ZKClean.java | 45 ++++
.../simplified/registry/nosimple/ZkUtil.java | 47 ++++
.../registry/nosimple/api/DemoService.java | 26 +++
.../registry/nosimple/impl/DemoServiceImpl.java | 38 ++++
.../META-INF/spring/simplified-consumer.xml | 4 +-
.../META-INF/spring/simplified-provider.xml | 5 +-
.../src/main/resources/dubbo.properties | 7 +-
.../src/main/resources/log4j.properties} | 12 +-
.../META-INF/spring/simplified-consumer.xml | 2 +-
.../META-INF/spring/simplified-provider.xml | 2 +-
.../src/main/resources/dubbo.properties | 5 -
dubbo-samples-simplified-registry/pom.xml | 1 +
20 files changed, 465 insertions(+), 117 deletions(-)
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java
index ccff65a..99d1010 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java
@@ -22,7 +22,7 @@ package org.apache.dubbo.samples.simplified.annotation;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.config.RegistryDataConfig;
+import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
@@ -59,11 +59,11 @@ public class SimpleRegistryAnnotationConsumer {
@ComponentScan(value = {"org.apache.dubbo.samples.simplified.annotation.action"})
static public class ConsumerConfiguration {
@Bean
- public RegistryDataConfig registryDataConfig() {
- RegistryDataConfig registryDataConfig = new RegistryDataConfig();
- registryDataConfig.setExtraConsumerKeys("actives,owner");
- registryDataConfig.setSimpleConsumerConfig(true);
- return registryDataConfig;
+ public RegistryConfig registryConfig() {
+ RegistryConfig registryConfig = new RegistryConfig();
+ registryConfig.setAddress("zookeeper://127.0.0.1:2181");
+ registryConfig.setSimplified(true);
+ return registryConfig;
}
}
@@ -73,8 +73,8 @@ public class SimpleRegistryAnnotationConsumer {
System.out.println("*********************************************************");
System.out.println(urls);
System.out.println("simple donot contain 'retries':" + !urls.get(0).contains("retries"));
- System.out.println("simple contain 'owner':" + urls.get(0).contains("owner"));
- System.out.println("simple contain 'actives':" + urls.get(0).contains("actives"));
+ System.out.println("simple donot contain 'owner':" + !urls.get(0).contains("owner"));
+ System.out.println("simple donot contain 'actives':" + !urls.get(0).contains("actives"));
System.out.println("simple donot contain 'timeout':" + !urls.get(0).contains("timeout"));
System.out.println("simple contain 'application':" + urls.get(0).contains("application"));
System.out.println("simple contain 'version':" + urls.get(0).contains("version"));
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java
index 8005079..80fb1f7 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java
@@ -24,7 +24,7 @@ import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.config.ProviderConfig;
-import org.apache.dubbo.config.RegistryDataConfig;
+import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
@@ -64,11 +64,12 @@ public class SimpleRegistryAnnotationProvider {
}
@Bean
- public RegistryDataConfig registryDataConfig() {
- RegistryDataConfig registryDataConfig = new RegistryDataConfig();
- registryDataConfig.setExtraProviderKeys("retries,owner");
- registryDataConfig.setSimpleProviderConfig(true);
- return registryDataConfig;
+ public RegistryConfig registryConfig() {
+ RegistryConfig registryConfig = new RegistryConfig();
+ registryConfig.setAddress("zookeeper://127.0.0.1:2181");
+ registryConfig.setSimplified(true);
+ registryConfig.setExtraKeys("retries,owner");
+ return registryConfig;
}
}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-consumer.properties b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-consumer.properties
index 99e9a3f..cbb539f 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-consumer.properties
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-consumer.properties
@@ -16,7 +16,6 @@
# limitations under the License.
#
#
-dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.application.name=simplified-registry-annotaion-consumer
# The common part, for example registry, protocol can be stored under the global group in ConfigCenter
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-provider.properties b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-provider.properties
index b2a4532..9d0c2d2 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-provider.properties
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/resources/spring/dubbo-provider.properties
@@ -17,7 +17,6 @@
#
#
dubbo.application.name=simplified-registry-annotaion-provider
-dubbo.registry.address=zookeeper://127.0.0.1:2181
# The common part, for example registry, protocol can be stored under the global group in ConfigCenter
# The application specific part, can be stored under the app group in the ConfigCenter
diff --git a/dubbo-samples-simplified-registry/pom.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml
similarity index 85%
copy from dubbo-samples-simplified-registry/pom.xml
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml
index 8450e1e..99c8df2 100644
--- a/dubbo-samples-simplified-registry/pom.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml
@@ -25,17 +25,12 @@
<artifactId>dubbo-samples-all</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
- <modules>
- <module>dubbo-samples-simplified-registry-xml</module>
- <module>dubbo-samples-simplified-registry-annotation</module>
- <module>dubbo-samples-simplified-registry-nosimple</module>
- </modules>
-
- <artifactId>dubbo-samples-simplified-registry</artifactId>
+ <artifactId>dubbo-samples-simplified-registry-properties</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/EmbeddedZooKeeper.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/EmbeddedZooKeeper.java
new file mode 100644
index 0000000..58f12aa
--- /dev/null
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/EmbeddedZooKeeper.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.simplified.registry.nosimple;
+
+import org.apache.zookeeper.server.ServerConfig;
+import org.apache.zookeeper.server.ZooKeeperServerMain;
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.util.ErrorHandler;
+import org.springframework.util.SocketUtils;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.Properties;
+import java.util.UUID;
+
+/**
+ * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java
+ * <p>
+ * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper.
+ * <p>
+ * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for
+ * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication}
+ *
+ * @author Patrick Peralta
+ * @author Mark Fisher
+ * @author David Turanski
+ */
+public class EmbeddedZooKeeper implements SmartLifecycle {
+
+ /**
+ * Logger.
+ */
+ private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class);
+
+ /**
+ * ZooKeeper client port. This will be determined dynamically upon startup.
+ */
+ private final int clientPort;
+
+ /**
+ * Whether to auto-start. Default is true.
+ */
+ private boolean autoStartup = true;
+
+ /**
+ * Lifecycle phase. Default is 0.
+ */
+ private int phase = 0;
+
+ /**
+ * Thread for running the ZooKeeper server.
+ */
+ private volatile Thread zkServerThread;
+
+ /**
+ * ZooKeeper server.
+ */
+ private volatile ZooKeeperServerMain zkServer;
+
+ /**
+ * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread.
+ */
+ private ErrorHandler errorHandler;
+
+ private boolean daemon = true;
+
+ /**
+ * Construct an EmbeddedZooKeeper with a random port.
+ */
+ public EmbeddedZooKeeper() {
+ clientPort = SocketUtils.findAvailableTcpPort();
+ }
+
+ /**
+ * Construct an EmbeddedZooKeeper with the provided port.
+ *
+ * @param clientPort port for ZooKeeper server to bind to
+ */
+ public EmbeddedZooKeeper(int clientPort, boolean daemon) {
+ this.clientPort = clientPort;
+ this.daemon = daemon;
+ }
+
+ /**
+ * Returns the port that clients should use to connect to this embedded server.
+ *
+ * @return dynamically determined client port
+ */
+ public int getClientPort() {
+ return this.clientPort;
+ }
+
+ /**
+ * Specify whether to start automatically. Default is true.
+ *
+ * @param autoStartup whether to start automatically
+ */
+ public void setAutoStartup(boolean autoStartup) {
+ this.autoStartup = autoStartup;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isAutoStartup() {
+ return this.autoStartup;
+ }
+
+ /**
+ * Specify the lifecycle phase for the embedded server.
+ *
+ * @param phase the lifecycle phase
+ */
+ public void setPhase(int phase) {
+ this.phase = phase;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int getPhase() {
+ return this.phase;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isRunning() {
+ return (zkServerThread != null);
+ }
+
+ /**
+ * Start the ZooKeeper server in a background thread.
+ * <p>
+ * Register an error handler via {@link #setErrorHandler} in order to handle
+ * any exceptions thrown during startup or execution.
+ */
+ @Override
+ public synchronized void start() {
+ if (zkServerThread == null) {
+ zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter");
+ zkServerThread.setDaemon(daemon);
+ zkServerThread.start();
+ }
+ }
+
+ /**
+ * Shutdown the ZooKeeper server.
+ */
+ @Override
+ public synchronized void stop() {
+ if (zkServerThread != null) {
+ // The shutdown method is protected...thus this hack to invoke it.
+ // This will log an exception on shutdown; see
+ // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details.
+ try {
+ Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown");
+ shutdown.setAccessible(true);
+ shutdown.invoke(zkServer);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ // It is expected that the thread will exit after
+ // the server is shutdown; this will block until
+ // the shutdown is complete.
+ try {
+ zkServerThread.join(5000);
+ zkServerThread = null;
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ logger.warn("Interrupted while waiting for embedded ZooKeeper to exit");
+ // abandoning zk thread
+ zkServerThread = null;
+ }
+ }
+ }
+
+ /**
+ * Stop the server if running and invoke the callback when complete.
+ */
+ @Override
+ public void stop(Runnable callback) {
+ stop();
+ callback.run();
+ }
+
+ /**
+ * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none
+ * is provided, only error-level logging will occur.
+ *
+ * @param errorHandler the {@link ErrorHandler} to be invoked
+ */
+ public void setErrorHandler(ErrorHandler errorHandler) {
+ this.errorHandler = errorHandler;
+ }
+
+ /**
+ * Runnable implementation that starts the ZooKeeper server.
+ */
+ private class ServerRunnable implements Runnable {
+
+ @Override
+ public void run() {
+ try {
+ Properties properties = new Properties();
+ File file = new File(System.getProperty("java.io.tmpdir")
+ + File.separator + UUID.randomUUID());
+ file.deleteOnExit();
+ properties.setProperty("dataDir", file.getAbsolutePath());
+ properties.setProperty("clientPort", String.valueOf(clientPort));
+
+ QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
+ quorumPeerConfig.parseProperties(properties);
+
+ zkServer = new ZooKeeperServerMain();
+ ServerConfig configuration = new ServerConfig();
+ configuration.readFrom(quorumPeerConfig);
+
+ zkServer.runFromConfig(configuration);
+ } catch (Exception e) {
+ if (errorHandler != null) {
+ errorHandler.handleError(e);
+ } else {
+ logger.error("Exception running embedded ZooKeeper", e);
+ }
+ }
+ }
+ }
+
+}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesConsumer.java
similarity index 54%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesConsumer.java
index ccff65a..9d5f862 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationConsumer.java
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesConsumer.java
@@ -17,54 +17,39 @@
*
*/
-package org.apache.dubbo.samples.simplified.annotation;
+package org.apache.dubbo.samples.simplified.registry.nosimple;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.config.RegistryDataConfig;
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
-import org.apache.dubbo.samples.simplified.annotation.action.AnnotationAction;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
+import org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.List;
-/**
- * CallbackConsumer
- */
-public class SimpleRegistryAnnotationConsumer {
+public class SimpleRegistryPropertiesConsumer {
- public static void main(String[] args) throws Exception {
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
+ public static void main(String[] args) {
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"META-INF/spring/simplified-consumer.xml"});
context.start();
- final AnnotationAction annotationAction = (AnnotationAction) context.getBean("annotationAction");
- // get service data(consumer) from zookeeper.
+ DemoService demoService = (DemoService) context.getBean("demoService"); // get remote service proxy
+
printServiceData();
- String hello = annotationAction.doSayHello("world");
- System.out.println("result :" + hello);
- System.in.read();
- }
+ while (true) {
+ try {
+ Thread.sleep(1000);
+ String hello = demoService.sayHello("world"); // call remote method
+ System.out.println(hello); // get result
- @Configuration
- @EnableDubbo(scanBasePackages = "org.apache.dubbo.samples.simplified.annotation.action")
- @PropertySource("classpath:/spring/dubbo-consumer.properties")
- @ComponentScan(value = {"org.apache.dubbo.samples.simplified.annotation.action"})
- static public class ConsumerConfiguration {
- @Bean
- public RegistryDataConfig registryDataConfig() {
- RegistryDataConfig registryDataConfig = new RegistryDataConfig();
- registryDataConfig.setExtraConsumerKeys("actives,owner");
- registryDataConfig.setSimpleConsumerConfig(true);
- return registryDataConfig;
+ } catch (Throwable throwable) {
+ throwable.printStackTrace();
+ }
}
+
}
private static void printServiceData() {
@@ -73,8 +58,8 @@ public class SimpleRegistryAnnotationConsumer {
System.out.println("*********************************************************");
System.out.println(urls);
System.out.println("simple donot contain 'retries':" + !urls.get(0).contains("retries"));
- System.out.println("simple contain 'owner':" + urls.get(0).contains("owner"));
- System.out.println("simple contain 'actives':" + urls.get(0).contains("actives"));
+ System.out.println("simple donot contain 'owner':" + !urls.get(0).contains("owner"));
+ System.out.println("simple donot contain 'actives':" + !urls.get(0).contains("actives"));
System.out.println("simple donot contain 'timeout':" + !urls.get(0).contains("timeout"));
System.out.println("simple contain 'application':" + urls.get(0).contains("application"));
System.out.println("simple contain 'version':" + urls.get(0).contains("version"));
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesProvider.java
similarity index 63%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesProvider.java
index 8005079..9bd3d01 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/SimpleRegistryAnnotationProvider.java
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/SimpleRegistryPropertiesProvider.java
@@ -17,61 +17,31 @@
*
*/
-package org.apache.dubbo.samples.simplified.annotation;
-
+package org.apache.dubbo.samples.simplified.registry.nosimple;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.config.ProviderConfig;
-import org.apache.dubbo.config.RegistryDataConfig;
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.List;
-/**
- *
- */
-public class SimpleRegistryAnnotationProvider {
+public class SimpleRegistryPropertiesProvider {
public static void main(String[] args) throws Exception {
EmbeddedZooKeeper embeddedZooKeeper = new EmbeddedZooKeeper(2181, false);
embeddedZooKeeper.start();
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ProviderConfiguration.class);
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"META-INF/spring/simplified-provider.xml"});
context.start();
- // get service data(provider) from zookeeper .
+
printServiceData();
- System.in.read();
+ System.in.read(); // press any key to exit
embeddedZooKeeper.stop();
}
- @Configuration
- @EnableDubbo(scanBasePackages = "org.apache.dubbo.samples.simplified.annotation.impl")
- @PropertySource("classpath:/spring/dubbo-provider.properties")
- static public class ProviderConfiguration {
- @Bean
- public ProviderConfig providerConfig() {
- ProviderConfig providerConfig = new ProviderConfig();
- providerConfig.setTimeout(1000);
- return providerConfig;
- }
-
- @Bean
- public RegistryDataConfig registryDataConfig() {
- RegistryDataConfig registryDataConfig = new RegistryDataConfig();
- registryDataConfig.setExtraProviderKeys("retries,owner");
- registryDataConfig.setSimpleProviderConfig(true);
- return registryDataConfig;
- }
- }
-
private static void printServiceData() {
// get service data(provider) from zookeeper .
ZookeeperClient zookeeperClient = ExtensionLoader.getExtensionLoader(ZookeeperTransporter.class).getExtension("curator").connect(new URL("zookeeper", "127.0.0.1", 2181));
@@ -88,4 +58,5 @@ public class SimpleRegistryAnnotationProvider {
System.out.println("*********************************************************");
}
+
}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZKClean.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZKClean.java
new file mode 100644
index 0000000..02fe75e
--- /dev/null
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZKClean.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.simplified.registry.nosimple;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.ExponentialBackoffRetry;
+
+/**
+ *
+ */
+public class ZKClean {
+ private static CuratorFramework client;
+
+ public static void main(String[] args) throws Exception {
+ client = CuratorFrameworkFactory.newClient("127.0.0.1:2181", 60 * 1000, 60 * 1000,
+ new ExponentialBackoffRetry(1000, 3));
+ client.start();
+
+ removeGlobalConfig();
+ }
+
+ private static void removeGlobalConfig() {
+ try {
+ client.delete().forPath("/dubbo/config/dubbo/dubbo.properties");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZkUtil.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZkUtil.java
new file mode 100644
index 0000000..588202d
--- /dev/null
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/ZkUtil.java
@@ -0,0 +1,47 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.dubbo.samples.simplified.registry.nosimple;
+
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService;
+
+/**
+ * 2018/11/8
+ */
+public class ZkUtil {
+
+ private static String toRootDir() {
+ return "/dubbo";
+ }
+
+ private static String toServicePath() {
+ String name = DemoService.class.getName();
+ return toRootDir() + Constants.PATH_SEPARATOR + URL.encode(name);
+ }
+
+ private static String toCategoryPath(String side) {
+ return toServicePath() + Constants.PATH_SEPARATOR + side;
+ }
+
+ public static String toUrlPath(String side) {
+ return toCategoryPath(side);
+ }
+
+}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/api/DemoService.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/api/DemoService.java
new file mode 100644
index 0000000..d05cd84
--- /dev/null
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/api/DemoService.java
@@ -0,0 +1,26 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.dubbo.samples.simplified.registry.nosimple.api;
+
+public interface DemoService {
+
+ String sayHello(String name);
+
+}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/impl/DemoServiceImpl.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/impl/DemoServiceImpl.java
new file mode 100644
index 0000000..f5f0b18
--- /dev/null
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/java/org/apache/dubbo/samples/simplified/registry/nosimple/impl/DemoServiceImpl.java
@@ -0,0 +1,38 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.dubbo.samples.simplified.registry.nosimple.impl;
+
+
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DemoServiceImpl implements DemoService {
+
+ @Override
+ public String sayHello(String name) {
+ System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] Hello " + name + ", request from consumer: " + RpcContext
+ .getContext().getRemoteAddress());
+ return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
+ }
+
+}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-consumer.xml
similarity index 90%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-consumer.xml
index 10fa420..352179f 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-consumer.xml
@@ -25,9 +25,7 @@
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
<!-- optional -->
- <dubbo:application name="simplified-registry-xml-consumer"/>
-
- <dubbo:registry address="zookeeper://127.0.0.1:2181" username="xxx" password="yyy" check="true"/>
+ <dubbo:application name="simplified-registry-properties-consumer"/>
<dubbo:reference id="demoService" interface="org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService"
owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple"/>
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-provider.xml
similarity index 91%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-provider.xml
index 7e241f4..ca7675e 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/META-INF/spring/simplified-provider.xml
@@ -24,10 +24,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
- <!-- optional -->
- <dubbo:application name="simplified-registry-xml-provider"/>
-
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:application name="simplified-registry-properties-provider"/>
<bean id="demoService" class="org.apache.dubbo.samples.simplified.registry.nosimple.impl.DemoServiceImpl"/>
<dubbo:service async="true" interface="org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService" version="1.2.3" group="dubbo-simple"
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/dubbo.properties
similarity index 80%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/dubbo.properties
index c420ab3..58a3cd1 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/dubbo.properties
@@ -17,7 +17,6 @@
#
#
-dubbo.registryData.simpleProviderConfig=true
-dubbo.registryData.extraProviderKeys=retries,owner
-dubbo.registryData.simpleConsumerConfig=true
-dubbo.registryData.extraConsumerKeys=actives,owner
+dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.simplified=true
+dubbo.registry.extra-keys=retries,owner
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/log4j.properties
similarity index 71%
copy from dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
copy to dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/log4j.properties
index c420ab3..f30fda0 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/log4j.properties
@@ -16,8 +16,10 @@
# limitations under the License.
#
#
-
-dubbo.registryData.simpleProviderConfig=true
-dubbo.registryData.extraProviderKeys=retries,owner
-dubbo.registryData.simpleConsumerConfig=true
-dubbo.registryData.extraConsumerKeys=actives,owner
+###set log levels###
+log4j.rootLogger=info, stdout
+###output to the console###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n
\ No newline at end of file
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml
index 10fa420..f2c41bd 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-consumer.xml
@@ -27,7 +27,7 @@
<!-- optional -->
<dubbo:application name="simplified-registry-xml-consumer"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181" username="xxx" password="yyy" check="true"/>
+ <dubbo:registry address="zookeeper://127.0.0.1:2181" username="xxx" password="yyy" check="true" simplified="true"/>
<dubbo:reference id="demoService" interface="org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService"
owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple"/>
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml
index 7e241f4..dcdc8fc 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/META-INF/spring/simplified-provider.xml
@@ -27,7 +27,7 @@
<!-- optional -->
<dubbo:application name="simplified-registry-xml-provider"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://127.0.0.1:2181" simplified="true" extra-keys="retries,owner"/>
<bean id="demoService" class="org.apache.dubbo.samples.simplified.registry.nosimple.impl.DemoServiceImpl"/>
<dubbo:service async="true" interface="org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService" version="1.2.3" group="dubbo-simple"
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
index c420ab3..9410d8d 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/dubbo.properties
@@ -16,8 +16,3 @@
# limitations under the License.
#
#
-
-dubbo.registryData.simpleProviderConfig=true
-dubbo.registryData.extraProviderKeys=retries,owner
-dubbo.registryData.simpleConsumerConfig=true
-dubbo.registryData.extraConsumerKeys=actives,owner
diff --git a/dubbo-samples-simplified-registry/pom.xml b/dubbo-samples-simplified-registry/pom.xml
index 8450e1e..76b7af8 100644
--- a/dubbo-samples-simplified-registry/pom.xml
+++ b/dubbo-samples-simplified-registry/pom.xml
@@ -31,6 +31,7 @@
<modules>
<module>dubbo-samples-simplified-registry-xml</module>
+ <module>dubbo-samples-simplified-registry-properties</module>
<module>dubbo-samples-simplified-registry-annotation</module>
<module>dubbo-samples-simplified-registry-nosimple</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org