Bug 461059 - Prevent dirt in workspace

Make o.e.ua.tests and o.e.ui.intro.universal don't use inner jars. There
is no real need for them. Intro.universal still works fine and all tests
in ua.tests work that way.

Change-Id: I7a72f16cb67ec32781129bfe5d5a20c421465884
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

4 files changed, 8 insertions, 13 deletions

diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index a8177c3b2..153198c9d 100644
--- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.junit,
  org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: ua-tests.jar
+Bundle-ClassPath: .
 Import-Package: javax.servlet;version="2.4.0",
  javax.servlet.http;version="2.4.0",
  org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
@@ -66,4 +66,3 @@ Export-Package: org.eclipse.ua.tests,
  org.eclipse.ua.tests.plugin,
  org.eclipse.ua.tests.util,
  org.eclipse.ua.tests.browser
-Eclipse-BundleShape: dir
diff --git a/org.eclipse.ua.tests/build.properties b/org.eclipse.ua.tests/build.properties
index 74abeb4e3..6857a36d6 100644
--- a/org.eclipse.ua.tests/build.properties
+++ b/org.eclipse.ua.tests/build.properties
@@ -11,7 +11,7 @@
 bin.includes = plugin.xml,\
                icons/,\
                test.xml,\
-               ua-tests.jar,\
+               .,\
                data/,\
                META-INF/,\
                doc.zip,\
@@ -21,12 +21,10 @@ bin.includes = plugin.xml,\
                jsp/,\
                script/,\
                service/
-jars.compile.order = ua-tests.jar
-output.ua-tests.jar = bin/
-source.ua-tests.jar = base/,\
+output.. = bin/
+source.. = base/,\
                       browser/,\
                       cheatsheet/,\
                       help/,\
                       intro/
-javacWarnings.ua-tests.jar=-unavoidableGenericProblems
 
diff --git a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
index e4ca8ac94..069b9573d 100644
--- a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
@@ -15,10 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)"
 Eclipse-LazyStart: true; exceptions="org.eclipse.ui.internal.intro.universal.contentdetect"
 Bundle-Activator: org.eclipse.ui.internal.intro.universal.UniversalIntroPlugin
-Bundle-ClassPath: universal.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: javax.xml.parsers,
  org.w3c.dom,
  org.xml.sax
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.ui.internal.intro.universal.contentdetect"
-Eclipse-BundleShape: dir
diff --git a/org.eclipse.ui.intro.universal/build.properties b/org.eclipse.ui.intro.universal/build.properties
index a45f90336..7b7018bab 100644
--- a/org.eclipse.ui.intro.universal/build.properties
+++ b/org.eclipse.ui.intro.universal/build.properties
@@ -16,8 +16,7 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .options,\
                about.html,\
-               universal.jar
+               .
 src.includes = about.html
-jars.compile.order = universal.jar
-source.universal.jar = src/
-output.universal.jar = bin/
+source.. = src/
+output.. = bin/