fixed chapter titles and renamed/moved some of the files

arun-gupta · arun-gupta · commit 07f276cd548a · 2015-06-03T18:39:44.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 **/.DS_Store
+readme.xml
+readme.html
diff --git a/chapters/container-cluster.adoc b/chapters/container-cluster.adoc
@@ -1,3 +1,6 @@
+[[JavaEE_Application_Docker_Cluster]]
+## Java EE Application on Container Cluster
+
 A frequent requirement for Java EE based applications is running them on a cluster of application server. While setup and test can be complicated on developer machines, this is where Docker can play to it's full potential. With the help of images and automatic port mapping, we're ready to test Ticket Monster on a couple of WildFly instances and add and remove them randomly.
 
 The diagram below shows what will be achieved in this section:
diff --git a/chapters/docker-basics.adoc b/chapters/docker-basics.adoc
@@ -1,3 +1,5 @@
+## Docker Basics
+
 Docker simplifies software delivery by making it easy to build and share images that contain your application’s entire environment, or application operating system.
 
 **What does it mean by an application operating system ?**
diff --git a/chapters/docker-client.adoc b/chapters/docker-client.adoc
@@ -1,3 +1,5 @@
+## Docker Client
+
 The client communicates with the demon process on your host and let's you work with images and containers.
 
 Check if your client is working using the following command:
diff --git a/chapters/docker-commands.adoc b/chapters/docker-commands.adoc
@@ -1,4 +1,6 @@
-# Docker Command Cheatsheet
+## Common Docker Commands
+
+Here is the list of commonly used Docker commands:
 
 [width="100%", options="header"]
 |==================
diff --git a/chapters/docker-compose.adoc b/chapters/docker-compose.adoc
@@ -1,3 +1,5 @@
+## Starting Multiple Containers Using Docker Compose
+
 Docker Compose script is only downloadable for OSX and Linux.
 
 TODO: What are the exact steps to get it running on Windows?
diff --git a/chapters/docker-configuration.adoc b/chapters/docker-configuration.adoc
@@ -1,3 +1,5 @@
+## Verify Docker Configuration
+
 Check if your Docker Host is running:
 
 [source, text]
diff --git a/chapters/docker-container.adoc b/chapters/docker-container.adoc
@@ -1,3 +1,5 @@
+## Run Container
+
 The first step in running any application on Docker is to run an image. There are plenty of images available from the official Docker registry (aka link:https://hub.docker.com[Docker Hub]). To run any of them, you just have to ask the Docker Client to run it. The client will check if the image already exists on Docker Host. If it exists then it'll run it, otherwise the host will download the image and then run it.
 
 ### Pull Image
@@ -326,5 +328,3 @@ docker ps -a | grep wildfly | awk '{print $1}' | xargs docker rm
 ----
 docker rm $(docker ps -aq)
 ----
-
-Common Docker commands are available in link:command-cheatsheet.adoc[Docker Command Cheatsheet].
diff --git a/chapters/docker-eclipse.adoc b/chapters/docker-eclipse.adoc
@@ -1,3 +1,5 @@
+## Docker Tools in Eclipse
+
 The Docker tooling is aimed at providing at minimum the same basic level features as the command-line interface, but also provide some advantages by having access to a full fledged UI.
 
 ### Install Docker Tools Plugins
diff --git a/chapters/docker-intellij.adoc b/chapters/docker-intellij.adoc
@@ -1 +1,3 @@
+## Docker Tools in IntelliJ
+
 http://blog.jetbrains.com/idea/2015/03/docker-support-in-intellij-idea-14-1/
diff --git a/chapters/docker-javaee7.adoc b/chapters/docker-javaee7.adoc
@@ -1,3 +1,5 @@
+## Deploy Java EE 7 Application (Pre-Built WAR)
+
 https://github.com/javaee-samples/javaee7-hol[Java EE 7 Hands-on Lab] has been delivered all around the world and is a pretty standard application that shows design patterns and anti-patterns for a typical Java EE 7 application.
 
 .Java EE 7 Application Architecture
diff --git a/chapters/docker-machine.adoc b/chapters/docker-machine.adoc
@@ -1,3 +1,5 @@
+## Docker Machine
+
 Machine makes it really easy to create Docker hosts on your computer, on cloud providers and inside your own data center. It creates servers, installs Docker on them, then configures the Docker client to talk to them.
 
 Once your Docker host has been created, it then has a number of commands for managing them:
diff --git a/chapters/docker-maven-plugin.adoc b/chapters/docker-maven-plugin.adoc
@@ -1 +1,3 @@
+## Docker Maven Plugin
+
 http://blog.arungupta.me/javaee-docker-maven-plugin/
diff --git a/chapters/docker-netbeans.adoc b/chapters/docker-netbeans.adoc
@@ -0,0 +1 @@
+## Docker Tools in NetBeans
diff --git a/chapters/docker-openshift.adoc b/chapters/docker-openshift.adoc
@@ -1,3 +1,5 @@
+## OpenShift v3 (Optional Part, No Windows)
+
 If you are on a Mac or Linux system, you can also try out clustering with OpenShift V3 and Kubernetes. For this is an optional step in the lab, you can follow these separate instructions.
 
 http://blog.arungupta.me/openshift-v3-getting-started-javaee7-wildfly-mysql/
diff --git a/chapters/docker-references.adoc b/chapters/docker-references.adoc
@@ -1 +1,3 @@
+## References
+
 . JBoss and Docker: http://www.jboss.org/docker/
diff --git a/chapters/docker-swarm.adoc b/chapters/docker-swarm.adoc
@@ -1,3 +1,5 @@
+## Java EE Application on Docker Swarm Cluster
+
 Docker Swarm solves one of the fundamental limitations of Docker where the containers could only run on a single Docker host. Docker Swarm is native clustering for Docker. It turns a pool of Docker hosts into a single, virtual host.
 
 .Key Components of Docker Swarm
diff --git a/chapters/docker-testing.adoc b/chapters/docker-testing.adoc
@@ -1,3 +1,5 @@
+## Test Java EE Applications on Docker
+
 Testing Java EE applications is a very important aspect. Especially when it comes to in-container tests, link:http://www.arquillian.org[JBoss Arquillian] is well known to make this very easy.
 Picking up where unit tests leave off, Arquillian handles all the plumbing of container management, deployment and framework initialization so you can focus on the task at hand, writing your tests. Real tests.
 
diff --git a/chapters/kubernetes.adoc b/chapters/kubernetes.adoc
@@ -0,0 +1 @@
+## Java EE Application on Kubernetes Cluster
diff --git a/chapters/preface.adoc b/chapters/preface.adoc
@@ -1,3 +1,5 @@
+## Preface
+
 Containers are enabling developers to package their applications (and underlying dependencies) in new ways that are portable and work consistently everywhere? On your machine, in production, in your data center, and in the cloud. And Docker has become the de facto standard for those portable containers in the cloud.
 
 Docker is the developer-friendly Linux container technology that enables creation of your stack: OS, JVM, app server, app, and all your custom configuration. So with all it offers, how comfortable are you and your team taking Docker from development to production? Are you hearing developers say, “But it works on my machine!” when code breaks in production?
diff --git a/chapters/setup.adoc b/chapters/setup.adoc
@@ -1,3 +1,5 @@
+## Setup Environments
+
 This section describes the relevant steps for both attendees and instructors to setup the environments. Please follow the parts, that are appropriate for you.
 
 ### Instructor
diff --git a/chapters/ticket-monster.adoc b/chapters/ticket-monster.adoc
@@ -1,4 +1,6 @@
-TicketMonster is an example application that focuses on Java EE6 - JPA 2, CDI, EJB 3.1 and JAX-RS along with HTML5 and jQuery Mobile. It is a moderately complex application that demonstrates how to build modern web applications optimized for mobile & desktop. TicketMonster is representative of an online ticketing broker - providing access to events (e.g. concerts, shows, etc) with an online booking application.
+## Build and Deploy Java EE 6 Application (Ticket Monster)
+
+Ticket Monster is an example application that focuses on Java EE6 - JPA 2, CDI, EJB 3.1 and JAX-RS along with HTML5 and jQuery Mobile. It is a moderately complex application that demonstrates how to build modern web applications optimized for mobile & desktop. TicketMonster is representative of an online ticketing broker - providing access to events (e.g. concerts, shows, etc) with an online booking application.
 
 Apart from being a demo, TicketMonster provides an already existing application structure that you can use as a starting point for your app. You could try out your use cases, test your own ideas, or, contribute improvements back to the community.
 
diff --git a/readme.adoc b/readme.adoc
@@ -4,84 +4,45 @@
 
 toc::[]
 
-## Preface
-
 include::chapters/preface.adoc[]
 
-## Setup Environments
-
 include::chapters/setup.adoc[]
 
-## Docker Basics
-
 include::chapters/docker-basics.adoc[]
 
-## Docker Machine
-
 include::chapters/docker-machine.adoc[]
 
-## Docker Client
-
 include::chapters/docker-client.adoc[]
 
-## Verify Docker Configuration
-
-include::chapters/verify-docker-configuration.adoc[]
+include::chapters/docker-configuration.adoc[]
 
-## Running WildFly Container
-
-include::chapters/docker-wildfly.adoc[]
-
-## Deploy Java EE 7 Application (Pre-Built WAR)
+include::chapters/docker-container.adoc[]
 
 include::chapters/docker-javaee7.adoc[]
 
-## Build and Deploy Java EE 6 Application (Ticket Monster)
-
 include::chapters/ticket-monster.adoc[]
 
-## Docker Maven Plugin
-
 include::chapters/docker-maven-plugin.adoc[]
 
-## Docker Tools in Eclipse
-
 include::chapters/docker-eclipse.adoc[]
 
-## Docker Tools in NetBeans
-
 include::chapters/docker-netbeans.adoc[]
 
-## Docker Tools in IntelliJ
-
 include::chapters/docker-intellij.adoc[]
 
-## Test Java EE Applications on Docker
-
 include::chapters/docker-testing.adoc[]
 
-[[JavaEE_Application_Docker_Cluster]]
-## Java EE Application on Container Cluster
-
 include::chapters/container-cluster.adoc[]
 
-## Java EE Application on Docker Swarm Cluster
-
 include::chapters/docker-swarm.adoc[]
 
-## Starting Multiple Containers Using Docker Compose
-
-include::chapters/docker-compose.adoc[]
-
-## Java EE Application on Kubernetes
-
 include::chapters/kubernetes.adoc[]
 
-## OpenShift v3 (Optional Part, No Windows)
+include::chapters/docker-compose.adoc[]
 
 include::chapters/docker-openshift.adoc[]
 
-## References
+include::docker-commands.adoc[]
 
 include::chapters/docker-references.adoc[]
 
diff --git a/readme.pdf b/readme.pdf

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`**/.DS_Store`
	`2`	`+readme.xml`
	`3`	`+readme.html`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## Docker Basics`
	`2`	`+`
`1`	`3`	`Docker simplifies software delivery by making it easy to build and share images that contain your application’s entire environment, or application operating system.`
`2`	`4`
`3`	`5`	`What does it mean by an application operating system ?`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## Docker Client`
	`2`	`+`
`1`	`3`	`The client communicates with the demon process on your host and let's you work with images and containers.`
`2`	`4`
`3`	`5`	`Check if your client is working using the following command:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## Starting Multiple Containers Using Docker Compose`
	`2`	`+`
`1`	`3`	`Docker Compose script is only downloadable for OSX and Linux.`
`2`	`4`
`3`	`5`	`TODO: What are the exact steps to get it running on Windows?`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## Verify Docker Configuration`
	`2`	`+`
`1`	`3`	`Check if your Docker Host is running:`
`2`	`4`
`3`	`5`	`[source, text]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## Docker Tools in Eclipse`
	`2`	`+`
`1`	`3`	`The Docker tooling is aimed at providing at minimum the same basic level features as the command-line interface, but also provide some advantages by having access to a full fledged UI.`
`2`	`4`
`3`	`5`	`### Install Docker Tools Plugins`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+## Docker Tools in IntelliJ`
	`2`	`+`
`1`	`3`	`http://blog.jetbrains.com/idea/2015/03/docker-support-in-intellij-idea-14-1/`