Mark test source folders as such to fix building with 2018-12.

And some reorganization caused by refreshing projects.

Change-Id: If6a6d04e8081c483660a135f5745ce3adc9f0dce
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/133266
Tested-by: CI Bot

10 files changed, 35 insertions, 15 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.core/.classpath b/containers/org.eclipse.linuxtools.docker.core/.classpath
index 5f81a2705a..cf36b56119 100644
--- a/containers/org.eclipse.linuxtools.docker.core/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.core/.project b/containers/org.eclipse.linuxtools.docker.core/.project
index 323fc44dd1..010ec3d51c 100644
--- a/containers/org.eclipse.linuxtools.docker.core/.project
+++ b/containers/org.eclipse.linuxtools.docker.core/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath b/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
index cf36b56119..cc5ee2dc8c 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src/">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/.classpath b/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
index cf36b56119..f193818786 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
index 43b986286a..cc5ee2dc8c 100644
--- a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath b/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
index cf36b56119..cc5ee2dc8c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src/">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.ui/.project b/containers/org.eclipse.linuxtools.docker.ui/.project
index e1dad81450..aa628e496c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/.project
+++ b/containers/org.eclipse.linuxtools.docker.ui/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/.project b/vagrant/org.eclipse.linuxtools.vagrant.core/.project
index ea1fb08379..0cfffe08c8 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/.project
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/.project b/vagrant/org.eclipse.linuxtools.vagrant.ui/.project
index 25e81877c1..08ebdbb514 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/.project
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
index 43b986286a..f193818786 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>