[icedtea-web] RFC: Check for AppletViewerPanel being public
Dr Andrew John Hughes
ahughes at redhat.com
Wed Dec 1 14:48:35 PST 2010
On 22:42 Wed 01 Dec , Dr Andrew John Hughes wrote:
> IcedTea-Web relies on a patch in IcedTea6/7, applet_hole.patch,
> which makes sun.applet.AppletViewerPanel public. This checks this
> has been applied to the build JVM.
>
> 2010-12-01 Andrew John Hughes <ahughes at redhat.com>
>
> * acinclude.m4:
> (IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE):
> New check to ensure sun.applet.AppletViewerPanel
> is public (via the patch in IcedTea, applet_hole.patch).
> * configure.ac: Invoke the above macro. Don't call
> IT_CHECK_FOR_CLASS for the same class (the above macro
> handles this too).
>
> Ok to push?
> --
> Andrew :)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
> diff -r a3cb4fec78a9 acinclude.m4
> --- a/acinclude.m4 Wed Dec 01 16:46:28 2010 -0500
> +++ b/acinclude.m4 Wed Dec 01 22:39:38 2010 +0000
> @@ -605,3 +605,65 @@
> AC_SUBST(JAVADOC_KNOWS_J_OPTIONS)
> AM_CONDITIONAL([JAVADOC_SUPPORTS_J_OPTIONS], test x"${JAVADOC_KNOWS_J_OPTIONS}" = "xyes")
> ])
> +
> +dnl Checks that sun.applet.AppletViewerPanel is available
> +dnl and public (via the patch in IcedTea6, applet_hole.patch)
> +dnl Can be removed when that is upstream or unneeded
> +AC_DEFUN([IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE],[
> +AC_REQUIRE([IT_FIND_JAVAC])
> +AC_REQUIRE([IT_FIND_JAVA])
> +AC_CACHE_CHECK([if sun.applet.AppletViewerPanel is available and public], it_cv_applet_hole, [
> +CLASS=TestAppletViewer.java
> +BYTECODE=$(echo $CLASS|sed 's#\.java##')
> +mkdir -p tmp.$$
> +cd tmp.$$
> +cat << \EOF > $CLASS
> +[/* [#]line __oline__ "configure" */
> +import java.lang.reflect.Modifier;
> +
> +public class TestAppletViewer
> +{
> + public static void main(String[] args)
> + {
> + try
> + {
> + Class<?> clazz = Class.forName("sun.applet.AppletViewerPanel");
> + if (Modifier.isPublic(clazz.getModifiers()))
> + {
> + System.err.println("Found public sun.applet.AppletViewerPanel");
> + System.exit(0);
> + }
> + System.err.println("Found non-public sun.applet.AppletViewerPanel");
> + System.exit(2);
> + }
> + catch (ClassNotFoundException e)
> + {
> + System.err.println("Could not find sun.applet.AppletViewerPanel");
> + System.exit(1);
> + }
> + }
> +}
> +]
> +EOF
> +if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
> + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
> + it_cv_applet_hole=yes;
> + else
> + it_cv_applet_hole=$?;
> + fi
> +else
> + it_cv_applet_hole=3;
> +fi
> +])
> +rm -f $CLASS *.class
> +cd ..
> +rmdir tmp.$$
> +if test x"${it_cv_applet_hole}" = "x1"; then
> + AC_MSG_ERROR([sun.applet.AppletViewerPanel is not available.])
> +elif test x"${it_cv_applet_hole}" = "x2"; then
> + AC_MSG_ERROR([sun.applet.AppletViewerPanel is not public.])
> +elif test x"${it_cv_applet_hole}" = "x3"; then
> + AC_MSG_ERROR([Compilation failed. See config.log.])
> +fi
> +AC_PROVIDE([$0])dnl
> +])
> diff -r a3cb4fec78a9 configure.ac
> --- a/configure.ac Wed Dec 01 16:46:28 2010 -0500
> +++ b/configure.ac Wed Dec 01 22:39:38 2010 +0000
> @@ -69,7 +69,6 @@
> IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker])
> IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name])
> IT_CHECK_FOR_CLASS(SUN_MISC_BASE64ENCODER, [sun.misc.BASE64Encoder])
> -IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETVIEWERPANEL, [sun.applet.AppletViewerPanel])
> IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException])
> IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER,
> [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager])
> @@ -77,5 +76,6 @@
> IT_CHECK_FOR_CLASS(SUN_MISC_REF, [sun.misc.Ref])
> IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil])
> IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
> +IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
>
> AC_OUTPUT
Also the attached README update as part of this.
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r a3cb4fec78a9 README
--- a/README Wed Dec 01 16:46:28 2010 -0500
+++ b/README Wed Dec 01 22:47:48 2010 +0000
@@ -77,12 +77,17 @@
* /usr/lib/jvm/java-gcj
* /usr/lib/jvm/gcj-jdk
* /usr/lib/jvm/cacao
-in the order given above. Some currently fail.
+in the order given above.
-Most targets in IcedTea create stamp files in the stamps directory to
-determine what and when dependencies were compiled. Each target has a
-corresponding clean-x target which removes the output and the stamp
-file, allowing it to be rebuilt.
+At present, some of these options fail due to sun.* classes required
+by IcedTea-Web. Upstream OpenJDK will only be able to compile
+IcedTea-Web if the patch applet_hole.patch from IcedTea has been
+applied.
+
+Most targets in IcedTea-Web create stamp files in the stamps directory
+to determine what and when dependencies were compiled. Each target
+has a corresponding clean-x target which removes the output and the
+stamp file, allowing it to be rebuilt.
Build Modification Options
==========================
More information about the distro-pkg-dev
mailing list