Fix for bug 419811 - Reverting changes made for bug 419811 and 416911
diff --git a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
index 16c0fd2..2e65599 100644
--- a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.tests;singleton:=true
Bundle-Version: 3.3.300.qualifier
+Bundle-ClassPath: .
Bundle-Activator: org.eclipse.jdt.apt.pluggable.tests.Apt6TestsPlugin
Bundle-Localization: plugin
Require-Bundle: org.junit,
diff --git a/org.eclipse.jdt.apt.tests/build.properties b/org.eclipse.jdt.apt.tests/build.properties
index 06c47cf..b49f00a 100644
--- a/org.eclipse.jdt.apt.tests/build.properties
+++ b/org.eclipse.jdt.apt.tests/build.properties
@@ -5,8 +5,6 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-source.. = src-bundle/
-output.. = bin/
source.apt.jar = src/
source.aptext.jar = srcext/
output.apt.jar = bin/
@@ -16,7 +14,6 @@
resources/,\
*.jar,\
about.html,\
- plugin.properties\
- .
+ plugin.properties
src.includes = about.html
-jars.compile.order = aptext.jar,apt.jar
+jars.compile.order = aptext.jar,apt.jar
\ No newline at end of file
diff --git a/org.eclipse.jdt.apt.tests/src-bundle/org/eclipse/jdt/apt/tests/TestAll.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java
similarity index 100%
rename from org.eclipse.jdt.apt.tests/src-bundle/org/eclipse/jdt/apt/tests/TestAll.java
rename to org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java
diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
index 25dacce..bf3ad94 100644
--- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@
org.eclipse.jdt.core;bundle-version="3.5.0",
org.eclipse.core.resources,
org.eclipse.core.runtime
+Bundle-ClassPath: compilerapttests.jar
Export-Package: org.eclipse.jdt.compiler.apt.tests,
org.eclipse.jdt.compiler.apt.tests.annotations,
org.eclipse.jdt.compiler.apt.tests.processors.base,
diff --git a/org.eclipse.jdt.compiler.apt.tests/build.properties b/org.eclipse.jdt.compiler.apt.tests/build.properties
index 510dad1..9c72f16 100644
--- a/org.eclipse.jdt.compiler.apt.tests/build.properties
+++ b/org.eclipse.jdt.compiler.apt.tests/build.properties
@@ -8,16 +8,17 @@
# Contributors:
# wharley@bea.com - initial API and implementation
###############################################################################
-source.. = src/
-output.. = bin/
-source.lib/apttestprocessors.jar = processors/
bin.includes = about.html,\
plugin.properties,\
test.xml,\
+ compilerapttests.jar,\
META-INF/,\
- resources/,\
- lib/,\
- .
+ lib/apttestprocessors.jar,\
+ resources/
src.includes = about.html
-jars.compile.order = lib/apttestprocessors.jar,.
+source.compilerapttests.jar = src/
+jars.compile.order = compilerapttests.jar,\
+ lib/apttestprocessors.jar
+source.lib/apttestprocessors.jar = processors/
+output.compilerapttests.jar = bin/
compilerArg=-proc:none
\ No newline at end of file
diff --git a/org.eclipse.jdt.compiler.apt.tests/pom.xml b/org.eclipse.jdt.compiler.apt.tests/pom.xml
index ee5c307..ef430aa 100644
--- a/org.eclipse.jdt.compiler.apt.tests/pom.xml
+++ b/org.eclipse.jdt.compiler.apt.tests/pom.xml
@@ -26,16 +26,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib/</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
diff --git a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
index c2d1682..6f3de6a 100644
--- a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@
org.junit,
org.eclipse.test.performance,
org.eclipse.jdt.core.tests.compiler
+Bundle-ClassPath: compilertooltests.jar
Export-Package: org.eclipse.jdt.compiler.tool.tests
Import-Package: org.eclipse.jdt.internal.compiler.tool
Eclipse-BundleShape: dir
diff --git a/org.eclipse.jdt.compiler.tool.tests/build.properties b/org.eclipse.jdt.compiler.tool.tests/build.properties
index 072da6f..515fd65 100644
--- a/org.eclipse.jdt.compiler.tool.tests/build.properties
+++ b/org.eclipse.jdt.compiler.tool.tests/build.properties
@@ -12,7 +12,8 @@
about.html,\
plugin.properties,\
test.xml,\
- .
+ compilertooltests.jar
+
src.includes = about.html
-source.. = src/
-output.. = bin/
+source.compilertooltests.jar = src/
+output.compilertooltests.jar = bin/
diff --git a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
index b955429..07a4562 100644
--- a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core.tests.builder; singleton:=true
Bundle-Version: 3.8.2.qualifier
+Bundle-ClassPath: jdtcoretestsbuilder.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jdt.core.tests.builder
diff --git a/org.eclipse.jdt.core.tests.builder/build.properties b/org.eclipse.jdt.core.tests.builder/build.properties
index 73af4c9..a51d207 100644
--- a/org.eclipse.jdt.core.tests.builder/build.properties
+++ b/org.eclipse.jdt.core.tests.builder/build.properties
@@ -11,9 +11,9 @@
bin.includes = plugin.xml,\
test.xml,\
about.html,\
- .,\
+ jdtcoretestsbuilder.jar,\
META-INF/,\
plugin.properties
-source.. = src/
-output.. = bin/
+source.jdtcoretestsbuilder.jar = src/
+output.jdtcoretestsbuilder.jar = bin/
src.includes=about.html
diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
index bf25427..917cd3e 100644
--- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core.tests.compiler
Bundle-Version: 3.9.0.qualifier
+Bundle-ClassPath: jdtcoretestscompiler.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jdt.core.tests.compiler.parser,
diff --git a/org.eclipse.jdt.core.tests.compiler/build.properties b/org.eclipse.jdt.core.tests.compiler/build.properties
index 156f8d4..2f28c52 100644
--- a/org.eclipse.jdt.core.tests.compiler/build.properties
+++ b/org.eclipse.jdt.core.tests.compiler/build.properties
@@ -10,10 +10,10 @@
###############################################################################
bin.includes = test.xml,\
about.html,\
- .,\
+ jdtcoretestscompiler.jar,\
META-INF/,\
plugin.properties,\
workspace/
-source.. = src/
-output.. = bin/
+source.jdtcoretestscompiler.jar = src/
+output.jdtcoretestscompiler.jar = bin/
src.includes = about.html
diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
index 72f29f0..ebd8999 100644
--- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core.tests.model;singleton:=true
Bundle-Version: 3.9.0.qualifier
+Bundle-ClassPath: jdtcoretestsmodel.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jdt.core.tests,
diff --git a/org.eclipse.jdt.core.tests.model/build.properties b/org.eclipse.jdt.core.tests.model/build.properties
index e3f2f4f..06adb5c 100644
--- a/org.eclipse.jdt.core.tests.model/build.properties
+++ b/org.eclipse.jdt.core.tests.model/build.properties
@@ -12,10 +12,10 @@
plugin.properties,\
test.xml,\
about.html,\
- .,\
+ jdtcoretestsmodel.jar,\
JCL/,\
workspace/,\
META-INF/
src.includes = about.html
-source.. = src/
-output.. = bin/
+source.jdtcoretestsmodel.jar = src/
+output.jdtcoretestsmodel.jar = bin/
diff --git a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
index 6c63f8f..00d2ef3 100644
--- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core.tests.performance
Bundle-Version: 3.8.1.qualifier
+Bundle-ClassPath: jdtcoretestsperf.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jdt.core.tests.performance,
diff --git a/org.eclipse.jdt.core.tests.performance/build.properties b/org.eclipse.jdt.core.tests.performance/build.properties
index c3cfb24..d962a6c 100644
--- a/org.eclipse.jdt.core.tests.performance/build.properties
+++ b/org.eclipse.jdt.core.tests.performance/build.properties
@@ -10,10 +10,10 @@
###############################################################################
bin.includes = test.xml,\
about.html,\
- .,\
+ jdtcoretestsperf.jar,\
local_test.xml,\
META-INF/,\
plugin.properties
src.includes = about.html
-source.. = src/
-output.. = bin/
+source.jdtcoretestsperf.jar = src/
+output.jdtcoretestsperf.jar = bin/
