Merge hotfix to master (#409)

* Update testplan for setting environment variables. (#394)

* Bump version to 0.12.2 (#406)

Author: andxu

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the "vscode-java-debugger" extension will be documented i
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.12.2 - 2018-9-6
+### Fixed
+- Fix: Runtime scope class path entries are missing. [#402](https://github.com/Microsoft/vscode-java-debug/issues/402).
+
 ## 0.12.1 - 2018-8-31
 ### Fixed
 - Fix: `env` config in launch.json not respected. [#393](https://github.com/Microsoft/vscode-java-debug/issues/393).

TestPlan.md

@@ -429,3 +429,11 @@ Exception in thread "main" java.lang.IllegalStateException
     CustomEnv: This env is for test plan.
     SystemPath: <value of PATH >
     ```
+
+## Runtime classpath entry
+1. Open `27.runtimeClassEntry` in vscode.
+2. Press <kbd>F5</kbd> to start.
+3. Verify the output in Debug Console should be as following:
+    ```
+      Tomcat started on port(s): 8080 (http)
+    ```

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-java-debug",
   "displayName": "Debugger for Java",
   "description": "A lightweight Java debugger for Visual Studio Code",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "publisher": "vscjava",
   "preview": true,
   "aiKey": "67d4461e-ccba-418e-8082-1bd0acfe8516",
@@ -37,7 +37,7 @@
   "main": "./out/src/extension",
   "contributes": {
     "javaExtensions": [
-      "./server/com.microsoft.java.debug.plugin-0.12.1.jar"
+      "./server/com.microsoft.java.debug.plugin-0.12.2.jar"
     ],
     "commands": [],
     "debuggers": [
@@ -366,7 +366,7 @@
     "vscode:prepublish": "tsc -p ./",
     "compile": "tsc -watch -p ./",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-debug-0.12.1.vsix && node ./scripts/run-vscode-tests"
+    "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-debug-0.12.2.vsix && node ./scripts/run-vscode-tests"
   },
   "extensionDependencies": [
     "redhat.java"

package.json

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.github.kdvolder</groupId>
+	<artifactId>hello-world-service</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent> 
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.0.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies> 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

testprojects/27.runtimeClassEntry/pom.xml

@@ -0,0 +1,5 @@
+package com.github.kdvolder.helloworldservice;
+
+public class Constants {
+    public static final String GREETER_ID = "greeets";
+}

testprojects/27.runtimeClassEntry/src/main/java/com/github/kdvolder/helloworldservice/Constants.java

@@ -0,0 +1,52 @@
+package com.github.kdvolder.helloworldservice;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@SpringBootApplication
+@RestController
+@EnableScheduling
+public class DemoApplication {
+	
+	public static class Bar {
+	}
+
+	public static class Foo {
+	}
+
+	@Autowired(required=false) void foo(@Qualifier("foobar")Foo foo) {
+		System.out.println("a Foo got injected");
+	}
+
+	@Autowired(required=false) void bar(@Qualifier("foobar")Bar bar) {
+		System.out.println("a Bar got injected");
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+
+	@GetMapping(value="/")
+	public String mainpage() {
+		return "Hello "+System.getProperty("greeting");
+	}
+	
+
+	@GetMapping(value = "/hello/{name}")
+	public String getMethodName(@PathVariable String name) {
+		return "Hello "+name;
+	}
+
+	
+	@Bean Foo foobar() {
+		return new Foo();
+	}
+}

testprojects/27.runtimeClassEntry/src/main/java/com/github/kdvolder/helloworldservice/DemoApplication.java

@@ -0,0 +1,13 @@
+package com.github.kdvolder.helloworldservice;
+
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class Greeter {
+
+    String greeting(String name) {
+        return "Hello "+name;
+    }
+
+}

testprojects/27.runtimeClassEntry/src/main/java/com/github/kdvolder/helloworldservice/Greeter.java

@@ -0,0 +1,26 @@
+package com.github.kdvolder.helloworldservice;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
+
+@ConfigurationProperties("my")
+public class MyProperties {
+
+    private String hello;
+
+	/**
+	 * @return the hello
+	 */
+    @DeprecatedConfigurationProperty(replacement="new.my.hello")
+	public String getHello() {
+		return hello;
+	}
+
+	/**
+	 * @param hello the hello to set
+	 */
+	public void setHello(String hello) {
+		this.hello = hello;
+	}
+
+}

testprojects/27.runtimeClassEntry/src/main/java/com/github/kdvolder/helloworldservice/MyProperties.java

@@ -0,0 +1 @@
+my.hello=Yadaya