From 77d1c6dde77daaf4b0f8bf932a4b327cfece575b Mon Sep 17 00:00:00 2001
From: nlisker <devnull@localhost>
Date: Wed, 5 Sep 2018 14:38:23 -0700
Subject: [PATCH] 8209015: Update Eclipse project files Reviewed-by: kcr,
 tschindl

---
 .project                                      |  8 +--
 apps/.project                                 | 16 +++++
 modules/javafx.base/.classpath                |  3 +-
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.controls/.classpath            |  5 +-
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.fxml/.classpath                |  5 +-
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.graphics/.classpath            | 17 ++++-
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.media/.classpath               |  1 -
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.swing/.classpath               | 18 ++---
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.swt/.classpath                 | 27 ++++++--
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 modules/javafx.web/.classpath                 | 11 +--
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 tests/.classpath                              | 67 ++++++++++++++++---
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 tests/system/.classpath                       | 61 +++++++++++++++++
 tests/system/.project                         | 16 +++++
 .../org.eclipse.core.resources.prefs          |  2 +
 .../.settings/org.eclipse.core.runtime.prefs  |  2 +
 33 files changed, 239 insertions(+), 56 deletions(-)
 create mode 100644 apps/.project
 create mode 100644 modules/javafx.base/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.base/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.controls/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.controls/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.fxml/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.fxml/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.graphics/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.graphics/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.media/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.media/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.swing/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.swing/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.swt/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.swt/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 modules/javafx.web/.settings/org.eclipse.core.resources.prefs
 create mode 100644 modules/javafx.web/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 tests/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 tests/system/.classpath
 create mode 100644 tests/system/.project
 create mode 100644 tests/system/.settings/org.eclipse.core.resources.prefs
 create mode 100644 tests/system/.settings/org.eclipse.core.runtime.prefs

diff --git a/.project b/.project
index b2397783cd..dd3ee7b273 100644
--- a/.project
+++ b/.project
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>rt</name>
-	<comment></comment>
+	<comment>Project rt created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
-</projectDescription>
\ No newline at end of file
+</projectDescription>
diff --git a/apps/.project b/apps/.project
new file mode 100644
index 0000000000..d0c4d6ba3b
--- /dev/null
+++ b/apps/.project
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>apps</name>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/modules/javafx.base/.classpath b/modules/javafx.base/.classpath
index 7882c0e93c..e7ef255f3a 100644
--- a/modules/javafx.base/.classpath
+++ b/modules/javafx.base/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -21,7 +21,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.base/.settings/org.eclipse.core.resources.prefs b/modules/javafx.base/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.base/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.base/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.base/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.base/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.controls/.classpath b/modules/javafx.controls/.classpath
index 32fe2b5f3c..f670e3557b 100644
--- a/modules/javafx.controls/.classpath
+++ b/modules/javafx.controls/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="testbin" path="src/shims/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -30,7 +31,7 @@
 			<attribute name="add-exports" value="javafx.base/test.com.sun.javafx.binding=javafx.controls"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -38,8 +39,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="java.base/java.util=javafx.controls"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.controls/.settings/org.eclipse.core.resources.prefs b/modules/javafx.controls/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.controls/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.controls/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.controls/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.controls/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.fxml/.classpath b/modules/javafx.fxml/.classpath
index 7c65499f96..f7fd1b2ab4 100644
--- a/modules/javafx.fxml/.classpath
+++ b/modules/javafx.fxml/.classpath
@@ -21,7 +21,7 @@
 	<classpathentry kind="src" path="/controls">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="javafx.controls/javafx.scene.control=javafx.fxml"/>
+			<attribute name="add-reads" value="javafx.fxml=javafx.controls"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
@@ -35,7 +35,7 @@
 			<attribute name="add-exports" value="javafx.base/com.sun.javafx.collections=javafx.fxml"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -43,7 +43,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.fxml/.settings/org.eclipse.core.resources.prefs b/modules/javafx.fxml/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.fxml/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.fxml/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.fxml/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.fxml/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.graphics/.classpath b/modules/javafx.graphics/.classpath
index e99799d519..151c2a9133 100644
--- a/modules/javafx.graphics/.classpath
+++ b/modules/javafx.graphics/.classpath
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="build/hlsl/Prism">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="build/gensrc/jsl-prism"/>
+	<classpathentry kind="src" path="build/hlsl/Decora">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="build/gensrc/jsl-decora"/>
 	<classpathentry kind="src" output="testbin" path="src/shims/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -29,7 +41,7 @@
 			<attribute name="add-exports" value="javafx.base/com.sun.javafx.property=javafx.graphics"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -37,8 +49,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="java.desktop/sun.font=javafx.graphics:java.base/sun.security.util=javafx.graphics:java.desktop/sun.awt=javafx.graphics:java.xml/com.sun.org.apache.xerces.internal.util=javafx.graphics"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom,java.desktop"/>
+			<attribute name="add-exports" value="java.base/sun.security.util=javafx.graphics"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.graphics/.settings/org.eclipse.core.resources.prefs b/modules/javafx.graphics/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.graphics/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.graphics/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.graphics/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.graphics/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.media/.classpath b/modules/javafx.media/.classpath
index dc69b42d92..0beefcfdbc 100644
--- a/modules/javafx.media/.classpath
+++ b/modules/javafx.media/.classpath
@@ -20,7 +20,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.media/.settings/org.eclipse.core.resources.prefs b/modules/javafx.media/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.media/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.media/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.media/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.media/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.swing/.classpath b/modules/javafx.swing/.classpath
index 4ecd3a6bfb..6e479e38ff 100644
--- a/modules/javafx.swing/.classpath
+++ b/modules/javafx.swing/.classpath
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/module-info"/>
 	<classpathentry kind="src" output="testbin" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="testbin" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/graphics">
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
@@ -23,16 +17,12 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
+			<attribute name="add-exports" value="java.desktop/java.awt.dnd.peer=javafx.swing:java.desktop/sun.awt=javafx.swing:java.desktop/sun.awt.dnd=javafx.swing:java.desktop/sun.swing=javafx.swing"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/modules/javafx.swing/.settings/org.eclipse.core.resources.prefs b/modules/javafx.swing/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.swing/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.swing/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.swing/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.swing/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.swt/.classpath b/modules/javafx.swt/.classpath
index 66917eb8a0..0224cc2ec6 100644
--- a/modules/javafx.swt/.classpath
+++ b/modules/javafx.swt/.classpath
@@ -1,24 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java">
+	<classpathentry kind="src" output="testbin" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources">
+	<classpathentry kind="src" output="testbin" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+	<classpathentry kind="lib" path="/rt/build/libs/swt-debug.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED:javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED:javafx.graphics/com.sun.javafx.cursor=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="/graphics"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.javafx.cursor=ALL-UNNAMED:javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED:javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/base">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/modules/javafx.swt/.settings/org.eclipse.core.resources.prefs b/modules/javafx.swt/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.swt/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.swt/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.swt/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.swt/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/modules/javafx.web/.classpath b/modules/javafx.web/.classpath
index 6345661a36..b6d8b15219 100644
--- a/modules/javafx.web/.classpath
+++ b/modules/javafx.web/.classpath
@@ -24,12 +24,6 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/native/WebKitBuild/Release/WebCore/generated/java">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/media">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -51,7 +45,7 @@
 			<attribute name="add-exports" value="javafx.base/com.sun.javafx=javafx.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -59,8 +53,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="java.management/java.lang.management=javafx.web"/>
-			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom"/>
+			<attribute name="add-reads" value="javafx.web=java.management"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
diff --git a/modules/javafx.web/.settings/org.eclipse.core.resources.prefs b/modules/javafx.web/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/modules/javafx.web/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/modules/javafx.web/.settings/org.eclipse.core.runtime.prefs b/modules/javafx.web/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/modules/javafx.web/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/.classpath b/tests/.classpath
index 1df9e21f89..1b4192f0ec 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -1,14 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <!--
-    <classpathentry kind="src" path="functional/animation"/>
-    -->
-    <classpathentry kind="src" path="manual/printing"/>
-    <classpathentry kind="src" path="performance/VMPerformance/src"/>
-    <classpathentry kind="src" path="system/src/test/java"/>
-    <classpathentry kind="src" path="system/src/test/resources"/>
-    <classpathentry combineaccessrules="false" kind="src" path="/rt"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="manual/printing"/>
+	<classpathentry kind="src" path="performance/VMPerformance/src"/>
+	<classpathentry kind="src" output="testbin" path="system/src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="testbin" path="system/src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/fxml">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED:javafx.graphics/javafx.scene.shape=ALL-UNNAMED:javafx.graphics/javafx.scene=ALL-UNNAMED:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED:javafx.graphics/com.sun.glass.events=ALL-UNNAMED:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/base">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.base/com.sun.javafx=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.controls/test.com.sun.javafx.scene.control.infrastructure=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/web">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/swing">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/.settings/org.eclipse.core.resources.prefs b/tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/.settings/org.eclipse.core.runtime.prefs b/tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/system/.classpath b/tests/system/.classpath
new file mode 100644
index 0000000000..7a132a4897
--- /dev/null
+++ b/tests/system/.classpath
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="testbin" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/testapp1/java"/>
+	<classpathentry kind="src" path="src/test/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/swing">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/base">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.base/com.sun.javafx=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED:javafx.graphics/com.sun.glass.events=ALL-UNNAMED:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="add-exports" value="javafx.controls/test.com.sun.javafx.scene.control.infrastructure=ALL-UNNAMED"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/fxml">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/web">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/system/.project b/tests/system/.project
new file mode 100644
index 0000000000..3f4617117c
--- /dev/null
+++ b/tests/system/.project
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>systemTests</name>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/system/.settings/org.eclipse.core.resources.prefs b/tests/system/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/tests/system/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/system/.settings/org.eclipse.core.runtime.prefs b/tests/system/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/system/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n