aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2013-09-14 05:55:54 (EDT)
committerGerrit Code Review @ Eclipse.org2013-10-11 09:21:57 (EDT)
commita2e39bc1d907bbcec1251d229865f13b38f39cd9 (patch)
tree2a47cde5f35c48dc2f387c3cb426c439557a9da0
parent011ecdadcea6ecd655939c906d404ab5f36658db (diff)
downloadeclipse.platform.ui-a2e39bc1d907bbcec1251d229865f13b38f39cd9.zip
eclipse.platform.ui-a2e39bc1d907bbcec1251d229865f13b38f39cd9.tar.gz
eclipse.platform.ui-a2e39bc1d907bbcec1251d229865f13b38f39cd9.tar.bz2
Bug 417252: Get rid of nested jars in testsrefs/changes/30/16430/2
Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--tests/org.eclipse.jface.tests.databinding.conformance/build.properties2
-rw-r--r--tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.jface.tests.databinding/build.properties8
-rw-r--r--tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.ui.tests.browser/build.properties5
-rwxr-xr-xtests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF1
-rwxr-xr-xtests/org.eclipse.ui.tests.forms/build.properties7
-rw-r--r--tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.ui.tests.navigator/build.properties10
-rw-r--r--tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.ui.tests.performance/build.properties4
-rw-r--r--tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.ui.tests.rcp/build.properties7
-rw-r--r--tests/org.eclipse.ui.tests.views.properties.tabbed/build.properties6
-rw-r--r--tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.ui.tests/build.properties10
16 files changed, 28 insertions, 38 deletions
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/build.properties b/tests/org.eclipse.jface.tests.databinding.conformance/build.properties
index cc15552..9b72045 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/build.properties
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/build.properties
@@ -12,6 +12,6 @@ bin.includes = .,\
META-INF/,\
plugin.properties,\
about.html
-output.databinding.jar = bin/
+output.. = bin/
src.includes = about.html
source.. = src/
diff --git a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
index 885e180..373d524 100644
--- a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jface.tests.databinding
Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: jfacebindingtests.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
diff --git a/tests/org.eclipse.jface.tests.databinding/build.properties b/tests/org.eclipse.jface.tests.databinding/build.properties
index e671f5a..634b51b 100644
--- a/tests/org.eclipse.jface.tests.databinding/build.properties
+++ b/tests/org.eclipse.jface.tests.databinding/build.properties
@@ -8,13 +8,13 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source.jfacebindingtests.jar = src/
-
+source.. = src/
+
src.includes = about.html
-output.jfacebindingtests.jar = bin/
+output.. = bin/
bin.includes = META-INF/,\
about.html,\
test.xml,\
*.html,\
- jfacebindingtests.jar,\
+ .,\
plugin.properties
diff --git a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
index d4216ad..a7d2038 100644
--- a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.tests.browser;singleton:=true
Bundle-Version: 3.1.0
-Bundle-ClassPath: browser.jar
Bundle-Activator: org.eclipse.ui.tests.browser.internal.WebBrowserTestsPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.ui.tests.browser/build.properties b/tests/org.eclipse.ui.tests.browser/build.properties
index 4f26751..7874f2e 100644
--- a/tests/org.eclipse.ui.tests.browser/build.properties
+++ b/tests/org.eclipse.ui.tests.browser/build.properties
@@ -13,10 +13,9 @@ bin.includes = icons/,\
plugin.xml,\
about.html,\
.,\
- browser.jar,\
test.xml,\
META-INF/
src.includes = about.html
jars.compile.order = browser.jar
-source.browser.jar = src/
-output.browser.jar = bin/
+source.. = src/
+output.. = bin/
diff --git a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
index 1aa2611..1e8ee28 100755
--- a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui,
org.junit
Eclipse-LazyStart: true
Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: forms-tests.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.forms/build.properties b/tests/org.eclipse.ui.tests.forms/build.properties
index 2cc62f5..309b68d 100755
--- a/tests/org.eclipse.ui.tests.forms/build.properties
+++ b/tests/org.eclipse.ui.tests.forms/build.properties
@@ -8,10 +8,9 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-bin.includes = forms-tests.jar,\
+bin.includes = .,\
META-INF/,\
about.html,\
test.xml
-jars.compile.order = forms-tests.jar
-output.forms-tests.jar = bin/
-source.forms-tests.jar = forms/
+output.. = bin/
+source.. = forms/
diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
index f6e6fb3..81a1f77 100644
--- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.ui.tests.harness,
org.eclipse.ui.editors
Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: uinavtests.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.ui.tests.navigator
diff --git a/tests/org.eclipse.ui.tests.navigator/build.properties b/tests/org.eclipse.ui.tests.navigator/build.properties
index b422443..7401bf9 100644
--- a/tests/org.eclipse.ui.tests.navigator/build.properties
+++ b/tests/org.eclipse.ui.tests.navigator/build.properties
@@ -8,10 +8,10 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source.uinavtests.jar = src/
-
-javacWarnings.uinavtests.jar=-deadCode
-
+source.. = src/
+
+javacWarnings..=-deadCode
+
src.includes = about.html
output.uinavtests.jar = bin/
bin.includes = testdata/,\
@@ -20,6 +20,6 @@ bin.includes = testdata/,\
test.xml,\
plugin.xml,\
*.html,\
- *.jar,\
+ .,\
*.xml,\
plugin.properties
diff --git a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
index 7a5dfd4..7304fb8 100644
--- a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Performance Plug-in
-Bundle-ClassPath: uiperformance.jar
Bundle-SymbolicName: org.eclipse.ui.tests.performance;singleton:=true
Bundle-Version: 1.1.500.qualifier
Bundle-Activator: org.eclipse.ui.tests.performance.UIPerformancePlugin
diff --git a/tests/org.eclipse.ui.tests.performance/build.properties b/tests/org.eclipse.ui.tests.performance/build.properties
index 1fbec33..29f508c 100644
--- a/tests/org.eclipse.ui.tests.performance/build.properties
+++ b/tests/org.eclipse.ui.tests.performance/build.properties
@@ -8,10 +8,10 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source.uiperformance.jar = src/
+source.. = src/
bin.includes = plugin.xml,\
test.xml,\
META-INF/,\
icons/,\
- uiperformance.jar,\
+ .,\
data/ \ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
index c7738e8..7439a7d 100644
--- a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.tests.rcp; singleton:=true
Bundle-Version: 3.3.200.qualifier
-Bundle-ClassPath: rcptests.jar
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime.compatibility,
diff --git a/tests/org.eclipse.ui.tests.rcp/build.properties b/tests/org.eclipse.ui.tests.rcp/build.properties
index 5ae693e..b91761d 100644
--- a/tests/org.eclipse.ui.tests.rcp/build.properties
+++ b/tests/org.eclipse.ui.tests.rcp/build.properties
@@ -12,10 +12,9 @@ bin.includes = plugin.properties,\
plugin.xml,\
test.xml,\
*.html,\
- *.jar,\
- rcptests.jar,\
+ .,\
META-INF/
src.includes = about.html
jars.compile.order = rcptests.jar
-source.rcptests.jar = Eclipse RCP Tests/
-output.rcptests.jar = bin/
+source.. = Eclipse RCP Tests/
+output.. = bin/
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/build.properties b/tests/org.eclipse.ui.tests.views.properties.tabbed/build.properties
index 8f2c68b..34558d2 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/build.properties
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/build.properties
@@ -13,10 +13,10 @@ bin.includes = plugin.xml,\
META-INF/,\
about.html,\
test.xml,\
- uitptests.jar,\
+ .,\
plugin.properties
src.includes = about.html
jars.compile.order = uitptests.jar
-source.uitptests.jar = src/
-output.uitptests.jar = bin/
+source.. = src/
+output.. = bin/
diff --git a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
index 7f52909..adf67e6 100644
--- a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Eclipse UI Tests
Bundle-SymbolicName: org.eclipse.ui.tests; singleton:=true
Bundle-Version: 3.9.0.qualifier
Eclipse-BundleShape: dir
-Bundle-ClassPath: uitests.jar
Bundle-Activator: org.eclipse.ui.tests.TestPlugin
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime.compatibility,
diff --git a/tests/org.eclipse.ui.tests/build.properties b/tests/org.eclipse.ui.tests/build.properties
index c58a03e..e89ea76 100644
--- a/tests/org.eclipse.ui.tests/build.properties
+++ b/tests/org.eclipse.ui.tests/build.properties
@@ -8,17 +8,17 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source.uitests.jar = Eclipse JFace Tests/,\
- Eclipse UI Tests/,\
- Eclipse Part References Test/,\
- Benchmark Tests/
+source.. = Eclipse JFace Tests/,\
+ Eclipse UI Tests/,\
+ Eclipse Part References Test/,\
+ Benchmark Tests/
bin.includes = icons/,\
doc/,\
data/,\
plugin.xml,\
*.html,\
- *.jar,\
+ .,\
*.xml,\
uiSniff,\
uiSniff.bat,\