From f0caeb7b67a3b6ffb1ca695ce35b4c77add7357f Mon Sep 17 00:00:00 2001
From: Artur Souza <artursouza.ms@outlook.com>
Date: Tue, 15 Dec 2020 23:11:49 -0800
Subject: [PATCH] Split components dir for samples + other fixes.

---
 examples/components/{ => actors}/redis.yaml         |  0
 .../components/{ => bindings}/kafka_bindings.yaml   |  0
 .../components/{ => pubsub}/redis_messagebus.yaml   |  0
 .../components/{ => secrets}/hashicorp_vault.yaml   |  0
 examples/components/state/redis.yaml                | 13 +++++++++++++
 .../io/dapr/examples/actors/DemoActorClient.java    |  5 +++--
 .../io/dapr/examples/actors/DemoActorService.java   |  5 +++--
 .../src/main/java/io/dapr/examples/actors/README.md | 12 ++++++------
 .../examples/bindings/http/InputBindingExample.java |  5 ++---
 .../bindings/http/OutputBindingExample.java         |  2 +-
 .../java/io/dapr/examples/bindings/http/README.md   |  4 ++--
 .../java/io/dapr/examples/exception/Client.java     |  3 +--
 .../main/java/io/dapr/examples/exception/README.md  |  2 +-
 .../dapr/examples/invoke/grpc/HelloWorldClient.java |  4 ++--
 .../examples/invoke/grpc/HelloWorldService.java     |  9 ++++-----
 .../java/io/dapr/examples/invoke/grpc/README.md     |  4 ++--
 .../io/dapr/examples/invoke/http/DemoService.java   |  8 ++++----
 .../io/dapr/examples/invoke/http/InvokeClient.java  |  8 ++++----
 .../java/io/dapr/examples/invoke/http/README.md     |  4 ++--
 .../io/dapr/examples/pubsub/http/Publisher.java     |  7 ++++---
 .../java/io/dapr/examples/pubsub/http/README.md     |  4 ++--
 .../io/dapr/examples/pubsub/http/Subscriber.java    |  7 ++++---
 .../main/java/io/dapr/examples/secrets/README.md    |  4 ++--
 .../java/io/dapr/examples/secrets/SecretClient.java |  2 +-
 .../src/main/java/io/dapr/examples/state/README.md  |  2 +-
 .../java/io/dapr/examples/state/StateClient.java    |  8 ++++----
 .../java/io/dapr/examples/tracing/InvokeClient.java |  8 ++++----
 .../main/java/io/dapr/examples/tracing/README.md    |  4 ++--
 .../dapr/examples/tracing/TracingDemoService.java   |  8 ++++----
 29 files changed, 78 insertions(+), 64 deletions(-)
 rename examples/components/{ => actors}/redis.yaml (100%)
 rename examples/components/{ => bindings}/kafka_bindings.yaml (100%)
 rename examples/components/{ => pubsub}/redis_messagebus.yaml (100%)
 rename examples/components/{ => secrets}/hashicorp_vault.yaml (100%)
 create mode 100644 examples/components/state/redis.yaml

diff --git a/examples/components/redis.yaml b/examples/components/actors/redis.yaml
similarity index 100%
rename from examples/components/redis.yaml
rename to examples/components/actors/redis.yaml
diff --git a/examples/components/kafka_bindings.yaml b/examples/components/bindings/kafka_bindings.yaml
similarity index 100%
rename from examples/components/kafka_bindings.yaml
rename to examples/components/bindings/kafka_bindings.yaml
diff --git a/examples/components/redis_messagebus.yaml b/examples/components/pubsub/redis_messagebus.yaml
similarity index 100%
rename from examples/components/redis_messagebus.yaml
rename to examples/components/pubsub/redis_messagebus.yaml
diff --git a/examples/components/hashicorp_vault.yaml b/examples/components/secrets/hashicorp_vault.yaml
similarity index 100%
rename from examples/components/hashicorp_vault.yaml
rename to examples/components/secrets/hashicorp_vault.yaml
diff --git a/examples/components/state/redis.yaml b/examples/components/state/redis.yaml
new file mode 100644
index 0000000000..064922915d
--- /dev/null
+++ b/examples/components/state/redis.yaml
@@ -0,0 +1,13 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: statestore
+spec:
+  type: state.redis
+  metadata:
+  - name: redisHost
+    value: localhost:6379
+  - name: redisPassword
+    value: ""
+  - name: actorStateStore
+    value: "true"
diff --git a/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java
index e789d0cbf4..d25065f3b1 100644
--- a/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java
+++ b/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java
@@ -15,8 +15,9 @@
  * Client for Actor runtime to invoke actor methods.
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run the client:
- * dapr run --components-path ./components --app-id demoactorclient -- java -jar \
+ * 2. cd to [repo-root]/examples
+ * 3. Run the client:
+ * dapr run --components-path ./components/actors --app-id demoactorclient -- java -jar \
  * target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
  */
 public class DemoActorClient {
diff --git a/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java
index fb89e2c5a7..aeec77e6f7 100644
--- a/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java
+++ b/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java
@@ -18,8 +18,9 @@
  * Service for Actor runtime.
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run the server:
- * dapr run --components-path ./components --app-id demoactorservice --app-port 3000 \
+ * 2. cd to [repo-root]/examples
+ * 3. Run the server:
+ * dapr run --components-path ./components/actors --app-id demoactorservice --app-port 3000 \
  *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
  */
 public class DemoActorService {
diff --git a/examples/src/main/java/io/dapr/examples/actors/README.md b/examples/src/main/java/io/dapr/examples/actors/README.md
index a1cf0c4fe9..3fd65bbc08 100644
--- a/examples/src/main/java/io/dapr/examples/actors/README.md
+++ b/examples/src/main/java/io/dapr/examples/actors/README.md
@@ -128,7 +128,7 @@ The `@ActorType` annotation indicates the Dapr Java SDK that this interface is a
 
 Now, execute the following script in order to run DemoActorService:
 ```sh
-dapr run --components-path ./components --app-id demoactorservice --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
+dapr run --components-path ./components/actors --app-id demoactorservice --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
 ```
 
 ### Running the Actor client
@@ -190,21 +190,21 @@ Then, the code executes the `callActorForever` private method once per actor. In
 Use the follow command to execute the DemoActorClient:
 
 ```sh
-dapr run --components-path ./components --app-id demoactorclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
+dapr run --components-path ./components/actors --app-id demoactorclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
 ```
 
 Once running, the `DemoActorClient` logs will start displaying the different steps: 
 First, we can see actors being activated:
-![actordemo1](../../../../../../resources/img/demo-actor-client1.png)
+![actordemo1](../../../../../resources/img/demo-actor-client1.png)
 
 Then we can see the `registerReminder` in action. `DemoActorClient` console displays the actors handling reminders:
-![actordemo2](../../../../../../resources/img/demo-actor-client2.png)
+![actordemo2](../../../../../resources/img/demo-actor-client2.png)
 
 After invoking `incrementAndGet`, the code invokes `say` method (you'll see these messages 10 times per each of the 3 actors):
-![actordemo2](../../../../../../resources/img/demo-actor-client3.png)
+![actordemo2](../../../../../resources/img/demo-actor-client3.png)
 
 On the other hand, the console for `DemoActorService` is also responding to the remote invocations:
-![actordemo2](../../../../../../resources/img/demo-actor-service.png)
+![actordemo2](../../../../../resources/img/demo-actor-service.png)
 
 For more details on Dapr SpringBoot integration, please refer to [Dapr Spring Boot](../../../springboot/DaprApplication.java) Application implementation.
 
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java b/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java
index 2b7125145b..bd9ef022b7 100644
--- a/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java
+++ b/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java
@@ -17,9 +17,8 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run :
- * dapr run --components-path ./components --app-id inputbinding --app-port 3000 --dapr-http-port 3005  \
- *   -- java -jar target/dapr-java-sdk-examples-exec.jar \
- *   io.dapr.examples.bindings.http.InputBindingExample -p 3000
+ * dapr run --components-path ./components/bindings --app-id inputbinding --app-port 3000 \
+ *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
  */
 public class InputBindingExample {
 
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java b/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java
index 2a91022a46..c3b98605d2 100644
--- a/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java
+++ b/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java
@@ -14,7 +14,7 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components --app-id outputbinding --dapr-http-port 3006 \
+ * dapr run --components-path ./components/bindings --app-id outputbinding \
  *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
  */
 public class OutputBindingExample {
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/README.md b/examples/src/main/java/io/dapr/examples/bindings/http/README.md
index 572c53fb9a..91ff90c1dc 100644
--- a/examples/src/main/java/io/dapr/examples/bindings/http/README.md
+++ b/examples/src/main/java/io/dapr/examples/bindings/http/README.md
@@ -94,7 +94,7 @@ public class InputBindingController {
 
  Execute the follow script in order to run the Input Binding example:
 ```sh
-dapr run --components-path ./components --app-id inputbinding --app-port 3000 --dapr-http-port 3005 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
+dapr run --components-path ./components/bindings --app-id inputbinding --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
 ```
 
 ### Running the Output binding sample
@@ -150,7 +150,7 @@ This example binds two events: A user-defined data object (using the `myClass` o
 Use the follow command to execute the Output Binding example:
 
 ```sh
-dapr run --components-path ./components --app-id outputbinding --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
+dapr run --components-path ./components/bindings --app-id outputbinding -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
 ```
 
 Once running, the OutputBindingExample should print the output as follows:
diff --git a/examples/src/main/java/io/dapr/examples/exception/Client.java b/examples/src/main/java/io/dapr/examples/exception/Client.java
index 97aa07f68d..bd84080e45 100644
--- a/examples/src/main/java/io/dapr/examples/exception/Client.java
+++ b/examples/src/main/java/io/dapr/examples/exception/Client.java
@@ -15,8 +15,7 @@
  * 2. Go into examples:
  * cd examples
  * 3. send a message to be saved as state:
- * dapr run --components-path ./components --dapr-http-port 3006 -- \
- * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
+ * dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
  */
 public class Client {
 
diff --git a/examples/src/main/java/io/dapr/examples/exception/README.md b/examples/src/main/java/io/dapr/examples/exception/README.md
index 6a669ad080..4ba5ef27b1 100644
--- a/examples/src/main/java/io/dapr/examples/exception/README.md
+++ b/examples/src/main/java/io/dapr/examples/exception/README.md
@@ -61,7 +61,7 @@ The Dapr client is also within a try-with-resource block to properly close the c
 
 Run this example with the following command:
 ```sh
-dapr run --components-path ./components --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
+dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
 ```
 Once running, the OutputBindingExample should print the output as follows:
 
diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldClient.java b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldClient.java
index 1a7c6a3e0b..c63d51f420 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldClient.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldClient.java
@@ -12,9 +12,9 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
+ * 2. cd [repo root]/examples
  * 2. Send messages to the server:
- * dapr run --components-path ./examples/components -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- * io.dapr.examples.invoke.grpc.HelloWorldClient
+ * dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldClient
  */
 public class HelloWorldClient {
 
diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
index e9c4593eea..c63b0b29e5 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
@@ -29,11 +29,10 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run in server mode:
- * dapr run --components-path ./components --app-id hellogrpc --app-port 5000 --app-protocol grpc \
- *   -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- *   io.dapr.examples.invoke.grpc.HelloWorldService \
- *   -p 5000
+ * 2. cd [repo root]/examples
+ * 3. Run in server mode:
+ * dapr run --app-id hellogrpc --app-port 5000 --app-protocol grpc \
+ *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldService -p 5000
  */
 public class HelloWorldService {
 
diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md b/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md
index c86ce3de34..7b3f541923 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md
+++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md
@@ -74,7 +74,7 @@ In the `GrpcHelloWorldDaprService` class, the `onInvoke` method is the most impo
 Now run the service code:
 
 ```sh
-dapr run --components-path ./components --app-id hellogrpc --app-port 5000 --app-protocol grpc -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldService -p 5000
+dapr run --app-id hellogrpc --app-port 5000 --app-protocol grpc -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldService -p 5000
 ```
 
 The `app-id` argument is used to identify this service in Dapr's runtime. The `app-port` determines which port Dapr's runtime should call into this service.  The `protocol` argument informs Dapr which protocol it should use to invoke the application: `grpc` or `http`(default).
@@ -118,7 +118,7 @@ Finally, it will go through in an infinite loop and invoke the `say` method ever
 Finally, open a new command line terminal and run the client code to send some messages.
 
 ```sh
-dapr run --components-path ./components -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldClient
+dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.grpc.HelloWorldClient
 ```
 
 Once the messages are sent, use `CTRL+C` to exit Dapr.
diff --git a/examples/src/main/java/io/dapr/examples/invoke/http/DemoService.java b/examples/src/main/java/io/dapr/examples/invoke/http/DemoService.java
index 33a2854f18..6b64919673 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/http/DemoService.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/http/DemoService.java
@@ -14,10 +14,10 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run in server mode:
- * dapr run --components-path ./components --app-id invokedemo --app-port 3000 --dapr-http-port 3005 \
- *   -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- *   io.dapr.examples.invoke.http.DemoService -p 3000
+ * 2. cd [repo root]/examples
+ * 3. Run in server mode:
+ * dapr run --app-id invokedemo --app-port 3000 \
+ *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.http.DemoService -p 3000
  */
 public class DemoService {
 
diff --git a/examples/src/main/java/io/dapr/examples/invoke/http/InvokeClient.java b/examples/src/main/java/io/dapr/examples/invoke/http/InvokeClient.java
index 7965506562..71aae719ff 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/http/InvokeClient.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/http/InvokeClient.java
@@ -12,10 +12,10 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
- * 2. Send messages to the server:
- * dapr run --components-path ./examples/components \
- * --dapr-http-port 3006 -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- * io.dapr.examples.invoke.http.InvokeClient 'message one' 'message two'
+ * 2. cd [repo root]/examples
+ * 3. Send messages to the server:
+ * dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar \
+ *   io.dapr.examples.invoke.http.InvokeClient 'message one' 'message two'
  */
 public class InvokeClient {
 
diff --git a/examples/src/main/java/io/dapr/examples/invoke/http/README.md b/examples/src/main/java/io/dapr/examples/invoke/http/README.md
index 9434733d67..050bf41d19 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/http/README.md
+++ b/examples/src/main/java/io/dapr/examples/invoke/http/README.md
@@ -95,7 +95,7 @@ public class DemoServiceController {
 Use the follow command to execute the demo service example:
 
 ```sh
-dapr run --components-path ./components --app-id invokedemo --app-port 3000 --dapr-http-port 3005 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.http.DemoService -p 3000
+dapr run --app-id invokedemo --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.http.DemoService -p 3000
 ```
 
 Once running, the ExposerService is now ready to be invoked by Dapr.
@@ -131,7 +131,7 @@ The class knows the app id for the remote application. It uses the the static `D
  
 Execute the follow script in order to run the InvokeClient example, passing two messages for the remote method:
 ```sh
-dapr run --components-path ./components --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.http.InvokeClient "message one" "message two"
+dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.invoke.http.InvokeClient "message one" "message two"
 ```
 Once running, the output should display the messages sent from invoker in the demo service output as follows:
 
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java b/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
index 8cbcf39ad1..ccd272efc5 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
@@ -15,9 +15,10 @@
  * Message publisher.
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run the program:
- * dapr run --components-path ./components --app-id publisher --dapr-http-port 3006 -- \
- *  java -jar examples/target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Publisher
+ * 2. cd [repo root]/examples
+ * 3. Run the program:
+ * dapr run --components-path ./components/pubsub --app-id publisher -- \
+ *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Publisher
  */
 public class Publisher {
 
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
index 780b8fde78..c76a67c5d2 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
@@ -77,7 +77,7 @@ public class SubscriberController {
 ```
 Execute the follow script in order to run the Subscriber example:
 ```sh
-dapr run --components-path ./components --app-id subscriber --app-port 3000 --dapr-http-port 3005 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
+dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
 ```
 
 ### Running the publisher
@@ -130,7 +130,7 @@ public class Publisher {
 Use the follow command to execute the Publisher example:
 
 ```sh
-dapr run --components-path ./components --app-id publisher --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Publisher
+dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Publisher
 ```
 
 Once running, the Publisher should print the output as follows:
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java b/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java
index ef447eed78..6fb172c637 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java
@@ -15,9 +15,10 @@
  * Service for subscriber.
  * 1. Build and install jars:
  * mvn clean install
- * 2. Run the server:
- * dapr run --components-path ./components --app-id subscriber --app-port 3000 --dapr-http-port 3005 -- \
- *   java -jar examples/target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
+ * 2. cd [repo root]/examples
+ * 3. Run the server:
+ * dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 -- \
+ *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
  */
 public class Subscriber {
 
diff --git a/examples/src/main/java/io/dapr/examples/secrets/README.md b/examples/src/main/java/io/dapr/examples/secrets/README.md
index 6d6567096d..486f431fa0 100644
--- a/examples/src/main/java/io/dapr/examples/secrets/README.md
+++ b/examples/src/main/java/io/dapr/examples/secrets/README.md
@@ -134,7 +134,7 @@ The Dapr client is also within a try-with-resource block to properly close the c
 
  Execute the following script in order to run the example:
 ```sh
-dapr run --components-path ./components  -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient movie
+dapr run --components-path ./components/secrets  -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient movie
 ```
 
 Once running, the program should print the output as follows:
@@ -165,7 +165,7 @@ The configuration defines, that the only allowed secret is `movie` and all other
 
 Execute the following script in order to run this example with additional secret scoping: 
 ```sh
-dapr run --components-path ./components --config ./src/main/java/io/dapr/examples/secrets/config.yaml  -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient movie
+dapr run --components-path ./components/secrets --config ./src/main/java/io/dapr/examples/secrets/config.yaml  -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient movie
 ```
 Once running, the program should print the output as follows:
 
diff --git a/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java b/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java
index 1ff0182349..d739ca35b5 100644
--- a/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java
+++ b/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java
@@ -19,7 +19,7 @@
  * 3. Add secret to vault:
  *   vault kv put secret/dapr/movie title="[my favorite movie]"
  * 4. Read secret from example:
- *   dapr run --components-path ./components -- \
+ *   dapr run --components-path ./components/secrets -- \
  *     java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient movie
  */
 public class SecretClient {
diff --git a/examples/src/main/java/io/dapr/examples/state/README.md b/examples/src/main/java/io/dapr/examples/state/README.md
index 9cba5a35b4..b84d738a12 100644
--- a/examples/src/main/java/io/dapr/examples/state/README.md
+++ b/examples/src/main/java/io/dapr/examples/state/README.md
@@ -118,7 +118,7 @@ The Dapr client is also within a try-with-resource block to properly close the c
 
 Run this example with the following command:
 ```sh
-dapr run --components-path ./components --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
+dapr run --components-path ./components/state -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
 ```
 Once running, the OutputBindingExample should print the output as follows:
 
diff --git a/examples/src/main/java/io/dapr/examples/state/StateClient.java b/examples/src/main/java/io/dapr/examples/state/StateClient.java
index ad8535bbb7..bff742df09 100644
--- a/examples/src/main/java/io/dapr/examples/state/StateClient.java
+++ b/examples/src/main/java/io/dapr/examples/state/StateClient.java
@@ -18,10 +18,10 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
- * 2. send a message to be saved as state:
- * dapr run --components-path ./components --dapr-http-port 3006 -- \
- * java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- * io.dapr.examples.state.StateClient 'my message'
+ * 2. cd [repo root]/examples
+ * 3. send a message to be saved as state:
+ * dapr run --components-path ./components/state -- \
+ *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
  */
 public class StateClient {
 
diff --git a/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java b/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java
index 3deaa16dee..a18e262b03 100644
--- a/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java
+++ b/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java
@@ -21,10 +21,10 @@
 /**
  * 1. Build and install jars:
  * mvn clean install
- * 2. Send messages to the server:
- * dapr run --components-path ./examples/components \
- * --port 3006 -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- * io.dapr.examples.tracing.InvokeClient 'message one' 'message two'
+ * 2. cd [repo root]/examples
+ * 3. Send messages to the server:
+ * dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar \
+ *   io.dapr.examples.tracing.InvokeClient 'message one' 'message two'
  */
 public class InvokeClient {
 
diff --git a/examples/src/main/java/io/dapr/examples/tracing/README.md b/examples/src/main/java/io/dapr/examples/tracing/README.md
index f473d714fe..3bff3cad54 100644
--- a/examples/src/main/java/io/dapr/examples/tracing/README.md
+++ b/examples/src/main/java/io/dapr/examples/tracing/README.md
@@ -125,7 +125,7 @@ The instrumentation for the service happens via the `OpenTelemetryIterceptor` cl
 Use the follow command to execute the service:
 
 ```sh
-dapr run --components-path ./components --app-id tracingdemo --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.TracingDemoService -p 3000
+dapr run --app-id tracingdemo --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.TracingDemoService -p 3000
 ```
 
 Once running, the TracingDemoService is now ready to be invoked by Dapr.
@@ -179,7 +179,7 @@ The class knows the app id for the remote application. It uses `invokeService` m
  
 Execute the follow script in order to run the InvokeClient example, passing two messages for the remote method:
 ```sh
-dapr run --components-path ./components -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.InvokeClient "message one" "message two"
+dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.InvokeClient "message one" "message two"
 ```
 Once running, the output should display the messages sent from invoker in the demo service output as follows:
 
diff --git a/examples/src/main/java/io/dapr/examples/tracing/TracingDemoService.java b/examples/src/main/java/io/dapr/examples/tracing/TracingDemoService.java
index e8250e46c3..f7a5a25c08 100644
--- a/examples/src/main/java/io/dapr/examples/tracing/TracingDemoService.java
+++ b/examples/src/main/java/io/dapr/examples/tracing/TracingDemoService.java
@@ -18,10 +18,10 @@
  *
  * <p>1. Build and install jars:
  * mvn clean install
- * 2. Run in server mode:
- * dapr run --components-path ./examples/components --app-id tracingdemo --app-port 3000 --port 3005 \
- *   -- java -jar examples/target/dapr-java-sdk-examples-exec.jar \
- *   io.dapr.examples.tracing.TracingDemoService -p 3000
+ * 2. cd [repo root]/examples
+ * 3. Run in server mode:
+ * dapr run --app-id tracingdemo --app-port 3000 \
+ *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.TracingDemoService -p 3000
  */
 public class TracingDemoService {