OpenLiberty
diff --git a/‎.travis.yml
+1-1 b/‎.travis.yml
+1-1
diff --git a/‎README.adoc
+103-63 b/‎README.adoc
+103-63
@@ -3,7 +3,7 @@ before_script:
 - unset _JAVA_OPTIONS
 - cd finish
 script:
-- mvn clean install
+- mvn -q clean install
 - serverName=$(target/liberty/wlp/bin/server list | cut -d '.' -f2| tr -d '\n');
 - build=$(grep "Open Liberty" target/liberty/wlp/usr/servers/"$serverName"/logs/console.log
   | cut -d' ' -f5 | cut -d')' -f1 ); release=$( echo "$build" | cut -d'/' -f1); number=$(
 
@@ -1,19 +1,20 @@
-// Copyright (c) 2017, 2018 IBM Corporation and others.
+// Copyright (c) 2017, 2018, 2019 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
 //
 // Contributors:
 //   IBM Corporation
 :projectid: cdi-intro
-:page-layout: guide
+:page-layout: guide-multipane
 :page-duration: 15 minutes
 :page-releasedate: 2018-03-09
 :page-guide-category: microprofile
 :page-essential: true
 :page-essential-order: 2
 :page-description: Learn how to use Contexts and Dependency Injection to manage and inject dependencies into microservices.
-:page-tags: ['CDI', 'REST', '@ApplicationScoped', '@RequestScoped', '@Inject', 'MicroProfile', 'Dependency Injection', 'microservices', 'Java EE']
+:guide-author: Open Liberty
+:page-tags: ['MicroProfile', 'Java EE']
 :page-permalink: /guides/{projectid}
 :page-related-guides: ['rest-intro']
 :common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/master
@@ -24,12 +25,11 @@
 [.hidden]
 NOTE: This repository contains the guide documentation source. To view the guide in published form, view it on the https://openliberty.io/guides/{projectid}.html[Open Liberty website].
 
-Learn how to use Contexts and Dependency Injection to manage and inject dependencies into microservices.
+Learn how to use Contexts and Dependency Injection to manage scopes and inject dependencies into microservices.
 
 == What you'll learn
 
-You will learn how to use Contexts and Dependency Injection (CDI) in a simple inventory management application
-to manage scopes and inject dependencies.
+You will learn how to use Contexts and Dependency Injection (CDI) to manage scopes and inject dependencies in a simple inventory management application.
 
 The application that you will be working with is an `inventory` service,
 which stores the information about various JVMs that run on different systems.
@@ -44,9 +44,10 @@ You will also use dependency injection to inject one bean into another to make u
 This enables you to inject the bean in its specified context without having to instantiate it yourself.
 
 The implementation of the application and its services are provided for you in the `start/src` directory.
-The `system` service can be found in `start/src/main/java/io/openliberty/guides/system`, and the `inventory` service can be found
-in `start/src/main/java/io/openliberty/guides/inventory`. If you want to learn more about RESTful web services and how to build them, see
-https://openliberty.io/guides/rest-intro.html[Creating a RESTful web service] for details about how to build the `system` service.
+The `system` service can be found in the `start/src/main/java/io/openliberty/guides/system` directory, 
+and the `inventory` service can be found in the `start/src/main/java/io/openliberty/guides/inventory` directory. 
+If you want to learn more about RESTful web services and how to build them, see
+https://openliberty.io/guides/rest-intro.html[Creating a RESTful web service^] for details about how to build the `system` service.
 The `inventory` service is built in a similar way.
 
 === What is CDI?
@@ -62,6 +63,7 @@ controlling exactly when and how these components are instantiated and destroyed
 // Getting started
 // =================================================================================================
 
+[role='command']
 include::{common-includes}/gitclone.adoc[]
 
 === Try what you'll build
@@ -71,28 +73,28 @@ The `finish` directory in the root of this guide contains the finished inventory
 To try out the application, first navigate to the `finish` directory and then run the following
 Maven goals to build the application and run it inside Open Liberty:
 
+[role='command']
 ```
 cd finish
 mvn install liberty:start-server
 ```
 
-Point your browser to the http://localhost:9080/inventory/systems URL. This is the starting point of the `inventory`
+Point your browser to the http://localhost:9080/inventory/systems[http://localhost:9080/inventory/systems^] URL. This is the starting point of the `inventory`
 service and it displays the current contents of the inventory. As you might expect, these are empty since
-nothing is stored in the inventory yet. Next, point your browser to the http://localhost:9080/inventory/systems/localhost URL.
+nothing is stored in the inventory yet. Next, point your browser to the http://localhost:9080/inventory/systems/localhost[http://localhost:9080/inventory/systems/localhost^] URL.
 You see a result in JSON format with the system properties of your local JVM. When you visit this URL, these system
-properties are automatically stored in the inventory. Go back to http://localhost:9080/inventory/systems and
+properties are automatically stored in the inventory. Go back to http://localhost:9080/inventory/systems[http://localhost:9080/inventory/systems^] and
 you see a new entry for `localhost`. For simplicity, only the OS name and username are shown here for
 each host. You can repeat this process for your own hostname or any other machine that is running
 the `system` service.
 
 After you are done checking out the application, stop the Open Liberty server:
 
+[role='command']
 ```
 mvn liberty:stop-server
 ```
 
-
-
 == Handling dependencies in the application
 
 You will use CDI to inject dependencies into the inventory manager application and learn how to manage the life cycles of your objects.
@@ -101,69 +103,90 @@ You will use CDI to inject dependencies into the inventory manager application a
 
 Navigate to the `start` directory to begin.
 
-Create the inventory manager class in the `src/main/java/io/openliberty/guides/inventory/InventoryManager.java` file:
-
-[source, Java]
+[role="code_command hotspot", subs="quotes"]
+----
+#Create the `InventoryManager` class.#
+`src/main/java/io/openliberty/guides/inventory/InventoryManager.java`
 ----
-include::finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java[tags=**;!copyright;]
+InventoryManager.java
+[source, Java, linenums, role='code_column']
 ----
+include::finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java[tags=**;!copyright]
+----
+
+This bean contains three simple functions. The [hotspot=21-23 file=0]`get()` function is for retrieving entries from calling the `system` service.
+The [hotspot=25-34 file=0]`add()` function is for adding entries to the inventory.
+The [hotspot=36-38 file=0]`list()` function is for listing all the entries currently stored in the inventory.
 
-This bean contains three simple functions. The `get()` function is for retrieving entries from calling the `system` service.
-The `add()` function is for adding entries to the inventory.
-The `list()` function is for listing all the entries currently stored in the inventory.
+This bean must be persistent between all of the clients, which means multiple clients need to share the same instance.
+To achieve this by using CDI, you can simply add the [hotspot=13 file=0]`@ApplicationScoped` annotation onto the class.
 
-This bean must be persistent between all the clients, which means multiple clients need to share the same instance.
-To achieve this by using CDI, you can simply add the `@ApplicationScoped` annotation on the class.
-This annotation indicates that this particular
-bean is to be initialized once per application.
+This annotation indicates that this particular bean is to be initialized once per application.
 By making it application-scoped, the container ensures that the same instance of the bean is used whenever
 it is injected into the application.
 
-Next, create the `inventory` resource class in the `src/main/java/io/openliberty/guides/inventory/InventoryResource.java` file:
-
-[source, Java]
+[role="code_command hotspot", subs="quotes"]
+----
+#Create the `InventoryResource` class.#
+`src/main/java/io/openliberty/guides/inventory/InventoryResource.java`
+----
+InventoryResource.java
+[source, Java, linenums, role='code_column']
 ----
 include::finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java[tags=**;!copyright]
 ----
 
 The inventory resource is a RESTful service that is served at the `inventory/systems` endpoint. It enables the client to
 communicate with the inventory manager through HTTP methods.
 
-Add the `@RequestScoped` annotation on the class to indicate that this bean is
+Add the [hotspot=14 file=1]`@RequestScoped` annotation on the class to indicate that this bean is
 to be initialized once for every request. In other words, the bean is instantiated when the request
 is received and destroyed when a response is sent back to the client. While this bean can
 also be application-scoped, request scope is short-lived and is therefore ideal for HTTP requests.
 
 === Injecting a dependency
 
-Refer to the `inventory` resource class you created above:
-`src/main/java/io/openliberty/guides/inventory/InventoryResource.java`.
+Refer to the [hotspot=16-44 file=0]`InventoryResource` class you created above.
 
-The `@Inject` annotation indicates a dependency injection.
+The [hotspot=18 file=0]`@Inject` annotation indicates a dependency injection.
 You are injecting your `InventoryManager` bean into the `InventoryResource` class.
 This injects the bean in its specified context (application-scoped) and makes all of its functionalities
 available without the need of instantiating it yourself.
-The injected bean can then be invoked directly through the `manager.get(hostname)`
-and `manager.list()` function calls.
+The injected bean can then be invoked directly through the [hotspot=26 file=0]`manager.get(hostname)`
+and [hotspot=42 file=0]`manager.list()` function calls.
 
-Finally, you have a client component `SystemClient` that can be found in `src/main/java/io/openliberty/guides/inventory/client`.
-This class communicates with the `system` service to
-retrieve the JVM system properties for a particular host that exposes them.
-This class also contains detailed Javadocs that you can read for reference.
+Finally, you have a client component [hotspot file=1]`SystemClient` that can be found in the
+`src/main/java/io/openliberty/guides/inventory/client` directory. This class communicates 
+with the `system` service to retrieve the JVM system properties for a particular host 
+that exposes them. This class also contains detailed Javadocs that you can read for reference.
 
 Your inventory application is now completed.
 
+InventoryResource.java
+[source, Java, linenums, role='code_column']
+----
+include::finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java[tags=**;!copyright]
+----
+
+SystemClient.java
+[source, Java, linenums, role='code_column']
+----
+include::finish/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java[tags=**;!copyright]
+----
+
 // =================================================================================================
 // Building the application
 // =================================================================================================
 
+[role='command']
 include::{common-includes}/mvnbuild.adoc[]
 
 You can find the `inventory` and `system` services at the following URLs:
 
-- http://localhost:9080/inventory/systems
-- http://localhost:9080/system/properties
+- http://localhost:9080/inventory/systems[http://localhost:9080/inventory/systems^]
+- http://localhost:9080/system/properties[http://localhost:9080/system/properties^]
 
+[role='command']
 include::{common-includes}/mvncompile.adoc[]
 
 
@@ -179,46 +202,61 @@ Since the application is a RESTful web service application, you can use
 JUnit and the RESTful web service Client API to write tests.
 In testing the functionality of the application, the scopes and dependencies are being tested.
 
-Create the test class in the `src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java` file:
-
-[source, Java]
+[role="code_command hotspot", subs="quotes"]
 ----
-include::finish/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java[tags=**;!copyright;!javadoc]
+#Create the `InventoryEndpointTest` class.#
+`src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java`
 ----
 
-The `@BeforeClass` annotation is placed on a method that runs before any of the test cases.
-In this case, the `oneTimeSetup` method retrieves the port number for the Open Liberty server and builds
+The [hotspot=28 file=0]`@BeforeClass` annotation is placed on a method that runs before any of the test cases.
+In this case, the [hotspot=29-32 file=0]`oneTimeSetup` method retrieves the port number for the Open Liberty server and builds
 a base URL string that is used throughout the tests.
 
-The `@Before` and `@After` annotations are placed on methods that run before and after every test case.
-These methods are generally used to perform any setup and teardown tasks. In this case, the `setup` method
+The [hotspot=34 file=0]`@Before` and [hotspot=40 file=0]`@After` annotations are placed on methods that run before and after every test case.
+These methods are generally used to perform any setup and teardown tasks. In this case, the [hotspot=35-38 file=0]`setup` method
 creates a JAX-RS client, which makes HTTP requests to the `inventory` service. This client must
-also be registered with a JSON-P provider (`JsrJsonpProvider`) to process JSON resources. The `teardown`
+also be registered with a JSON-P provider ([hotspot=37 file=0]`JsrJsonpProvider`) to process JSON resources. The [hotspot=41-43 file=0]`teardown`
 method simply destroys this client instance.
 
 See the following descriptions of the test cases:
 
-- `testEmptyInventory()` verifies that the inventory is initially empty when the server first starts up.
-- `testHostRegistration()` verifies that a host is correctly added to the inventory.
-- `testSystemPropertiesMatch()` verifies that the JVM system properties returned by the `system` service match
+* [hotspot=53-65 file=0]`testEmptyInventory()` verifies that the inventory is initially empty when the server first starts up.
+
+* [hotspot=67-87 file=0]`testHostRegistration()` verifies that a host is correctly added to the inventory.
+
+* [hotspot=89-115 file=0]`testSystemPropertiesMatch()` verifies that the JVM system properties returned by the `system` service match
 the ones stored in the `inventory` service.
-- `testUnknownHost()` verifies that an unknown host or a host that does not expose their JVM system
+
+* [hotspot=117-132 file=0]`testUnknownHost()` verifies that an unknown host or a host that does not expose their JVM system
 properties is correctly handled as an error.
 
-To force these test cases to run in a particular order, put them in a `testSuite()` method and label
-it with a `@Test` annotation so that it automatically runs when your test class run.
+To force these test cases to run in a particular order, put them in a [hotspot=46-51 file=0]`testSuite()` method and label
+it with a [hotspot=45 file=0]`@Test` annotation so that it automatically runs when your test class run.
 
-Finally, a `system` test class in the `src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java` file
+Finally, the [hotspot file=1]`src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java` file
 is included for you to test the basic functionality of the `system` service.
 If a test failure occurs, then you might have introduced a bug into the code.
 
+InventoryEndpointTest.java
+[source, Java, linenums, role='code_column']
+----
+include::finish/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java[tags=**;!copyright;!javadoc]
+----
+
+SystemEndpointTest.java
+[source, Java, linenums, role='code_column']
+----
+include::finish/src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java[tags=**;!copyright;!javadoc]
+----
+
 // =================================================================================================
 // Running the tests
 // =================================================================================================
 
+[role='command']
 include::{common-includes}/mvnverify.adoc[]
 
-[source, role="no_copy"]
+[source, role='no_copy']
 ----
 -------------------------------------------------------
  T E S T S
@@ -234,15 +272,17 @@ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
 ----
 
 To see whether the tests detect a failure, change the endpoint for the `inventory` service in
-the `src/main/java/io/openliberty/guides/inventory/InventoryResource.java` file to something else, then
+the [hotspot file=0]`src/main/java/io/openliberty/guides/inventory/InventoryResource.java` file to something else, then
 run the Maven build again. You see a test failure occur.
 
+InventoryResource.java
+[source, Java, linenums, role='code_column']
+----
+include::finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java[tags=**;!copyright]
+----
 
 == Great work! You're done!
 
-You have just completed building a simple inventory application on top of Open Liberty using CDI services.
-
-You can continue to try one of the related guides, which demonstrate new technologies that you can learn and
-expand on top what you built in this guide.
+You have just completed building a simple inventory application using CDI services in Open Liberty.
 
-include::{common-includes}/finish.adoc[]
+include::{common-includes}/attribution.adoc[subs="attributes"]