Apply partial jdktools patch for HARMONY-6477 (Problems building jdktools modules in Eclipse).
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk@925287 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/jdktools/META-INF/MANIFEST.MF b/modules/jdktools/META-INF/MANIFEST.MF
index 5d31111..1814c18 100644
--- a/modules/jdktools/META-INF/MANIFEST.MF
+++ b/modules/jdktools/META-INF/MANIFEST.MF
@@ -5,17 +5,17 @@
Implementation-Vendor: The Apache Software Foundation
Implementation-Vendor-Id: org.apache.harmony
Implementation-URL: http://harmony.apache.org
-Class-Path: com.ibm.icu.base_3.6.1.v20070417.jar
- ecj-3.5.1.jar
- jdimodel.jar
- jdtstub.jar
Bundle-ManifestVersion: 2
Bundle-Name: Harmony Tools
Bundle-SymbolicName: org.apache.harmony.tools
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Eclipse-JREBundle: true
-Import-Package: java.io,
+Import-Package: java.applet,
+ java.awt,
+ java.awt.event,
+ java.beans,
+ java.io,
java.lang,
java.lang.reflect,
java.math,
@@ -24,11 +24,24 @@
java.nio.charset,
java.security,
java.security.cert,
+ java.text,
java.util,
java.util.jar,
java.util.logging,
+ java.util.zip,
+ javax.accessibility,
javax.crypto,
javax.security.auth.x500,
+ javax.sound.sampled,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.text,
+ javax.swing.text.html,
+ javax.swing.text.html.parser,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
org.apache.harmony.kernel.vm,
org.apache.harmony.luni.util,
org.apache.harmony.pack200,
diff --git a/modules/jdktools/build.xml b/modules/jdktools/build.xml
index 78d6bf2..9ae5a6e 100644
--- a/modules/jdktools/build.xml
+++ b/modules/jdktools/build.xml
@@ -39,6 +39,13 @@
dest="${jdt.jdimodel.jar}" />
<check-one-file src="${icu.url}" dest="${icu.jar}" />
<check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
+ <check-one-file src="${bcel.jar.url}" dest="${bcel.jar}" />
+ <copy todir="${hy.hdk}/jdk/jre/lib/boot">
+ <fileset dir="${depends.jars}">
+ <patternset includes="${bcel.version}/*.jar" />
+ </fileset>
+ <fileset dir="depends/manifests"/>
+ </copy>
</target>
<target name="fetch-depends">
@@ -46,7 +53,6 @@
<fetch dep="jdt.jdimodel.jar"/>
</target>
-
<target name="build" depends="check-depends, build-java" />
<target name="build-java" depends="compile-java, build-jar" />
<target name="build-native" />
diff --git a/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF b/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cca3a2b
--- /dev/null
+++ b/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: BCEL
+Bundle-SymbolicName: org.apache.bcel;singleton:=true
+Bundle-Version: 5.2
+Bundle-ClassPath: bcel-5.2.jar
+Eclipse-JREBundle: true
+Import-Package: java.lang
+Export-Package: org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.util,
+ org.apache.bcel.generic
diff --git a/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java b/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
index eb7ca6c..d4d4a01 100644
--- a/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
+++ b/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
@@ -16,7 +16,7 @@
*/
package org.apache.harmony.tests.tools.javah;
-import Test.*;
+import org.apache.harmony.tests.tools.javah.Test.*;
public class Test02 extends Test01 {
diff --git a/modules/jretools/META-INF/MANIFEST.MF b/modules/jretools/META-INF/MANIFEST.MF
index cefdf92..71604ba 100644
--- a/modules/jretools/META-INF/MANIFEST.MF
+++ b/modules/jretools/META-INF/MANIFEST.MF
@@ -11,7 +11,10 @@
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Eclipse-JREBundle: true
-Import-Package: java.io,
+Import-Package: java.awt,
+ java.awt.event,
+ java.beans,
+ java.io,
java.lang,
java.lang.reflect,
java.math,
@@ -23,8 +26,12 @@
java.util,
java.util.jar,
java.util.logging,
+ javax.accessibility,
javax.crypto,
javax.security.auth.x500,
+ javax.swing,
+ javax.swing.event,
+ javax.swing.text,
org.apache.harmony.kernel.vm,
org.apache.harmony.luni.util,
org.apache.harmony.pack200,
@@ -33,7 +40,8 @@
org.apache.harmony.security.provider.cert;version="1.0.0",
org.apache.harmony.security.utils;version="1.0.0",
org.apache.harmony.security.x501;version="1.0.0",
- org.apache.harmony.security.x509;version="1.0.0"
+ org.apache.harmony.security.x509;version="1.0.0",
+ org.apache.harmony.unpack200
Export-Package: org.apache.harmony.jretools.keytool,
org.apache.harmony.jretools.unpack200,
org.apache.harmony.jretools.pack200,
