From a2672a63e20550ee596e389b09de233dba431a61 Mon Sep 17 00:00:00 2001 From: Jinbo Wang Date: Sun, 28 Apr 2019 10:02:07 +0800 Subject: [PATCH] Rename to Java 8 & Tomcat 8.5 Signed-off-by: Jinbo Wang --- .../.devcontainer/Dockerfile | 0 .../.devcontainer/devcontainer.json | 2 +- .../.devcontainer/maven-settings.xml | 0 .../{tomcat-8.5 => java-8-tomcat-8.5}/.npmignore | 0 .../{tomcat-8.5 => java-8-tomcat-8.5}/README.md | 8 ++++---- .../test-project/.classpath | 0 .../test-project/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../test-project/.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../test-project/.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.apt.core.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../test-project/mvnw | 0 .../test-project/mvnw.cmd | 0 .../test-project/pom.xml | 0 .../com/mycompany/mywebapp/HelloController.java | 0 .../com/mycompany/mywebapp/MywebappApplication.java | 0 .../src/main/resources/application.properties | 0 .../mywebapp/MywebappApplicationTests.java | 0 22 files changed, 5 insertions(+), 5 deletions(-) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/.devcontainer/Dockerfile (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/.devcontainer/devcontainer.json (77%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/.devcontainer/maven-settings.xml (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/.npmignore (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/README.md (91%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.classpath (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.gitignore (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.mvn/wrapper/maven-wrapper.jar (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.mvn/wrapper/maven-wrapper.properties (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.project (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.settings/org.eclipse.core.resources.prefs (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.settings/org.eclipse.jdt.apt.core.prefs (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.settings/org.eclipse.jdt.core.prefs (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/.settings/org.eclipse.m2e.core.prefs (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/mvnw (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/mvnw.cmd (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/pom.xml (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/src/main/java/com/mycompany/mywebapp/HelloController.java (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/src/main/java/com/mycompany/mywebapp/MywebappApplication.java (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/src/main/resources/application.properties (100%) rename containers/{tomcat-8.5 => java-8-tomcat-8.5}/test-project/src/test/java/com/mycompany/mywebapp/MywebappApplicationTests.java (100%) diff --git a/containers/tomcat-8.5/.devcontainer/Dockerfile b/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile similarity index 100% rename from containers/tomcat-8.5/.devcontainer/Dockerfile rename to containers/java-8-tomcat-8.5/.devcontainer/Dockerfile diff --git a/containers/tomcat-8.5/.devcontainer/devcontainer.json b/containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json similarity index 77% rename from containers/tomcat-8.5/.devcontainer/devcontainer.json rename to containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json index 7734d9811f..4a2f44118b 100644 --- a/containers/tomcat-8.5/.devcontainer/devcontainer.json +++ b/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", diff --git a/containers/tomcat-8.5/.devcontainer/maven-settings.xml b/containers/java-8-tomcat-8.5/.devcontainer/maven-settings.xml similarity index 100% rename from containers/tomcat-8.5/.devcontainer/maven-settings.xml rename to containers/java-8-tomcat-8.5/.devcontainer/maven-settings.xml diff --git a/containers/tomcat-8.5/.npmignore b/containers/java-8-tomcat-8.5/.npmignore similarity index 100% rename from containers/tomcat-8.5/.npmignore rename to containers/java-8-tomcat-8.5/.npmignore diff --git a/containers/tomcat-8.5/README.md b/containers/java-8-tomcat-8.5/README.md similarity index 91% rename from containers/tomcat-8.5/README.md rename to containers/java-8-tomcat-8.5/README.md index a8f21f9780..4ca7b213f1 100644 --- a/containers/tomcat-8.5/README.md +++ b/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 F1 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 F1, 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 F1, 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. diff --git a/containers/tomcat-8.5/test-project/.classpath b/containers/java-8-tomcat-8.5/test-project/.classpath similarity index 100% rename from containers/tomcat-8.5/test-project/.classpath rename to containers/java-8-tomcat-8.5/test-project/.classpath diff --git a/containers/tomcat-8.5/test-project/.gitignore b/containers/java-8-tomcat-8.5/test-project/.gitignore similarity index 100% rename from containers/tomcat-8.5/test-project/.gitignore rename to containers/java-8-tomcat-8.5/test-project/.gitignore diff --git a/containers/tomcat-8.5/test-project/.mvn/wrapper/MavenWrapperDownloader.java b/containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from containers/tomcat-8.5/test-project/.mvn/wrapper/MavenWrapperDownloader.java rename to containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/containers/tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.jar b/containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from containers/tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.jar rename to containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.jar diff --git a/containers/tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.properties b/containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from containers/tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.properties rename to containers/java-8-tomcat-8.5/test-project/.mvn/wrapper/maven-wrapper.properties diff --git a/containers/tomcat-8.5/test-project/.project b/containers/java-8-tomcat-8.5/test-project/.project similarity index 100% rename from containers/tomcat-8.5/test-project/.project rename to containers/java-8-tomcat-8.5/test-project/.project diff --git a/containers/tomcat-8.5/test-project/.settings/org.eclipse.core.resources.prefs b/containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from containers/tomcat-8.5/test-project/.settings/org.eclipse.core.resources.prefs rename to containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.core.resources.prefs diff --git a/containers/tomcat-8.5/test-project/.settings/org.eclipse.jdt.apt.core.prefs b/containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.jdt.apt.core.prefs similarity index 100% rename from containers/tomcat-8.5/test-project/.settings/org.eclipse.jdt.apt.core.prefs rename to containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.jdt.apt.core.prefs diff --git a/containers/tomcat-8.5/test-project/.settings/org.eclipse.jdt.core.prefs b/containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from containers/tomcat-8.5/test-project/.settings/org.eclipse.jdt.core.prefs rename to containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.jdt.core.prefs diff --git a/containers/tomcat-8.5/test-project/.settings/org.eclipse.m2e.core.prefs b/containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from containers/tomcat-8.5/test-project/.settings/org.eclipse.m2e.core.prefs rename to containers/java-8-tomcat-8.5/test-project/.settings/org.eclipse.m2e.core.prefs diff --git a/containers/tomcat-8.5/test-project/mvnw b/containers/java-8-tomcat-8.5/test-project/mvnw similarity index 100% rename from containers/tomcat-8.5/test-project/mvnw rename to containers/java-8-tomcat-8.5/test-project/mvnw diff --git a/containers/tomcat-8.5/test-project/mvnw.cmd b/containers/java-8-tomcat-8.5/test-project/mvnw.cmd similarity index 100% rename from containers/tomcat-8.5/test-project/mvnw.cmd rename to containers/java-8-tomcat-8.5/test-project/mvnw.cmd diff --git a/containers/tomcat-8.5/test-project/pom.xml b/containers/java-8-tomcat-8.5/test-project/pom.xml similarity index 100% rename from containers/tomcat-8.5/test-project/pom.xml rename to containers/java-8-tomcat-8.5/test-project/pom.xml diff --git a/containers/tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/HelloController.java b/containers/java-8-tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/HelloController.java similarity index 100% rename from containers/tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/HelloController.java rename to containers/java-8-tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/HelloController.java diff --git a/containers/tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/MywebappApplication.java b/containers/java-8-tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/MywebappApplication.java similarity index 100% rename from containers/tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/MywebappApplication.java rename to containers/java-8-tomcat-8.5/test-project/src/main/java/com/mycompany/mywebapp/MywebappApplication.java diff --git a/containers/tomcat-8.5/test-project/src/main/resources/application.properties b/containers/java-8-tomcat-8.5/test-project/src/main/resources/application.properties similarity index 100% rename from containers/tomcat-8.5/test-project/src/main/resources/application.properties rename to containers/java-8-tomcat-8.5/test-project/src/main/resources/application.properties diff --git a/containers/tomcat-8.5/test-project/src/test/java/com/mycompany/mywebapp/MywebappApplicationTests.java b/containers/java-8-tomcat-8.5/test-project/src/test/java/com/mycompany/mywebapp/MywebappApplicationTests.java similarity index 100% rename from containers/tomcat-8.5/test-project/src/test/java/com/mycompany/mywebapp/MywebappApplicationTests.java rename to containers/java-8-tomcat-8.5/test-project/src/test/java/com/mycompany/mywebapp/MywebappApplicationTests.java