merge V2 branch

RedHat-Middleware-Workshops · Mar 21, 2019 · 50d0161 · 50d0161
2 parents 03de9e8 + 41af56d
commit 50d0161
Show file tree

Hide file tree

Showing 386 changed files with 1,058 additions and 2,184 deletions.
diff --git a/docs/labs/citizen-integrator-track/lab01/walkthrough.adoc b/docs/labs/citizen-integrator-track/lab01/walkthrough.adoc
@@ -1,5 +1,6 @@
 :walkthrough: Create an OpenAPI Specification using Apicurio Studio
 :apicurio-studio-url: http://apicurio-studio.{openshift-app-host}
+:next-lab-url: https://tutorial-web-app-webapp.{openshift-app-host}/tutorial/dayinthelife-integration.git-citizen-integrator-track-lab02/
 :user-password: openshift
 
 [id='api-design']
@@ -24,7 +25,7 @@ If you are planning to skip this lab and follow the next one, here is a https://
 *Credentials:*
 
 Your username is: `{user-username}` +
-Your password is: Please ask your instructor for password
+Your password is: `{user-password}`
 
 [type=walkthroughResource]
 .Apicurio
@@ -283,7 +284,7 @@ So, you want more? Did you notice the link *source* when editing the _Paths_ or
 
 In this lab you used Apicurio Studio to create a simple API definition using the OpenAPI Specification. You learned how to author and download a standards compliant API Specification using Red Hat's Apicurio.
 
-You can now proceed to link:../lab02/#lab-2[Lab 2].
+You can now proceed to link:{next-lab-url}[Lab 2].
 
 [time=1]
 [id="further-reading"]

diff --git a/docs/labs/citizen-integrator-track/lab02/walkthrough.adoc b/docs/labs/citizen-integrator-track/lab02/walkthrough.adoc
@@ -1,11 +1,13 @@
 :walkthrough: Bring your APIs to life
 :testing-url: https://onlinecurl.com/
 :microcks-url: http://microcks.{openshift-app-host}
+:next-lab-url: https://tutorial-web-app-webapp.{openshift-app-host}/tutorial/dayinthelife-integration.git-citizen-integrator-track-lab03/
+:user-password: openshift
 
 [id='api-mocking']
 = Integrator Lab 2 - API Mocking
 
-In this lab you will use Microcks to configure a REST mock service for the API definition you created in the previous lab. REST mock services allows you to simulate a REST API service when you are in a prototyping stage of your API program journey. 
+In this lab you will use Microcks to configure a REST mock service for the API definition you created in the previous lab. REST mock services allows you to simulate a REST API service when you are in a prototyping stage of your API program journey.
 
 Audience: Developers, Architects, Testers, Quality Engineers
 
@@ -24,7 +26,7 @@ If you are planning to follow the next lab, here is a link:wip-link[link] to the
 *Credentials:*
 
 Your username is: `{user-username}` +
-Your password is: Please ask your instructor for password
+Your password is: `{user-password}`
 
 [type=walkthroughResource]
 .Microcks
@@ -117,7 +119,7 @@ In this lab you used Microcks to configure a REST mock service for the API defin
 
 Microcks allows you to test a number of various responses for client application requests. When deploying API, micro-services or SOA practices at large scale, Microcks solves the problems of providing and sharing consistent documentation and mocks to the involved teams. It acts as a central repository and server that can be used for browsing but also by your Continuous Integration builds or pipelines.
 
-You can now proceed to link:../lab03/#lab-3[Lab 3].
+You can now proceed to link:{next-lab-url}[Lab 3].
 
 [time=1]
 [id="further-reading"]

diff --git a/docs/labs/citizen-integrator-track/lab03/images/00-create-connection.png b/docs/labs/citizen-integrator-track/lab03/images/00-create-connection.png
diff --git a/...ntegrator-track/lab06/images/01-login.png → ...ntegrator-track/lab03/images/01-login.png b/...ntegrator-track/lab06/images/01-login.png → ...ntegrator-track/lab03/images/01-login.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/01-select-database.png b/docs/labs/citizen-integrator-track/lab03/images/01-select-database.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/01a-dashboard.png b/docs/labs/citizen-integrator-track/lab03/images/01a-dashboard.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/02-click-validate.png b/docs/labs/citizen-integrator-track/lab03/images/02-click-validate.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/03-connection-details.png b/docs/labs/citizen-integrator-track/lab03/images/03-connection-details.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/03-edit-settings.png b/docs/labs/citizen-integrator-track/lab03/images/03-edit-settings.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/04-apicast.png b/docs/labs/citizen-integrator-track/lab03/images/04-apicast.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/04-base-url.png b/docs/labs/citizen-integrator-track/lab03/images/04-base-url.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/04-create-integration.png b/docs/labs/citizen-integrator-track/lab03/images/04-create-integration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/05-authentication.png b/docs/labs/citizen-integrator-track/lab03/images/05-authentication.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/05-choose-weebhook.png b/docs/labs/citizen-integrator-track/lab03/images/05-choose-weebhook.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/06-incoming-webhook.png b/docs/labs/citizen-integrator-track/lab03/images/06-incoming-webhook.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07-baseurl-configuration.png b/docs/labs/citizen-integrator-track/lab03/images/07-baseurl-configuration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07-webhook-configuration.png b/docs/labs/citizen-integrator-track/lab03/images/07-webhook-configuration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-add-mapping-rule.png b/docs/labs/citizen-integrator-track/lab03/images/07b-add-mapping-rule.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-edit-mapping-rule.png b/docs/labs/citizen-integrator-track/lab03/images/07b-edit-mapping-rule.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-getall-rule.png b/docs/labs/citizen-integrator-track/lab03/images/07b-getall-rule.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-mapping-rules-define.png b/docs/labs/citizen-integrator-track/lab03/images/07b-mapping-rules-define.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-mapping-rules.png b/docs/labs/citizen-integrator-track/lab03/images/07b-mapping-rules.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-new-method-data.png b/docs/labs/citizen-integrator-track/lab03/images/07b-new-method-data.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/07b-new-method.png b/docs/labs/citizen-integrator-track/lab03/images/07b-new-method.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/08-data-type.png b/docs/labs/citizen-integrator-track/lab03/images/08-data-type.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/08-update-staging.png b/docs/labs/citizen-integrator-track/lab03/images/08-update-staging.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/08a-promote-production.png b/docs/labs/citizen-integrator-track/lab03/images/08a-promote-production.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/08aa-back-to-integration.png b/docs/labs/citizen-integrator-track/lab03/images/08aa-back-to-integration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/09-invoke-sql.png b/docs/labs/citizen-integrator-track/lab03/images/09-invoke-sql.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/10-invoke-sql-2.png b/docs/labs/citizen-integrator-track/lab03/images/10-invoke-sql-2.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/11-data-mapper.png b/docs/labs/citizen-integrator-track/lab03/images/11-data-mapper.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/12-configure-mapper.png b/docs/labs/citizen-integrator-track/lab03/images/12-configure-mapper.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/13-publish-integration.png b/docs/labs/citizen-integrator-track/lab03/images/13-publish-integration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/14-copy-URL.png b/docs/labs/citizen-integrator-track/lab03/images/14-copy-URL.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/15-online-curl.png b/docs/labs/citizen-integrator-track/lab03/images/15-online-curl.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/16-response-header.png b/docs/labs/citizen-integrator-track/lab03/images/16-response-header.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/17-activity-refresh.png b/docs/labs/citizen-integrator-track/lab03/images/17-activity-refresh.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/design-50.png b/docs/labs/citizen-integrator-track/lab03/images/design-50.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/design-51.png b/docs/labs/citizen-integrator-track/lab03/images/design-51.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/design-52.png b/docs/labs/citizen-integrator-track/lab03/images/design-52.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/design-53.png b/docs/labs/citizen-integrator-track/lab03/images/design-53.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/design-54.png b/docs/labs/citizen-integrator-track/lab03/images/design-54.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-00.png b/docs/labs/citizen-integrator-track/lab03/images/mock-00.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-01.png b/docs/labs/citizen-integrator-track/lab03/images/mock-01.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-02.png b/docs/labs/citizen-integrator-track/lab03/images/mock-02.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-03.png b/docs/labs/citizen-integrator-track/lab03/images/mock-03.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-04.png b/docs/labs/citizen-integrator-track/lab03/images/mock-04.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-05.png b/docs/labs/citizen-integrator-track/lab03/images/mock-05.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-06.png b/docs/labs/citizen-integrator-track/lab03/images/mock-06.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-07.png b/docs/labs/citizen-integrator-track/lab03/images/mock-07.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-08.png b/docs/labs/citizen-integrator-track/lab03/images/mock-08.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-09.png b/docs/labs/citizen-integrator-track/lab03/images/mock-09.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-10.png b/docs/labs/citizen-integrator-track/lab03/images/mock-10.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-11.png b/docs/labs/citizen-integrator-track/lab03/images/mock-11.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-12.png b/docs/labs/citizen-integrator-track/lab03/images/mock-12.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-13.png b/docs/labs/citizen-integrator-track/lab03/images/mock-13.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-14.png b/docs/labs/citizen-integrator-track/lab03/images/mock-14.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-15.png b/docs/labs/citizen-integrator-track/lab03/images/mock-15.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-16.png b/docs/labs/citizen-integrator-track/lab03/images/mock-16.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-17.png b/docs/labs/citizen-integrator-track/lab03/images/mock-17.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-18.png b/docs/labs/citizen-integrator-track/lab03/images/mock-18.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-19.png b/docs/labs/citizen-integrator-track/lab03/images/mock-19.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-20.png b/docs/labs/citizen-integrator-track/lab03/images/mock-20.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/mock-21.png b/docs/labs/citizen-integrator-track/lab03/images/mock-21.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n01-create-integration.png b/docs/labs/citizen-integrator-track/lab03/images/n01-create-integration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n02-api-provider.png b/docs/labs/citizen-integrator-track/lab03/images/n02-api-provider.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n03-api-from-scratch.png b/docs/labs/citizen-integrator-track/lab03/images/n03-api-from-scratch.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n04-api-name.png b/docs/labs/citizen-integrator-track/lab03/images/n04-api-name.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n05-api-path.png b/docs/labs/citizen-integrator-track/lab03/images/n05-api-path.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n06-data-type.png b/docs/labs/citizen-integrator-track/lab03/images/n06-data-type.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n07-location-input-datatype.png b/docs/labs/citizen-integrator-track/lab03/images/n07-location-input-datatype.png
diff --git a/...labs/citizen-integrator-track/lab03/images/n08-location-input-datatype-save.png b/...labs/citizen-integrator-track/lab03/images/n08-location-input-datatype-save.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n09-location-datatype.png b/docs/labs/citizen-integrator-track/lab03/images/n09-location-datatype.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n10-datatype-all.png b/docs/labs/citizen-integrator-track/lab03/images/n10-datatype-all.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n11-post-method.png b/docs/labs/citizen-integrator-track/lab03/images/n11-post-method.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n12-post-description.png b/docs/labs/citizen-integrator-track/lab03/images/n12-post-description.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n13-request.png b/docs/labs/citizen-integrator-track/lab03/images/n13-request.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n13-response.png b/docs/labs/citizen-integrator-track/lab03/images/n13-response.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n14-post-requst-location-input.png b/docs/labs/citizen-integrator-track/lab03/images/n14-post-requst-location-input.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n15-post-response.png b/docs/labs/citizen-integrator-track/lab03/images/n15-post-response.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n16-post-description.png b/docs/labs/citizen-integrator-track/lab03/images/n16-post-description.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n17-post-response-type.png b/docs/labs/citizen-integrator-track/lab03/images/n17-post-response-type.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n18-post-operation-id.png b/docs/labs/citizen-integrator-track/lab03/images/n18-post-operation-id.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n19-start-of-integration.png b/docs/labs/citizen-integrator-track/lab03/images/n19-start-of-integration.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n20-integration-name.png b/docs/labs/citizen-integrator-track/lab03/images/n20-integration-name.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n21-choose-operation.png b/docs/labs/citizen-integrator-track/lab03/images/n21-choose-operation.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n22-add-db-connection.png b/docs/labs/citizen-integrator-track/lab03/images/n22-add-db-connection.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n23-location-db.png b/docs/labs/citizen-integrator-track/lab03/images/n23-location-db.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n24-invoke-sql.png b/docs/labs/citizen-integrator-track/lab03/images/n24-invoke-sql.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n25-sql-statement.png b/docs/labs/citizen-integrator-track/lab03/images/n25-sql-statement.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n26-input-data-mapping.png b/docs/labs/citizen-integrator-track/lab03/images/n26-input-data-mapping.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n27-choose-data-mapping.png b/docs/labs/citizen-integrator-track/lab03/images/n27-choose-data-mapping.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n28-data-map-db.png b/docs/labs/citizen-integrator-track/lab03/images/n28-data-map-db.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n29-output-data-mapping.png b/docs/labs/citizen-integrator-track/lab03/images/n29-output-data-mapping.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n30-choose-data-mapping.png b/docs/labs/citizen-integrator-track/lab03/images/n30-choose-data-mapping.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n31-data-map-response.png b/docs/labs/citizen-integrator-track/lab03/images/n31-data-map-response.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/n32-publish.png b/docs/labs/citizen-integrator-track/lab03/images/n32-publish.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-01.png b/docs/labs/citizen-integrator-track/lab03/images/policies-01.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-02.png b/docs/labs/citizen-integrator-track/lab03/images/policies-02.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-03.png b/docs/labs/citizen-integrator-track/lab03/images/policies-03.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-04.png b/docs/labs/citizen-integrator-track/lab03/images/policies-04.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-05.png b/docs/labs/citizen-integrator-track/lab03/images/policies-05.png
diff --git a/...grator-track/lab05/images/policies-06.png → ...grator-track/lab03/images/policies-06.png b/...grator-track/lab05/images/policies-06.png → ...grator-track/lab03/images/policies-06.png
diff --git a/...grator-track/lab05/images/policies-07.png → ...grator-track/lab03/images/policies-07.png b/...grator-track/lab05/images/policies-07.png → ...grator-track/lab03/images/policies-07.png
diff --git a/...grator-track/lab05/images/policies-08.png → ...grator-track/lab03/images/policies-08.png b/...grator-track/lab05/images/policies-08.png → ...grator-track/lab03/images/policies-08.png
diff --git a/docs/labs/citizen-integrator-track/lab03/images/policies-09.png b/docs/labs/citizen-integrator-track/lab03/images/policies-09.png