Revert "Bug 461059 - Prevent dirt in workspace"
This reverts commit cd4c1939d3f8a1052fb4240e22bb5479528d5fc1.
Change-Id: I303e1396486ba332bd60f936ef7a35b8f635b456
diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 153198c..a8177c3 100644
--- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@
org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: .
+Bundle-ClassPath: ua-tests.jar
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,3 +66,4 @@
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 6857a36..74abeb4 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,10 +21,12 @@
jsp/,\
script/,\
service/
-output.. = bin/
-source.. = base/,\
+jars.compile.order = ua-tests.jar
+output.ua-tests.jar = bin/
+source.ua-tests.jar = 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 069b957..e4ca8ac 100644
--- a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
@@ -15,9 +15,10 @@
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: .
+Bundle-ClassPath: universal.jar
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 7b7018b..a45f903 100644
--- a/org.eclipse.ui.intro.universal/build.properties
+++ b/org.eclipse.ui.intro.universal/build.properties
@@ -16,7 +16,8 @@
META-INF/,\
.options,\
about.html,\
- .
+ universal.jar
src.includes = about.html
-source.. = src/
-output.. = bin/
+jars.compile.order = universal.jar
+source.universal.jar = src/
+output.universal.jar = bin/
