Bug 419524 - Get rid of nested jars in test bundlesI20150217-0800I20150210-0800

This prevents workspace "dirt" at build time

Change-Id: I5f81a22f70525d2296f3e4eeebba760add68ab19
Signed-off-by: Mat Booth <mat.booth@redhat.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
index 111dde472..12ebdfcee 100644
--- a/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.expressions.tests; singleton:=true
 Bundle-Version: 3.4.700.qualifier
-Bundle-ClassPath: expressionstests.jar
 Bundle-Activator: org.eclipse.core.internal.expressions.tests.ExpressionTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.core.expressions.tests/build.properties b/tests/org.eclipse.core.expressions.tests/build.properties
index 465610cdd..14e7155b6 100644
--- a/tests/org.eclipse.core.expressions.tests/build.properties
+++ b/tests/org.eclipse.core.expressions.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,12 +7,13 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mat Booth (Red Hat Inc) - 419524 Get rid of nested jars
 ###############################################################################
+source.. = src/
 bin.includes = plugin.xml,\
                test.xml,\
                about.html,\
                plugin.properties,\
-               *.jar,\
+               .,\
                META-INF/
 src.includes = about.html
-source.expressionstests.jar = src/
diff --git a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
index 7e3e59d70..77f6be3b3 100644
--- a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Harness
 Bundle-SymbolicName: org.eclipse.core.tests.harness; singleton:=true
 Bundle-Version: 3.10.100.qualifier
-Bundle-ClassPath: testharness.jar
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.harness,
diff --git a/tests/org.eclipse.core.tests.harness/build.properties b/tests/org.eclipse.core.tests.harness/build.properties
index 63b6523d0..392d627de 100644
--- a/tests/org.eclipse.core.tests.harness/build.properties
+++ b/tests/org.eclipse.core.tests.harness/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,9 +7,10 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mat Booth (Red Hat Inc) - 419524 Get rid of nested jars
 ###############################################################################
-source.testharness.jar=src/
-bin.includes = testharness.jar,\
+source.. = src/
+bin.includes = .,\
                about.html,\
                META-INF/
 src.includes = about.html
diff --git a/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
index 7518da9d7..1a1ead496 100644
--- a/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Runtime
 Bundle-SymbolicName: org.eclipse.core.tests.runtime; singleton:=true
 Bundle-Version: 3.10.0.qualifier
-Bundle-ClassPath: runtimetests.jar
 Bundle-Activator: org.eclipse.core.tests.runtime.RuntimeTestsPlugin
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.internal.preferences,
diff --git a/tests/org.eclipse.core.tests.runtime/build.properties b/tests/org.eclipse.core.tests.runtime/build.properties
index c8d46f966..55a750734 100644
--- a/tests/org.eclipse.core.tests.runtime/build.properties
+++ b/tests/org.eclipse.core.tests.runtime/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,14 +7,15 @@
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Mat Booth (Red Hat Inc) - 419524 Get rid of nested jars
 ###############################################################################
-source.runtimetests.jar = src/
+source.. = src/
 bin.includes = plugin.xml,\
-               *.jar,\
+               .,\
                Plugin_Testing/,\
                about.html,\
                META-INF/,\
                test.xml,\
                testData/
 src.includes = about.html
-javacWarnings.runtimetests.jar=-unchecked,-raw
+javacWarnings..=-unchecked,-raw