Rename to Java 8 & Tomcat 8.5

Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>

containers/tomcat-8.5/.devcontainer/devcontainer.json → containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Tomcat 8.5",
+	"name": "Java 8 & Tomcat 8.5",
 	"dockerFile": "Dockerfile",
 	"extensions": [
 		"vscjava.vscode-java-pack",

containers/tomcat-8.5/README.md → containers/java-8-tomcat-8.5/README.md

@@ -1,4 +1,4 @@
-# Tomcat 8.5
+# Java 8 & Tomcat 8.5
 
 ## Summary
 
@@ -19,11 +19,11 @@ Follow these steps to use the definition:
 2. To use VS Code's copy of this definition:
    1. Start VS Code and open your project folder.
    2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
-   3. Select the Tomcat 8.5 definition.
+   3. Select the Java 8 & Tomcat 8.5 definition.
 
 3. To use latest-and-greatest copy of this definition from the repository:
    1. Clone this repository.
-   2. Copy the contents of `containers/tomcat-8.5/.devcontainer` to the root of your project folder.
+   2. Copy the contents of `containers/java-8-tomcat-8.5/.devcontainer` to the root of your project folder.
    3. Start VS Code and open your project folder.
 
 4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
@@ -37,7 +37,7 @@ This definition includes some test code that will help you verify it is working
 1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to set up your machine.
 2. Clone this repository.
 3. Start VS Code, press <kbd>F1</kbd>, and select **Remote-Containers: Open Folder in Container...**
-4. Select the `containers/tomcat-8.5` folder.
+4. Select the `containers/java-8-tomcat-8.5` folder.
 5. After the folder has opened in the container, press <kbd>F1</kbd>, and select **Tomcat: Add Tomcat Server**.
 6. In the prompted File Dialog, select `/usr/local/tomcat` and click **OK** button to add a new Tomcat Server.
 7. Go to VS Code Terminal viewlet, click **+** button to new a bash terminal, then run the commands below to generate a war file.