fix: examples errors (#787)

Signed-off-by: seeflood <[email protected]>
mosn · Sep 14, 2022 · 5f65f47 · 5f65f47
1 parent 767f58f
commit 5f65f47
Show file tree

Hide file tree

Showing 39 changed files with 58 additions and 58 deletions.
diff --git a/configs/config.json b/configs/config.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_apollo.json b/configs/config_apollo.json
@@ -29,7 +29,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_consul.json b/configs/config_consul.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_file.json b/configs/config_file.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_file_qiniu_oss.json b/configs/config_file_qiniu_oss.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_file_tencentcloud_oss.json b/configs/config_file_tencentcloud_oss.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_mongo.json b/configs/config_mongo.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_redis.json b/configs/config_redis.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_standalone.json b/configs/config_standalone.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_trace_jaeger.json b/configs/config_trace_jaeger.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_trace_skywalking.json b/configs/config_trace_skywalking.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_trace_zipkin.json b/configs/config_trace_zipkin.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/config_zookeeper.json b/configs/config_zookeeper.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/configs/runtime_config.json b/configs/runtime_config.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/demo/flowcontrol/client.go b/demo/flowcontrol/client.go
@@ -36,7 +36,7 @@ func main() {
 
 	for i := 0; i < 10; i++ {
 		r, err := c.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
-			ServiceName: "quick_start_demo",
+			ServiceName: "helloworld",
 		})
 		if err != nil {
 			fmt.Println("get an error: ", err)

diff --git a/demo/lifecycle/common/client.go b/demo/lifecycle/common/client.go
@@ -17,7 +17,7 @@ func main() {
 	// 1. invoke sayHello API
 	client := runtimev1pb.NewRuntimeClient(conn)
 	hello, err := client.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
-		ServiceName: "quick_start_demo",
+		ServiceName: "helloworld",
 		Name:        "eva",
 	})
 	if err != nil {
@@ -36,7 +36,7 @@ func main() {
 	metaData["hello"] = "goodbye"
 	req := &runtimev1pb.DynamicConfiguration{ComponentConfig: &runtimev1pb.ComponentConfig{
 		Kind:     "hellos",
-		Name:     "quick_start_demo",
+		Name:     "helloworld",
 		Metadata: metaData,
 	}}
 	_, err = c.ApplyConfiguration(context.Background(), req)
@@ -46,7 +46,7 @@ func main() {
 	// 3. invoke sayHello API again
 	client = runtimev1pb.NewRuntimeClient(conn)
 	hello, err = client.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
-		ServiceName: "quick_start_demo",
+		ServiceName: "helloworld",
 		Name:        "eva",
 	})
 	if err != nil {

diff --git a/deploy/k8s/sidecar/default_quickstart_counter.yaml b/deploy/k8s/sidecar/default_quickstart_counter.yaml
@@ -28,7 +28,7 @@ data:
                         "server_name": "runtime",
                         "grpc_config": {
                           "hellos": {
-                            "quick_start_demo": {
+                            "helloworld": {
                               "type": "helloworld",
                               "hello": "greeting"
                             }

diff --git a/deploy/k8s/standalone/default_configmap.yaml b/deploy/k8s/standalone/default_configmap.yaml
@@ -28,7 +28,7 @@ data:
                         "server_name": "runtime",
                         "grpc_config": {
                           "hellos": {
-                            "quick_start_demo": {
+                            "helloworld": {
                               "type": "helloworld",
                               "hello": "greeting"
                             }

diff --git a/deploy/k8s/standalone/default_quickstart.yaml b/deploy/k8s/standalone/default_quickstart.yaml
@@ -28,7 +28,7 @@ data:
                         "server_name": "runtime",
                         "grpc_config": {
                           "hellos": {
-                            "quick_start_demo": {
+                            "helloworld": {
                               "type": "helloworld",
                               "hello": "greeting"
                             }

diff --git a/docker/layotto-etcd/etcd_config.json b/docker/layotto-etcd/etcd_config.json
@@ -17,7 +17,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/docker/layotto-minio/config_minio.json b/docker/layotto-minio/config_minio.json
@@ -17,7 +17,7 @@
                       "server_name": "runtime",
                       "grpc_config": {
                         "hellos": {
-                          "quick_start_demo": {
+                          "helloworld": {
                             "type": "helloworld",
                             "hello": "greeting"
                           }

diff --git a/docker/layotto-redis/config_redis.json b/docker/layotto-redis/config_redis.json
@@ -22,7 +22,7 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "quick_start_demo": {
+                        "helloworld": {
                           "type": "helloworld",
                           "hello": "greeting"
                         }

diff --git a/docs/en/start/email/start.md b/docs/en/start/email/start.md
@@ -71,15 +71,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-email/target/examples-email-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-email/target/examples-email-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-email/pom.xml clean package
 ```
 
 Run it:
 
 ```shell
-java -jar examples-email/target/examples-email-1.1.0-jar-with-dependencies.jar
+java -jar examples-email/target/examples-email-jar-with-dependencies.jar
 ```
 
 If the following information is printed, the demo is successful:

diff --git a/docs/en/start/lifecycle/start.md b/docs/en/start/lifecycle/start.md
@@ -76,7 +76,7 @@ TODO
 
 [comment]: <> (Build the demo:)
 
-[comment]: <> (```shell @if.not.exist examples-lifecycle/target/examples-lifecycle-1.1.0-jar-with-dependencies.jar)
+[comment]: <> (```shell @if.not.exist examples-lifecycle/target/examples-lifecycle-jar-with-dependencies.jar)
 
 [comment]: <> (# build example jar)
 
@@ -88,7 +88,7 @@ TODO
 
 [comment]: <> (```shell)
 
-[comment]: <> (java -jar examples-lifecycle/target/examples-lifecycle-1.1.0-jar-with-dependencies.jar)
+[comment]: <> (java -jar examples-lifecycle/target/examples-lifecycle-jar-with-dependencies.jar)
 
 [comment]: <> (```)
 

diff --git a/docs/en/start/oss/start.md b/docs/en/start/oss/start.md
@@ -100,15 +100,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-oss/target/examples-oss-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-oss/target/examples-oss-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-oss/pom.xml clean package
 ```
 
 Run it:
 
 ```shell
-java -jar examples-oss/target/examples-oss-1.1.0-jar-with-dependencies.jar
+java -jar examples-oss/target/examples-oss-jar-with-dependencies.jar
 ```
 
 If the following information is printed, the demo is successful:

diff --git a/docs/en/start/phone/start.md b/docs/en/start/phone/start.md
@@ -71,15 +71,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-phone/target/examples-phone-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-phone/target/examples-phone-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-phone/pom.xml clean package
 ```
 
 Run it:
 
 ```shell
-java -jar examples-phone/target/examples-phone-1.1.0-jar-with-dependencies.jar
+java -jar examples-phone/target/examples-phone-jar-with-dependencies.jar
 ```
 
 If the following information is printed, the demo is successful:

diff --git a/docs/en/start/pubsub/start.md b/docs/en/start/pubsub/start.md
@@ -47,7 +47,7 @@ Build and run it:
 # build example jar
 mvn -f examples-pubsub-subscriber/pom.xml clean package
 # run the example
-java -jar examples-pubsub-subscriber/target/examples-pubsub-subscriber-1.1.0-jar-with-dependencies.jar
+java -jar examples-pubsub-subscriber/target/examples-pubsub-subscriber-jar-with-dependencies.jar
 ```
 
 <!-- tabs:end -->
@@ -145,7 +145,7 @@ cd java-sdk
 
 Build:
 
-```shell @if.not.exist examples-pubsub-publisher/target/examples-pubsub-publisher-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-pubsub-publisher/target/examples-pubsub-publisher-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-pubsub-publisher/pom.xml clean package
 ```
@@ -154,7 +154,7 @@ Run it:
 
 ```shell
 # run the example
-java -jar examples-pubsub-publisher/target/examples-pubsub-publisher-1.1.0-jar-with-dependencies.jar
+java -jar examples-pubsub-publisher/target/examples-pubsub-publisher-jar-with-dependencies.jar
 ```
 
 <!-- tabs:end -->

diff --git a/docs/en/start/sequencer/start.md b/docs/en/start/sequencer/start.md
@@ -104,15 +104,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-sequencer/target/examples-sequencer-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-sequencer/target/examples-sequencer-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-sequencer/pom.xml clean package
 ```
 
 Run it:
 
 ```shell
-java -jar examples-sequencer/target/examples-sequencer-1.1.0-jar-with-dependencies.jar
+java -jar examples-sequencer/target/examples-sequencer-jar-with-dependencies.jar
 ```
 
 If the following information is printed, the demo is successful:

diff --git a/docs/en/start/state/start.md b/docs/en/start/state/start.md
@@ -127,15 +127,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-state/target/examples-state-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-state/target/examples-state-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-state/pom.xml clean package
 ```
 
 Run it:
 
 ```
-java -jar examples-state/target/examples-state-1.1.0-jar-with-dependencies.jar
+java -jar examples-state/target/examples-state-jar-with-dependencies.jar
 ```
 
 The demo will print the following message:

diff --git a/docs/template/quickstart.tmpl b/docs/template/quickstart.tmpl
@@ -71,15 +71,15 @@ cd java-sdk
 
 Build the demo:
 
-```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-{{$file_name}}/pom.xml clean package
 ```
 
 Run it:
 
 ```shell
-java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
+java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
 ```
 
 If the following information is printed, the demo is successful:

diff --git a/docs/template/quickstart_zh.tmpl b/docs/template/quickstart_zh.tmpl
@@ -71,15 +71,15 @@ cd java-sdk
 
 构建 examples:
 
-```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
+```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
 # build example jar
 mvn -f examples-{{$file_name}}/pom.xml clean package
 ```
 
 运行:
 
 ```shell
-java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
+java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
 ```
 
 打印出以下信息说明运行成功:

diff --git a/docs/zh/design/actuator/grpc-design-doc.md b/docs/zh/design/actuator/grpc-design-doc.md
@@ -72,7 +72,7 @@ func MyFunc(_ json.RawMessage) *grpc.Server {
 									"server_name":"runtime",
 									"grpc_config": {
 										"hellos": {
-											"quick_start_demo": {
+											"helloworld": {
                                                 "type": "helloworld",
 												"hello": "greeting"
 											}