Merge pull request #133 from redhat-developer-demos/win

Make tutorial more Windows friendly

Author: kdubois

documentation/modules/ROOT/assets/images/Openshift.png

@@ -265,7 +265,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw clean package -DskipTests -Dquarkus.container-image.push=true
+./mvnw clean package -DskipTests -D"quarkus.container-image.push=true"
 ----
 
 --

documentation/modules/ROOT/pages/dev-services.adoc

@@ -14,7 +14,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-smallrye-fault-tolerance
+./mvnw quarkus:add-extension -D"extensions=quarkus-smallrye-fault-tolerance"
 ----
 
 --

documentation/modules/ROOT/pages/fault-tolerance.adoc

@@ -20,7 +20,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-health
+./mvnw quarkus:add-extension -D"extension=quarkus-smallrye-health"
 ----
 
 --

documentation/modules/ROOT/pages/health.adoc

@@ -25,7 +25,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-kubernetes,quarkus-container-image-jib
+./mvnw quarkus:add-extension -Dextensions="quarkus-kubernetes,quarkus-container-image-jib"
 ----
 
 --
@@ -90,7 +90,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw clean package -DskipTests -Dquarkus.container-image.push=true -Dquarkus.container-image.builder=jib
+./mvnw quarkus:build -DskipTests -D"quarkus.container-image.push=true" -D"quarkus.container-image.builder=jib"
 ----
 
 --
@@ -100,12 +100,12 @@ Quarkus CLI::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-quarkus image build jib --no-tests -Dquarkus.container-image.push=true
+quarkus image build jib --no-tests -D"quarkus.container-image.push=true"
 ----
 --
 ====
 
-NOTE: You can also use Docker/Podman to build & push.  To do so, just omit 'jib' from the command.
+NOTE: If you're having trouble with jib, you can also just use Docker/Podman to build & push.  To do so, omit 'jib' from the command.
 
 [.console-output]
 [source,text]
@@ -129,7 +129,7 @@ NOTE: You can also use Docker/Podman to build & push.  To do so, just omit 'jib'
 
 When a Kubernetes extension is present in the classpath, Quarkus will scaffold a Kubernetes deployment file in your target folder during the package phase.  We can apply it to deploy the application to our Kubernetes cluster:  
 
-NOTE: You will need the https://kubernetes.io/docs/tasks/tools/[kubectl] or oc cli tool installed locally for the apply command below. https://developers.redhat.com/blog/2021/04/21/access-your-developer-sandbox-for-red-hat-openshift-from-the-command-line#[Here are instructions] to install the oc tool and log in to your Openshift Sandbox.
+NOTE: You will need the https://kubernetes.io/docs/tasks/tools/[kubectl] or oc cli tool installed locally for the apply command below. https://developers.redhat.com/blog/2021/04/21/access-your-developer-sandbox-for-red-hat-openshift-from-the-command-line#[Here are instructions] to install the oc tool and log in to your Openshift Sandbox.  Hint: your favorite package manager (dnf/brew/choco) can likely be used for the installation. Eg. `dnf install kubectl` or `choco install kubernetes-client` or `choco install openshift-client` 
 
 [tabs]
 ====
@@ -156,22 +156,20 @@ oc apply -f target/kubernetes/kubernetes.yml
 [.console-output]
 [source,text]
 ----
-serviceaccount/tutorial-app created
 service/tutorial-app created
 deployment.apps/tutorial-app created
 ----
 
-[TIP]
-=====
+
 With the Quarkus CLI tool deploying is even easier.  Instead of the above `kubectl apply` command, you can simply run `quarkus deploy` to deploy the application to your cluster:
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
 quarkus deploy
 ----
-=====
 
-You might need to wait a few seconds until your application is up and running.  Once it is, let's get the url to test:
+
+After the command has finished, you might need to wait a few more seconds until your application is up and running.  Once it is, let's get the url to test.  (command prompt and powershell users will need to tweak these commands a little bit)
 
 
 [tabs]
@@ -239,6 +237,11 @@ curl $IP:$PORT/hello
 Hello y'all!
 ----
 
+If you're using the Openshift Sandbox UI, you can also find the application running in the "Topology" view as seen in the screenshot below:
+
+[.mt-4.center]
+image::Openshift.png[Openshift,400,400,align="center"]
+
 [sidebar]
 --
 TIP: If you're using Openshift (Sandbox) and would like to create a url you can share to the outside world, you can create it like so:

documentation/modules/ROOT/pages/kubernetes.adoc

@@ -16,7 +16,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-micrometer
+./mvnw quarkus:add-extension -D"extensions=quarkus-micrometer"
 ----
 
 --
@@ -41,7 +41,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-micrometer-registry-prometheus
+./mvnw quarkus:add-extension -D"extensions=quarkus-micrometer-registry-prometheus"
 ----
 
 --

documentation/modules/ROOT/pages/metrics.adoc

@@ -203,7 +203,7 @@ Now you can insert a new fruit by using `curl`:
 [.console-input]
 [source,bash]
 ----
-curl -d '{"name": "Banana", "season": "Summer"}' -H "Content-Type: application/json" http://localhost:8080/fruit
+curl -d "{\"name\": \"Banana\", \"season\": \"Summer\"}" -H "Content-Type: application/json" http://localhost:8080/fruit
 ----
 
 [.console-output]

documentation/modules/ROOT/pages/panache.adoc

@@ -37,7 +37,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-rest-client-reactive,quarkus-rest-client-reactive-jsonb
+./mvnw quarkus:add-extension -D"extensions=quarkus-rest-client-reactive,quarkus-rest-client-reactive-jsonb"
 ----
 
 --

documentation/modules/ROOT/pages/rest-client.adoc

@@ -19,7 +19,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions=quarkus-oidc,quarkus-keycloak-authorization
+./mvnw quarkus:add-extension -D"extensions=quarkus-oidc,quarkus-keycloak-authorization"
 ----
 
 --
@@ -114,12 +114,7 @@ First you need a token valid to authenticate. Run the following command to obtai
 [.console-input]
 [source,bash]
 ----
-curl -X POST 'http://localhost:34000/realms/quarkus/protocol/openid-connect/token' \
--H 'Content-Type: application/x-www-form-urlencoded' \
--d 'username=jdoe' \
--d 'password=jdoepass' \
--d 'grant_type=password' \
--d 'client_id=admin-cli'
+curl -X POST "http://localhost:34000/realms/quarkus/protocol/openid-connect/token" -H "Content-Type: application/x-www-form-urlencoded" -d "username=jdoe" -d "password=jdoepass" -d "grant_type=password" -d "client_id=admin-cli"
 ----
 [IMPORTANT]
 --
@@ -139,11 +134,7 @@ Below you can find details on how to do that using `curl` and `jq`:
 [.console-input]
 [source,bash]
 ----
-token=$(curl -X POST 'http://localhost:34000/realms/quarkus/protocol/openid-connect/token' \
--H 'Content-Type: application/x-www-form-urlencoded' \
--d 'username=jdoe' \
--d 'password=jdoepass' \
--d 'grant_type=password' | jq -r '.access_token')
+token=$(curl -X POST "http://localhost:34000/realms/quarkus/protocol/openid-connect/token" -H "Content-Type: application/x-www-form-urlencoded" -d "username=jdoe" -d "password=jdoepass" -d "grant_type=password" | jq -r ".access_token")
 
 curl -H "Authorization: Bearer $token" localhost:8080/api/users/info
 ----

documentation/modules/ROOT/pages/security-oidc.adoc

@@ -19,7 +19,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-jwt
+./mvnw quarkus:add-extension -D"extension=quarkus-smallrye-jwt"
 ----
 
 --
@@ -118,7 +118,7 @@ public class SecureResource {
 
 == Invoke the /secure/claim endpoint
 
-Run the following command:
+Run the following command in a bash shell:
 
 [.console-input]
 [source,bash]