read properties using System.getenv()

From jvanek at icedtea.classpath.org Thu Sep 1 03:17:37 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 01 Sep 2011 10:17:37 +0000 Subject: /hg/icedtea-web: made compatible with rhel5 libraries Message-ID: changeset 68a6e5d41dfc in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=68a6e5d41dfc author: Jiri Vanek date: Thu Sep 01 12:18:55 2011 +0200 made compatible with rhel5 libraries diffstat: ChangeLog | 13 +++++++++ Makefile.am | 1 + acinclude.m4 | 4 ++ configure.ac | 1 + plugin/icedteanp/IcedTeaNPPlugin.cc | 53 ++++++++++++++++++++++++++++-------- 5 files changed, 60 insertions(+), 12 deletions(-) diffs (133 lines): diff -r 7afd916031fa -r 68a6e5d41dfc ChangeLog --- a/ChangeLog Mon Aug 29 17:02:36 2011 -0400 +++ b/ChangeLog Thu Sep 01 12:18:55 2011 +0200 @@ -1,3 +1,16 @@ +2011-09-01 Jiri Vanek + Added functionality to allow icedtea web to be buildable with + rhel5 libraries. + *configure.ac: added IT_CHECK_GLIB_VERSION check. + *acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test. + version of glib installed and add LEGACY_GLIB define macro into + variable DEFS if version is <2.16. + *plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible + functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB + is defined. Added define sections for use this function instead of glib ones. + Duplicated code moved into function getFirstInTableInstance(GHashTble* table). + *Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation + 2011-08-29 Deepak Bhole RH734081: Javaws cannot use proxy settings from Firefox diff -r 7afd916031fa -r 68a6e5d41dfc Makefile.am --- a/Makefile.am Mon Aug 29 17:02:36 2011 -0400 +++ b/Makefile.am Thu Sep 01 12:18:55 2011 +0200 @@ -210,6 +210,7 @@ mkdir -p $(PLUGIN_DIR) && \ cd $(PLUGIN_DIR) && \ $(CXX) $(CXXFLAGS) \ + $(DEFS) \ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ diff -r 7afd916031fa -r 68a6e5d41dfc acinclude.m4 --- a/acinclude.m4 Mon Aug 29 17:02:36 2011 -0400 +++ b/acinclude.m4 Thu Sep 01 12:18:55 2011 +0200 @@ -484,6 +484,10 @@ AC_SUBST(PKGVERSION) ]) +AC_DEFUN_ONCE([IT_CHECK_GLIB_VERSION],[ + PKG_CHECK_MODULES([GLIB2_V_216],[glib-2.0 >= 2.16],[],[AC_DEFINE([LEGACY_GLIB])]) + ]) + AC_DEFUN([IT_CHECK_WITH_GCJ], [ AC_MSG_CHECKING([whether to compile ecj natively]) diff -r 7afd916031fa -r 68a6e5d41dfc configure.ac --- a/configure.ac Mon Aug 29 17:02:36 2011 -0400 +++ b/configure.ac Thu Sep 01 12:18:55 2011 +0200 @@ -80,6 +80,7 @@ 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 +IT_CHECK_GLIB_VERSION # # Find optional depedencies diff -r 7afd916031fa -r 68a6e5d41dfc plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Aug 29 17:02:36 2011 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Sep 01 12:18:55 2011 +0200 @@ -249,6 +249,45 @@ pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; + +#ifdef LEGACY_GLIB +// Returns key from first item stored in hashtable +gboolean +find_first_item_in_hash_table(gpointer key, gpointer value, gpointer user_data) +{ + user_data = key; + return (gboolean)TRUE; +} + +int +g_strcmp0(char *str1, char *str2) +{ + if (str1 != NULL) + return str2 != NULL ? strcmp(str1, str2) : 1; + else // str1 == NULL + return str2 != NULL ? 1 : 0; +} + + +#endif + + +/* + * Find first member in GHashTable* depending on version of glib + */ +gpointer getFirstInTableInstance(GHashTable* table) +{ + gpointer id, instance; + #ifndef LEGACY_GLIB + GHashTableIter iter; + g_hash_table_iter_init (&iter, table); + g_hash_table_iter_next (&iter, &instance, &id); + #else + g_hash_table_find(table, (GHRFunc)find_first_item_in_hash_table, &instance); + #endif + return instance; +} + // Functions prefixed by ITNP_ are instance functions. They are called // by the browser and operate on instances of ITNPPluginData. // Functions prefixed by plugin_ are static helper functions. @@ -915,12 +954,7 @@ if (browser_functions.getvalueforurl) { - GHashTableIter iter; - gpointer id, instance; - - g_hash_table_iter_init (&iter, instance_to_id_map); - g_hash_table_iter_next (&iter, &instance, &id); - + gpointer instance=getFirstInTableInstance(instance_to_id_map); return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len); } else { @@ -1367,12 +1401,7 @@ { // As in get_cookie_info, we use the first active instance - GHashTableIter iter; - gpointer id, instance; - - g_hash_table_iter_init (&iter, instance_to_id_map); - g_hash_table_iter_next (&iter, &instance, &id); - + gpointer instance=getFirstInTableInstance(instance_to_id_map); browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); } else { From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:10:48 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:10:48 +0000 Subject: [Bug 770] Zero + icedtea7 7033954 regression - missing mapfile-zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=770 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Andrew John Hughes 2011-09-02 03:10:47 --- Closing as fix is in. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:13:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:13:53 +0000 Subject: [Bug 716] IcedTea7 should bootstrap with IcedTea6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|2.0 |2.1 --- Comment #3 from Andrew John Hughes 2011-09-02 03:13:53 --- Deferring again to 2.1; we'll disable the check for IcedTea6 during full bootstrap in the meantime. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:14:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:14:29 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|716 | --- Comment #2 from Andrew John Hughes 2011-09-02 03:14:28 --- 716 deferred to 2.1. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:14:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:14:29 +0000 Subject: [Bug 716] IcedTea7 should bootstrap with IcedTea6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|712 | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:15:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:15:18 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |753, 757, 767, 770 --- Comment #3 from Andrew John Hughes 2011-09-02 03:15:17 --- Add all 2.0 bugs. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:15:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:15:18 +0000 Subject: [Bug 757] IA32 Hotspot FTBFS regression after 7009309 JSR292 fix In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=757 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |712 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:15:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:15:18 +0000 Subject: [Bug 767] Annotation Processing Filer.getResource() always throws FileNotFoundException In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=767 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |712 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:15:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:15:18 +0000 Subject: [Bug 753] [regression] Zero FTBFS on stack_zero.cpp : In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=753 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |712 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Sep 1 20:15:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 03:15:18 +0000 Subject: [Bug 770] Zero + icedtea7 7033954 regression - missing mapfile-zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=770 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |712 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at icedtea.classpath.org Fri Sep 2 01:38:01 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 02 Sep 2011 08:38:01 +0000 Subject: /hg/gfx-test: * src/org/gfxtest/testsuites/SpecialCases.java: Message-ID: changeset 6c985b5ee97e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6c985b5ee97e author: Pavel Tisnovsky date: Fri Sep 02 10:39:52 2011 +0200 * src/org/gfxtest/testsuites/SpecialCases.java: Added 6 new test cases, added JavaDoc to existing test cases. diffstat: ChangeLog | 4 + src/org/gfxtest/testsuites/SpecialCases.java | 406 ++++++++++++++++++++------ 2 files changed, 318 insertions(+), 92 deletions(-) diffs (467 lines): diff -r a70769863697 -r 6c985b5ee97e ChangeLog --- a/ChangeLog Fri Aug 19 16:06:59 2011 +0200 +++ b/ChangeLog Fri Sep 02 10:39:52 2011 +0200 @@ -1,3 +1,7 @@ +2011-09-02 Pavel Tisnovsky + * src/org/gfxtest/testsuites/SpecialCases.java: + Added 6 new test cases, added JavaDoc to existing test cases. + 2011-08-19 Pavel Tisnovsky * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by radial gradient diff -r a70769863697 -r 6c985b5ee97e src/org/gfxtest/testsuites/SpecialCases.java --- a/src/org/gfxtest/testsuites/SpecialCases.java Fri Aug 19 16:06:59 2011 +0200 +++ b/src/org/gfxtest/testsuites/SpecialCases.java Fri Sep 02 10:39:52 2011 +0200 @@ -46,14 +46,16 @@ import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; + + /** * This test renders various special cases, such as curves with cusps, curves * with identical control points, curves with width such that the offset curves * have cusps, curves with very high curvatures, paths such as moveTo(0, 0); - * p.lineTo(100,100);p.lineTo(100,100); (we test this last one to make sure - * that the join is drawn even though the lines are at an angle of 180 degrees. - * For each path, we draw it, and we also draw its stroked version. - * + * p.lineTo(100,100);p.lineTo(100,100); (we test this last one to make sure that + * the join is drawn even though the lines are at an angle of 180 degrees. For + * each path, we draw it, and we also draw its stroked version. + * * @author Pavel Tisnovsky * @author Denis Lila */ @@ -63,123 +65,343 @@ @Zoom(1) public class SpecialCases extends GfxTest { - private void drawPath(Path2D p, float pw, Graphics2D g, int w) { - BasicStroke s = new BasicStroke(pw, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND); - g.setColor(java.awt.Color.black); - Shape shape = s.createStrokedShape(p); - g.draw(shape); - g.translate(w, 0); - Stroke orig = g.getStroke(); - g.setStroke(s); - g.draw(p); - g.setStroke(orig); - g.translate(-w, 0); + /** + * Draw path onto the specified graphics context. Path is drawn as the path + * itself and also as outline. + * + * @param path + * path to be drawn + * @param pw + * width of the path + * @param graphics + * graphics context for image + * @param width + * width of the canvas + */ + private void drawPath(Path2D path, float pw, Graphics2D graphics, int width) + { + BasicStroke basicStroke = new BasicStroke(pw, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND); + graphics.setColor(java.awt.Color.black); + Shape shape = basicStroke.createStrokedShape(path); + graphics.draw(shape); + graphics.translate(width, 0); + Stroke orig = graphics.getStroke(); + graphics.setStroke(basicStroke); + graphics.draw(path); + graphics.setStroke(orig); + graphics.translate(-width, 0); } + /** + * Test drawing of line segments with identical vertexes. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIdenticalVertexesV(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + for (double d = 0.1; d < 1.0; d += 0.2) + { + path.moveTo(d * size, 0.1 * size); + path.lineTo(d * size, d * size); + } + drawPath(path, 0.15f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Test drawing of line segments with identical vertexes. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIdenticalVertexesH(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + for (double d = 0.1; d < 1.0; d += 0.2) + { + path.moveTo(0.1 * size, d * size); + path.lineTo(d * size, d * size); + } + drawPath(path, 0.15f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Test drawing of Bezier cubic curves with identical control points. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testIdenticalCtrlCub(TestImage image, Graphics2D graphics) { - int w = image.getWidth()/2; - int h = image.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0, 0); + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0, 0); // identical first 2 points - p.curveTo(0, 0, 0.1*s, 0.2*s, 0.2*s, 0.2*s); + path.curveTo(0, 0, 0.1 * size, 0.2 * size, 0.2 * size, 0.2 * size); // identical 2nd and 3rd points - p.curveTo(0.35*s, 0.8*s, 0.35*s, 0.8*s, 0.45*s, 0.1*s); + path.curveTo(0.35 * size, 0.8 * size, 0.35 * size, 0.8 * size, 0.45 * size, 0.1 * size); // identical 3rd and 4th points. - p.curveTo(0.60*s, 0.1*s, 0.60*s, 0.70*s, 0.60*s, 0.70*s); + path.curveTo(0.60 * size, 0.1 * size, 0.60 * size, 0.70 * size, 0.60 * size, 0.70 * size); // identical first 3 points - p.curveTo(0.6*s, 0.7*s, 0.6*s, 0.7*s, 0.5*s, 0.8*s); + path.curveTo(0.6 * size, 0.7 * size, 0.6 * size, 0.7 * size, 0.5 * size, 0.8 * size); // identical last 3 points - p.curveTo(0.3*s, 0.8*s, 0.3*s, 0.8*s, 0.3*s, 0.8*s); + path.curveTo(0.3 * size, 0.8 * size, 0.3 * size, 0.8 * size, 0.3 * size, 0.8 * size); // all points identical - p.moveTo(0.1*s, 0.8*s);p.curveTo(0.1*s, 0.8*s, 0.1*s, 0.8*s, 0.1*s, 0.8*s); - drawPath(p, 0.15f*s, graphics, w); + path.moveTo(0.1 * size, 0.8 * size); + path.curveTo(0.1 * size, 0.8 * size, 0.1 * size, 0.8 * size, 0.1 * size, 0.8 * size); + drawPath(path, 0.15f * size, graphics, width); return TestResult.PASSED; } + + /** + * Test drawing of Bezier quadratic curves with identical control points. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testIdenticalCtrlQuad(TestImage image, Graphics2D graphics) { - int w = image.getWidth()/2; - int h = image.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0, 0); + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0, 0); // identical first 2 points - p.quadTo(0, 0, 0.1*s, 0.2*s); + path.quadTo(0, 0, 0.1 * size, 0.2 * size); // identical 2nd and 3rd points - p.quadTo(0.7*s, 0.6*s, 0.7*s, 0.6*s); + path.quadTo(0.7 * size, 0.6 * size, 0.7 * size, 0.6 * size); // no identical points. We just want to see what a quad looks like. - p.quadTo(1.0*s, 0.7*s, 0.1*s, 0.8*s); + path.quadTo(1.0 * size, 0.7 * size, 0.1 * size, 0.8 * size); // all points identical - p.moveTo(0.7*s, 0.3*s);p.quadTo(0.7*s, 0.3*s, 0.7*s, 0.3*s); - drawPath(p, 0.2f*s, graphics, w); + path.moveTo(0.7 * size, 0.3 * size); + path.quadTo(0.7 * size, 0.3 * size, 0.7 * size, 0.3 * size); + drawPath(path, 0.2f * size, graphics, width); return TestResult.PASSED; } - public TestResult test180Turn(TestImage im, Graphics2D g) { - int w = im.getWidth()/2; - int h = im.getHeight(); - int s = Math.min(w, h); + + /** + * Test drawing of a path constructed from two line segments which have the + * same vertexes. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult test180Turn(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); int numlines = 6; - double cx = 0.5*s, cy = 0.5 * s; - for (int i = 0; i < numlines; i++) { - double dx = 0.4*s * Math.cos((i * 2 * Math.PI) / numlines); - double dy = 0.4*s * Math.sin((i * 2 * Math.PI) / numlines); - Path2D p = new Path2D.Double(); - p.moveTo(cx, cy); - p.lineTo(cx + dx, cy + dy); - p.lineTo(cx, cy); - drawPath(p, (float)Math.pow(0.05*s*(i+1), 0.8), g, w); + double cx = 0.5 * size, cy = 0.5 * size; + for (int i = 0; i < numlines; i++) + { + double dx = 0.4 * size * Math.cos((i * 2 * Math.PI) / numlines); + double dy = 0.4 * size * Math.sin((i * 2 * Math.PI) / numlines); + Path2D path = new Path2D.Double(); + path.moveTo(cx, cy); + path.lineTo(cx + dx, cy + dy); + path.lineTo(cx, cy); + drawPath(path, (float) Math.pow(0.05 * size * (i + 1), 0.8), graphics, width); } return TestResult.PASSED; } - public TestResult testClose(TestImage im, Graphics2D g) { - int w = im.getWidth()/2; - int h = im.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0.1*s, 0.1*s); - p.lineTo(0.8*s, 0.4*s); - p.quadTo(0.55*s, 1.0*s, 0.6*s, 0.5*s); - p.curveTo(0.1*s, 0.3*s, 0.0*s, 0.9*s, 0.65*s, 0.9*s); - p.closePath(); - drawPath(p, 0.1f*s, g, w); - return TestResult.PASSED; - } - public TestResult testSharpTurn1(TestImage im, Graphics2D g) { - int w = im.getWidth()/2; - int h = im.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0, 0); - p.curveTo(s, s, 0.4*s, 0.6*s, 0.1*s, -0.36*s); - drawPath(p, 0.25f*s, g, w); - return TestResult.PASSED; - } - public TestResult testSharpTurn2(TestImage im, Graphics2D g) { - int w = im.getWidth()/2; - int h = im.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0, 0); - p.curveTo(s, s, 0.4*s, 0.6*s, 0.1*s, -0.375*s); - drawPath(p, 0.25f*s, g, w); - return TestResult.PASSED; - } - public TestResult testCusp(TestImage im, Graphics2D g) { - int w = im.getWidth()/2; - int h = im.getHeight(); - int s = Math.min(w, h); - Path2D p = new Path2D.Double(); - p.moveTo(0.1*s, 0.1*s); - p.curveTo(0.9*s, 0.9*s, 0.1*s, 0.9*s, 0.9*s, 0.1*s); - drawPath(p, 0.45f*s, g, w); + + /** + * Test drawing closed path constructed from line segments. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCloseLineSegments(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0.1 * size, 0.1 * size); + path.lineTo(0.8 * size, 0.4 * size); + path.lineTo(0.55 * size, 1.0 * size); + path.lineTo(0.6 * size, 0.5 * size); + path.lineTo(0.1 * size, 0.3 * size); + path.lineTo(0.0 * size, 0.9 * size); + path.lineTo(0.65 * size, 0.9 * size); + path.closePath(); + drawPath(path, 0.1f * size, graphics, width); return TestResult.PASSED; } + /** + * Test drawing closed path constructed from quadratic Bezier curve segments. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCloseQuadSegments(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0.1 * size, 0.1 * size); + path.quadTo(0.8 * size, 0.4 * size, 0.55 * size, 1.0 * size); + path.quadTo(0.6 * size, 0.5 * size, 0.1 * size, 0.3 * size); + path.quadTo(0.0 * size, 0.9 * size, 0.65 * size, 0.9 * size); + path.closePath(); + drawPath(path, 0.1f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Test drawing closed path constructed from cubic Bezier curve segments. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCloseCubicSegments(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0.1 * size, 0.1 * size); + path.curveTo(0.8 * size, 0.4 * size, 0.8 * size, 0.9 * size, 0.55 * size, 1.0 * size); + path.curveTo(0.6 * size, 0.5 * size, 0.65 * size, 0.9 * size, 0.1 * size, 0.3 * size); + path.curveTo(0.0 * size, 0.9 * size, 0.65 * size, 0.9 * size, 0.55 * size, 1.0 * size); + path.closePath(); + drawPath(path, 0.1f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Test drawing closed path constructed from line segments, quadratic curves + * and cubic curves. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCloseAllCombinations(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0.1 * size, 0.1 * size); + path.lineTo(0.8 * size, 0.4 * size); + path.quadTo(0.55 * size, 1.0 * size, 0.6 * size, 0.5 * size); + path.curveTo(0.1 * size, 0.3 * size, 0.0 * size, 0.9 * size, 0.65 * size, 0.9 * size); + path.closePath(); + drawPath(path, 0.1f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Check if sharp turn is rendered correctly. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSharpTurn1(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0, 0); + path.curveTo(size, size, 0.4 * size, 0.6 * size, 0.1 * size, -0.36 * size); + drawPath(path, 0.25f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Check if sharp turn is rendered correctly. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSharpTurn2(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0, 0); + path.curveTo(size, size, 0.4 * size, 0.6 * size, 0.1 * size, -0.375 * size); + drawPath(path, 0.25f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Check if curve's cusp is rendered correctly. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCusp(TestImage image, Graphics2D graphics) + { + int width = image.getWidth() / 2; + int height = image.getHeight(); + int size = Math.min(width, height); + Path2D path = new Path2D.Double(); + path.moveTo(0.1 * size, 0.1 * size); + path.curveTo(0.9 * size, 0.9 * size, 0.1 * size, 0.9 * size, 0.9 * size, 0.1 * size); + drawPath(path, 0.45f * size, graphics, width); + return TestResult.PASSED; + } + + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ public static void main(String[] args) { new SpecialCases().runTestSuite(args); } } - From andyrtr at archlinux.org Fri Sep 2 00:47:18 2011 From: andyrtr at archlinux.org (Andreas Radke) Date: Fri, 2 Sep 2011 09:47:18 +0200 Subject: IcedTea-Web 1.1.2 released! In-Reply-To: <20110831183605.GG14689@redhat.com> References: <20110831183605.GG14689@redhat.com> Message-ID: <20110902094718.3b7c5953@workstation64.home> Packages built for ArchLinux. Sadly my issue with my broker application isn't solved. I'm still thinking this is not caused by the web plugin but by the jre itself - see my mail to the icedtea 1.10.3 release. Anything I can do to give you enough information to fix this? -Andy with icedtea 1.10.3 OpenJDK Runtime Environment (IcedTea6 1.10.3) (ArchLinux-6.b22_1.10.3-1-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode) SYNC: in sync SYNC: in sync @@@@ readline @@@@ readline SYNC: version in sync=1.6.0_27 SYNC: version in sync=1.6.0_27 SYNC: send notification SYNC: send notification Exception in thread "Thread-18" Exception in thread "Thread-12" java.lang.IllegalMonitorStateException at java.lang.Object.notify(Native Method) at testJava2_1.TestVM$1.run(TestVM.java:90) java.lang.IllegalMonitorStateException at java.lang.Object.notify(Native Method) at testJava2_1.TestVM$1.run(TestVM.java:90) expect: en actual: de expect: en actual: de locale: 'en' locale: 'en' Ihre Java-Konfiguration ist folgende:

Hersteller: Sun Microsystems Inc.
Version: Java SE 6 Update 22
Betriebssystem: Linux 3.0-ARCH
Architektur: amd64 Ihre Java-Konfiguration ist folgende:

Hersteller: Sun Microsystems Inc.
Version: Java SE 6 Update 22
Betriebssystem: Linux 3.0-ARCH
Architektur: amd64 SYNC: notified waitForLoadingDone: version =1.6.0_27 SYNC: notified waitForLoadingDone: version =1.6.0_27 Inside invokeLater's run, subtitleLabel's Text2: Inside invokeLater's run, subtitleLabel's Text2: Is this EDT? true Is this EDT? true Obj:1.6.0_27 Obj:1.6.0_27 Exit worker loop Exit worker loop Inside Update Subtitle Label: less Inside Update Subtitle Label: less Inside invokeLater's run, subtitleLabel's Text1: Java-Update verf?gbarInside invokeLater's run, subtitleLabel's Text1: Java-Update verf?gbar02.09.2011 09:35:54 Control init INFO: Control Applet v1.09-SNAPSHOT 02.09.2011 09:35:55 Control memoryDetection INFO: Detected 16063 Mo RAM 02.09.11 09:36 : v8.02.458 - codebase : http://e5.md.it-finance.com/MDV8/ 02.09.11 09:36 : Java Version : 1.6.0_22 02.09.11 09:36 : System : Linux 3.0-ARCH amd64 02.09.11 09:36 : Processors : 8 02.09.11 09:36 : Memory allocated : 36.875Mb max: 711.125Mb free: 7.1031113Mb 02.09.11 09:36 : Classpath : [https://www.marketdatasystems.com/download/charts/V8/applet458.jar] 02.09.11 09:36 : Screens : 1 02.09.11 09:36 : Screen 0 : :0.0 - 1274x958x-1 - (0.0, 0.0) - [top=0, left=0, bottom=41, right=0] - 60 Hz - Video acceleration: true 02.09.11 09:36 : init bundle "texts.texts" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "texts/dateformats" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "PRTLines.prt" with locale de_DE_IGIndex 02.09.11 09:36 : load plugin PRTLines successfully 02.09.11 09:36 : init bundle "texts.proorder" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "texts.igindex" with locale de_DE_IGIndex 02.09.11 09:36 : load plugin IGIndex successfully with icedtea 1.10.2 java version "1.6.0_22" OpenJDK Runtime Environment (IcedTea6 1.10.2) (ArchLinux-6.b22_1.10.2-1-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode) 02.09.2011 09:43:42 Control init INFO: Control Applet v1.09-SNAPSHOT 02.09.2011 09:43:43 Control memoryDetection INFO: Detected 16063 Mo RAM 02.09.11 09:43 : v8.02.458 - codebase : http://eb.md.it-finance.com/MDV8/ 02.09.11 09:43 : Java Version : 1.6.0_22 02.09.11 09:43 : System : Linux 3.0-ARCH amd64 02.09.11 09:43 : Processors : 8 02.09.11 09:43 : Memory allocated : 36.8125Mb max: 711.125Mb free: 18.062508Mb 02.09.11 09:43 : Classpath : [https://www.marketdatasystems.com/download/charts/V8/applet458.jar] 02.09.11 09:43 : Screens : 1 02.09.11 09:43 : Screen 0 : :0.0 - 1274x958x-1 - (0.0, 0.0) - [top=0, left=0, bottom=41, right=0] - 60 Hz - Video acceleration: true 02.09.11 09:43 : init bundle "texts.texts" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "texts/dateformats" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "PRTLines.prt" with locale de_DE_IGIndex 02.09.11 09:43 : load plugin PRTLines successfully 02.09.11 09:43 : init bundle "texts.proorder" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "texts.igindex" with locale de_DE_IGIndex 02.09.11 09:43 : load plugin IGIndex successfully From xranby at icedtea.classpath.org Fri Sep 2 03:54:27 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 02 Sep 2011 10:54:27 +0000 Subject: /hg/icedtea6: JamVM: Add support for armhf. Message-ID: changeset c7dfe2b4791e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7dfe2b4791e author: Xerxes Ranby date: Fri Sep 02 12:41:10 2011 +0200 JamVM: Add support for armhf. 2011-09-02 Xerxes Ranby JamVM - Add support for armhf. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 9 +++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diffs (41 lines): diff -r b9ac502a6189 -r c7dfe2b4791e ChangeLog --- a/ChangeLog Tue Aug 30 11:30:12 2011 -0400 +++ b/ChangeLog Fri Sep 02 12:41:10 2011 +0200 @@ -1,3 +1,12 @@ +2011-09-02 Xerxes R??nby + + JamVM + - Add support for armhf. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. + (JAMVM_SHA256SUM): Updated. + 2011-08-30 Deepak Bhole S6826104, RH730015: Getting a NullPointer exception when clicked on Application & diff -r b9ac502a6189 -r c7dfe2b4791e Makefile.am --- a/Makefile.am Tue Aug 30 11:30:12 2011 -0400 +++ b/Makefile.am Fri Sep 02 12:41:10 2011 +0200 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 15f0fcf749071c7fa1bf0431e044e55143e94844 -JAMVM_SHA256SUM = af0213333302193f9eda0bd852b2d0419484160e1853235acdb83ed73829a1f8 +JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 +JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r b9ac502a6189 -r c7dfe2b4791e NEWS --- a/NEWS Tue Aug 30 11:30:12 2011 -0400 +++ b/NEWS Fri Sep 02 12:41:10 2011 +0200 @@ -383,6 +383,7 @@ * JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. - LP827463: Fix OpenJDK enclosingMethodInfo(). + - Add support for armhf. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Ignore assertions and verify options. From xranby at icedtea.classpath.org Fri Sep 2 04:15:12 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 02 Sep 2011 11:15:12 +0000 Subject: /hg/icedtea7: 4 new changesets Message-ID: changeset a51ca707c3d2 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a51ca707c3d2 author: Xerxes Ranby date: Fri Sep 02 13:11:34 2011 +0200 PR772: JamVM + jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. 2011-08-10 Xerxes Ranby JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. * NEWS: Updated. * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. * Makefile.am: Apply JamVM patch. changeset 56dac28b4cb5 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=56dac28b4cb5 author: Xerxes Ranby date: Fri Sep 02 13:13:17 2011 +0200 JamVM: Ignore assertions and verify options. 2011-08-15 Xerxes Ranby JamVM - Ignore assertions and verify options. * NEWS: Updated. * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. * Makefile.am: Apply JamVM patch. changeset 87cac0904664 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=87cac0904664 author: Xerxes Ranby date: Fri Sep 02 13:16:35 2011 +0200 JamVM: LP827463: Fix OpenJDK enclosingMethodInfo(), Updated JamVM to 2011-08-19 revision. 2011-08-19 Xerxes Ranby JamVM - LP827463: Fix OpenJDK enclosingMethodInfo(). - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Fix typo in definition of ACC_MIRANDA. - Intern strings when creating a StackTraceElement. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. (JAMVM_SHA256SUM): Updated. changeset a8ba0d7cfa93 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a8ba0d7cfa93 author: Xerxes Ranby date: Fri Sep 02 13:17:30 2011 +0200 JamVM: Add support for armhf. 2011-09-02 Xerxes Ranby JamVM - Add support for armhf. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 38 ++++++++++++++++ Makefile.am | 8 ++- NEWS | 9 +++ patches/jamvm/ignore-assertions-and-verify-options.patch | 19 ++++++++ patches/jamvm/jmm_GetLongAttribute_201.patch | 21 ++++++++ 5 files changed, 92 insertions(+), 3 deletions(-) diffs (146 lines): diff -r 8ac25d11a9e5 -r a8ba0d7cfa93 ChangeLog --- a/ChangeLog Tue Aug 09 13:16:18 2011 +0200 +++ b/ChangeLog Fri Sep 02 13:17:30 2011 +0200 @@ -1,3 +1,41 @@ +2011-09-02 Xerxes R??nby + + JamVM + - Add support for armhf. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-19 Xerxes R??nby + + JamVM + - LP827463: Fix OpenJDK enclosingMethodInfo(). + - "Fix" handling of CLI bootclasspath options. + - Fix for StackTraceElement checkin. + - Fix typo in definition of ACC_MIRANDA. + - Intern strings when creating a StackTraceElement. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-15 Xerxes R??nby + + JamVM + - Ignore assertions and verify options. + * NEWS: Updated. + * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. + * Makefile.am: Apply JamVM patch. + +2011-08-10 Xerxes R??nby + + JamVM + - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + * NEWS: Updated. + * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. + * Makefile.am: Apply JamVM patch. + 2011-08-09 Xerxes R??nby JamVM diff -r 8ac25d11a9e5 -r a8ba0d7cfa93 Makefile.am --- a/Makefile.am Tue Aug 09 13:16:18 2011 +0200 +++ b/Makefile.am Fri Sep 02 13:17:30 2011 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 0501bb8bea978c2d37e7b5caaa0969c92ae148b4 -JAMVM_SHA256SUM = 5a21290813affb5878d27995e487c60e7d0b85793987bb814baf162f179acedb +JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 +JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -300,7 +300,9 @@ if BUILD_JAMVM ICEDTEA_PATCHES += \ - patches/jamvm/remove-sun.misc.Perf-debug-code.patch + patches/jamvm/remove-sun.misc.Perf-debug-code.patch \ + patches/jamvm/jmm_GetLongAttribute_201.patch \ + patches/jamvm/ignore-assertions-and-verify-options.patch endif if ENABLE_PULSE_JAVA diff -r 8ac25d11a9e5 -r a8ba0d7cfa93 NEWS --- a/NEWS Tue Aug 09 13:16:18 2011 +0200 +++ b/NEWS Fri Sep 02 13:17:30 2011 +0200 @@ -6,6 +6,7 @@ DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X +LPX - https://bugs.launchpad.net/bugs/X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY @@ -30,6 +31,14 @@ - Add missing describe_pd method for Zero. * JamVM - JamVM is self-hosting. + - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + - LP827463: Fix OpenJDK enclosingMethodInfo(). + - Add support for armhf. + - "Fix" handling of CLI bootclasspath options. + - Fix for StackTraceElement checkin. + - Fix typo in definition of ACC_MIRANDA. + - Intern strings when creating a StackTraceElement. + - Ignore assertions and verify options. - Remove empty clobber. - Use dots instead of slashes in classname for exception. - Correct thrown exception by bootstrap loader. diff -r 8ac25d11a9e5 -r a8ba0d7cfa93 patches/jamvm/ignore-assertions-and-verify-options.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-assertions-and-verify-options.patch Fri Sep 02 13:17:30 2011 +0200 @@ -0,0 +1,20 @@ +Index: jamvm/jamvm/src/init.c +=================================================================== +--- jamvm.orig/jamvm/src/init.c 2011-08-12 14:12:00.775411188 +0200 ++++ jamvm/jamvm/src/init.c 2011-08-12 16:22:24.110205028 +0200 +@@ -272,6 +272,15 @@ + /* Compatibility options */ + } else if(strcmp(string, "-Xcomp") == 0 || + strcmp(string, "-Xbatch") == 0 || ++ strcmp(string, "-ea") == 0 || ++ strcmp(string, "-da") == 0 || ++ strcmp(string, "-dsa") == 0 || ++ strcmp(string, "-esa") == 0 || ++ strncmp(string, "-ea:", 4) == 0 || ++ strncmp(string, "-da:", 4) == 0 || ++ strncmp(string, "-dsa:", 5) == 0 || ++ strncmp(string, "-esa:", 5) == 0 || ++ strncmp(string, "-Xverify:", 9) == 0 || + strncmp(string, "-XX:", 4) == 0) { + /* Ignore */ + } else diff -r 8ac25d11a9e5 -r a8ba0d7cfa93 patches/jamvm/jmm_GetLongAttribute_201.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/jmm_GetLongAttribute_201.patch Fri Sep 02 13:17:30 2011 +0200 @@ -0,0 +1,22 @@ +Index: jamvm/jamvm/src/classlib/openjdk/management.c +=================================================================== +--- jamvm.orig/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:39:21.067466386 +0200 ++++ jamvm/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:43:21.987466384 +0200 +@@ -146,6 +146,9 @@ + case JMM_JVM_INIT_DONE_TIME_MS: + result = 0; + break; ++ case JMM_OS_PROCESS_ID: ++ result = getpid(); ++ break; + + case JMM_CLASS_LOADED_COUNT: + case JMM_CLASS_UNLOADED_COUNT: +@@ -153,7 +156,6 @@ + case JMM_THREAD_LIVE_COUNT: + case JMM_THREAD_PEAK_COUNT: + case JMM_THREAD_DAEMON_COUNT: +- case JMM_OS_PROCESS_ID: + + default: + UNIMPLEMENTED("jmm_GetLongAttribute: Unknown attribute %d", att); From xranby at icedtea.classpath.org Fri Sep 2 04:23:11 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 02 Sep 2011 11:23:11 +0000 Subject: /hg/icedtea: 4 new changesets Message-ID: changeset fcef146368a8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fcef146368a8 author: Xerxes Ranby date: Fri Sep 02 13:22:12 2011 +0200 PR772: JamVM + jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. 2011-08-10 Xerxes Ranby JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. * NEWS: Updated. * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. * Makefile.am: Apply JamVM patch. changeset a338e1f421e6 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a338e1f421e6 author: Xerxes Ranby date: Fri Sep 02 13:23:31 2011 +0200 JamVM: Ignore assertions and verify options. 2011-08-15 Xerxes Ranby JamVM - Ignore assertions and verify options. * NEWS: Updated. * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. * Makefile.am: Apply JamVM patch. changeset c7f83847564d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c7f83847564d author: Xerxes Ranby date: Fri Sep 02 13:24:37 2011 +0200 JamVM: LP827463: Fix OpenJDK enclosingMethodInfo(), Updated JamVM to 2011-08-19 revision. 2011-08-19 Xerxes Ranby JamVM - LP827463: Fix OpenJDK enclosingMethodInfo(). - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Fix typo in definition of ACC_MIRANDA. - Intern strings when creating a StackTraceElement. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. (JAMVM_SHA256SUM): Updated. changeset 4141f7541748 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4141f7541748 author: Xerxes Ranby date: Fri Sep 02 13:25:39 2011 +0200 JamVM: Add support for armhf. 2011-09-02 Xerxes Ranby JamVM - Add support for armhf. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 38 ++++++++++++++++ Makefile.am | 8 ++- NEWS | 9 +++ patches/jamvm/ignore-assertions-and-verify-options.patch | 19 ++++++++ patches/jamvm/jmm_GetLongAttribute_201.patch | 21 ++++++++ 5 files changed, 92 insertions(+), 3 deletions(-) diffs (146 lines): diff -r ed87c77c461d -r 4141f7541748 ChangeLog --- a/ChangeLog Tue Aug 09 13:45:23 2011 +0200 +++ b/ChangeLog Fri Sep 02 13:25:39 2011 +0200 @@ -1,3 +1,41 @@ +2011-09-02 Xerxes R??nby + + JamVM + - Add support for armhf. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-19 Xerxes R??nby + + JamVM + - LP827463: Fix OpenJDK enclosingMethodInfo(). + - "Fix" handling of CLI bootclasspath options. + - Fix for StackTraceElement checkin. + - Fix typo in definition of ACC_MIRANDA. + - Intern strings when creating a StackTraceElement. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-15 Xerxes R??nby + + JamVM + - Ignore assertions and verify options. + * NEWS: Updated. + * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. + * Makefile.am: Apply JamVM patch. + +2011-08-10 Xerxes R??nby + + JamVM + - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + * NEWS: Updated. + * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. + * Makefile.am: Apply JamVM patch. + 2011-08-09 Xerxes R??nby JamVM diff -r ed87c77c461d -r 4141f7541748 Makefile.am --- a/Makefile.am Tue Aug 09 13:45:23 2011 +0200 +++ b/Makefile.am Fri Sep 02 13:25:39 2011 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 0501bb8bea978c2d37e7b5caaa0969c92ae148b4 -JAMVM_SHA256SUM = 5a21290813affb5878d27995e487c60e7d0b85793987bb814baf162f179acedb +JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 +JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -308,7 +308,9 @@ if BUILD_JAMVM ICEDTEA_PATCHES += \ - patches/jamvm/remove-sun.misc.Perf-debug-code.patch + patches/jamvm/remove-sun.misc.Perf-debug-code.patch \ + patches/jamvm/jmm_GetLongAttribute_201.patch \ + patches/jamvm/ignore-assertions-and-verify-options.patch endif if ENABLE_PULSE_JAVA diff -r ed87c77c461d -r 4141f7541748 NEWS --- a/NEWS Tue Aug 09 13:45:23 2011 +0200 +++ b/NEWS Fri Sep 02 13:25:39 2011 +0200 @@ -6,6 +6,7 @@ DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X +LPX - https://bugs.launchpad.net/bugs/X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY @@ -15,6 +16,14 @@ * JamVM - JamVM is self-hosting. + - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + - LP827463: Fix OpenJDK enclosingMethodInfo(). + - Add support for armhf. + - "Fix" handling of CLI bootclasspath options. + - Fix for StackTraceElement checkin. + - Fix typo in definition of ACC_MIRANDA. + - Intern strings when creating a StackTraceElement. + - Ignore assertions and verify options. - Remove empty clobber. - Use dots instead of slashes in classname for exception. - Correct thrown exception by bootstrap loader. diff -r ed87c77c461d -r 4141f7541748 patches/jamvm/ignore-assertions-and-verify-options.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-assertions-and-verify-options.patch Fri Sep 02 13:25:39 2011 +0200 @@ -0,0 +1,20 @@ +Index: jamvm/jamvm/src/init.c +=================================================================== +--- jamvm.orig/jamvm/src/init.c 2011-08-12 14:12:00.775411188 +0200 ++++ jamvm/jamvm/src/init.c 2011-08-12 16:22:24.110205028 +0200 +@@ -272,6 +272,15 @@ + /* Compatibility options */ + } else if(strcmp(string, "-Xcomp") == 0 || + strcmp(string, "-Xbatch") == 0 || ++ strcmp(string, "-ea") == 0 || ++ strcmp(string, "-da") == 0 || ++ strcmp(string, "-dsa") == 0 || ++ strcmp(string, "-esa") == 0 || ++ strncmp(string, "-ea:", 4) == 0 || ++ strncmp(string, "-da:", 4) == 0 || ++ strncmp(string, "-dsa:", 5) == 0 || ++ strncmp(string, "-esa:", 5) == 0 || ++ strncmp(string, "-Xverify:", 9) == 0 || + strncmp(string, "-XX:", 4) == 0) { + /* Ignore */ + } else diff -r ed87c77c461d -r 4141f7541748 patches/jamvm/jmm_GetLongAttribute_201.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/jmm_GetLongAttribute_201.patch Fri Sep 02 13:25:39 2011 +0200 @@ -0,0 +1,22 @@ +Index: jamvm/jamvm/src/classlib/openjdk/management.c +=================================================================== +--- jamvm.orig/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:39:21.067466386 +0200 ++++ jamvm/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:43:21.987466384 +0200 +@@ -146,6 +146,9 @@ + case JMM_JVM_INIT_DONE_TIME_MS: + result = 0; + break; ++ case JMM_OS_PROCESS_ID: ++ result = getpid(); ++ break; + + case JMM_CLASS_LOADED_COUNT: + case JMM_CLASS_UNLOADED_COUNT: +@@ -153,7 +156,6 @@ + case JMM_THREAD_LIVE_COUNT: + case JMM_THREAD_PEAK_COUNT: + case JMM_THREAD_DAEMON_COUNT: +- case JMM_OS_PROCESS_ID: + + default: + UNIMPLEMENTED("jmm_GetLongAttribute: Unknown attribute %d", att); From bugzilla-daemon at icedtea.classpath.org Fri Sep 2 06:05:49 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 13:05:49 +0000 Subject: [Bug 781] New: Can't build icedtea7-hg with icedtea6: "Error occurred during initialization of VM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=781 Summary: Can't build icedtea7-hg with icedtea6: "Error occurred during initialization of VM" Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: Bootstrapping AssignedTo: ahughes at redhat.com ReportedBy: bero at arklinux.org CC: unassigned at icedtea.classpath.org When trying to build icedtea7-hg with a preexisting icedtea6, the build fails: with --enable-bootstrap: /usr/src/rpm/BUILD/icedtea7/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=1536 -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions -J-XX:-LogVMOutput -J-Xmx512m -J-Xms512m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -XDignore.symbol.file=true -source 7 -target 7 -encoding ascii -classpath /usr/src/ark/BUILD/icedtea7/bootstrap/jdk1.6.0/lib/rt.jar -classpath /usr/src/ark/BUILD/icedtea7/openjdk.build-boot/corba/corba/classes -classpath /usr/src/ark/BUILD/icedtea7/openjdk.build-boot/langtools/dist/lib/classes.jar -sourcepath /usr/src/ark/BUILD/icedtea7/generated.build:../../../src/share/classes:/usr/src/rpm/BUILD/icedtea7/openjdk-boot/jdk/src/share/classes -d /usr/src/rpm/BUILD/icedtea7/openjdk.build-boot/corba/classes @/usr/src/rpm/BUILD/icedtea7/openjdk.build-boot/corba/tmp/sun/javax.transaction.xa/.classes.list javac: invalid source release: 7 Usage: javac use -help for a list of possible options make[5]: *** [.compile.classlist] Error 2 make[5]: Leaving directory `/usr/src/ark/BUILD/icedtea7/openjdk-boot/corba/make/javax/xa' make[4]: *** [build] Error 1 And without: make[6]: Leaving directory `/usr/src/rpm/BUILD/icedtea7/openjdk.build/hotspot/outputdir/linux_amd64_compiler2/product' cd linux_amd64_compiler2/product && ./test_gamma java full version "1.6.0_21-b21" Using java runtime at: /usr/src/rpm/BUILD/icedtea7/bootstrap/jdk1.6.0/jre Error occurred during initialization of VM ?{???: policy.changeYou make[5]: *** [product] Error 1 make[5]: Leaving directory `/usr/src/rpm/BUILD/icedtea7/openjdk.build/hotspot/outputdir' -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Sep 2 06:22:39 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Sep 2011 13:22:39 +0000 Subject: [Bug 770] Zero + icedtea7 7033954 regression - missing mapfile-zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=770 --- Comment #5 from Xerxes R?nby 2011-09-02 13:22:39 --- (In reply to comment #4) > Closing as fix is in. > Can we bump the http://icedtea.classpath.org/hg/icedtea7 tree now to match the latest icedtea7-forest changesets? The icedtea buildbots and distributions that try to build and package icedtea7 still fail to do so for Zero on ARM unless we bump. http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-armv5tel-quick/builds/34/steps/compile/logs/stdio -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From a.radke at arcor.de Fri Sep 2 01:15:06 2011 From: a.radke at arcor.de (Andreas Radke) Date: Fri, 2 Sep 2011 10:15:06 +0200 Subject: IcedTea-Web 1.1.2 released! In-Reply-To: <20110831183605.GG14689@redhat.com> References: <20110831183605.GG14689@redhat.com> Message-ID: <20110902101506.4b545059@workstation64.home> Packages built for ArchLinux. Sadly my issue with my broker application isn't solved. I'm still thinking this is not caused by the web plugin but by the jre itself - see my mail to the icedtea 1.10.3 release. Anything I can do to give you enough information to fix this? -Andy with icedtea 1.10.3 OpenJDK Runtime Environment (IcedTea6 1.10.3) (ArchLinux-6.b22_1.10.3-1-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode) SYNC: in sync SYNC: in sync @@@@ readline @@@@ readline SYNC: version in sync=1.6.0_27 SYNC: version in sync=1.6.0_27 SYNC: send notification SYNC: send notification Exception in thread "Thread-18" Exception in thread "Thread-12" java.lang.IllegalMonitorStateException at java.lang.Object.notify(Native Method) at testJava2_1.TestVM$1.run(TestVM.java:90) java.lang.IllegalMonitorStateException at java.lang.Object.notify(Native Method) at testJava2_1.TestVM$1.run(TestVM.java:90) expect: en actual: de expect: en actual: de locale: 'en' locale: 'en' Ihre Java-Konfiguration ist folgende:

Hersteller: Sun Microsystems Inc.
Version: Java SE 6 Update 22
Betriebssystem: Linux 3.0-ARCH
Architektur: amd64 Ihre Java-Konfiguration ist folgende:

Hersteller: Sun Microsystems Inc.
Version: Java SE 6 Update 22
Betriebssystem: Linux 3.0-ARCH
Architektur: amd64 SYNC: notified waitForLoadingDone: version =1.6.0_27 SYNC: notified waitForLoadingDone: version =1.6.0_27 Inside invokeLater's run, subtitleLabel's Text2: Inside invokeLater's run, subtitleLabel's Text2: Is this EDT? true Is this EDT? true Obj:1.6.0_27 Obj:1.6.0_27 Exit worker loop Exit worker loop Inside Update Subtitle Label: less Inside Update Subtitle Label: less Inside invokeLater's run, subtitleLabel's Text1: Java-Update verf?gbarInside invokeLater's run, subtitleLabel's Text1: Java-Update verf?gbar02.09.2011 09:35:54 Control init INFO: Control Applet v1.09-SNAPSHOT 02.09.2011 09:35:55 Control memoryDetection INFO: Detected 16063 Mo RAM 02.09.11 09:36 : v8.02.458 - codebase : http://e5.md.it-finance.com/MDV8/ 02.09.11 09:36 : Java Version : 1.6.0_22 02.09.11 09:36 : System : Linux 3.0-ARCH amd64 02.09.11 09:36 : Processors : 8 02.09.11 09:36 : Memory allocated : 36.875Mb max: 711.125Mb free: 7.1031113Mb 02.09.11 09:36 : Classpath : [https://www.marketdatasystems.com/download/charts/V8/applet458.jar] 02.09.11 09:36 : Screens : 1 02.09.11 09:36 : Screen 0 : :0.0 - 1274x958x-1 - (0.0, 0.0) - [top=0, left=0, bottom=41, right=0] - 60 Hz - Video acceleration: true 02.09.11 09:36 : init bundle "texts.texts" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "texts/dateformats" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "PRTLines.prt" with locale de_DE_IGIndex 02.09.11 09:36 : load plugin PRTLines successfully 02.09.11 09:36 : init bundle "texts.proorder" with locale de_DE_IGIndex 02.09.11 09:36 : init bundle "texts.igindex" with locale de_DE_IGIndex 02.09.11 09:36 : load plugin IGIndex successfully with icedtea 1.10.2 java version "1.6.0_22" OpenJDK Runtime Environment (IcedTea6 1.10.2) (ArchLinux-6.b22_1.10.2-1-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode) 02.09.2011 09:43:42 Control init INFO: Control Applet v1.09-SNAPSHOT 02.09.2011 09:43:43 Control memoryDetection INFO: Detected 16063 Mo RAM 02.09.11 09:43 : v8.02.458 - codebase : http://eb.md.it-finance.com/MDV8/ 02.09.11 09:43 : Java Version : 1.6.0_22 02.09.11 09:43 : System : Linux 3.0-ARCH amd64 02.09.11 09:43 : Processors : 8 02.09.11 09:43 : Memory allocated : 36.8125Mb max: 711.125Mb free: 18.062508Mb 02.09.11 09:43 : Classpath : [https://www.marketdatasystems.com/download/charts/V8/applet458.jar] 02.09.11 09:43 : Screens : 1 02.09.11 09:43 : Screen 0 : :0.0 - 1274x958x-1 - (0.0, 0.0) - [top=0, left=0, bottom=41, right=0] - 60 Hz - Video acceleration: true 02.09.11 09:43 : init bundle "texts.texts" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "texts/dateformats" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "PRTLines.prt" with locale de_DE_IGIndex 02.09.11 09:43 : load plugin PRTLines successfully 02.09.11 09:43 : init bundle "texts.proorder" with locale de_DE_IGIndex 02.09.11 09:43 : init bundle "texts.igindex" with locale de_DE_IGIndex 02.09.11 09:43 : load plugin IGIndex successfully From the.mad.doctor.kaeding at gmail.com Fri Sep 2 09:57:34 2011 From: the.mad.doctor.kaeding at gmail.com (the mad doctor kaeding) Date: Fri, 2 Sep 2011 12:57:34 -0400 Subject: icedtea6 cannot compile itself In-Reply-To: <20110831022733.GB29544@rivendell.middle-earth.co.uk> References: <20110831022733.GB29544@rivendell.middle-earth.co.uk> Message-ID: Seriously? Not enough information? I'm following the instructions on http://www.linuxfromscratch.org/blfs/view/svn/general/icedtea6.html It instructs me to download icedtea6-1.9.7 binary and use it to compile icedtea6-1.9.7 from source. I tried using the exact downloads that that page links to, and get errors that some methods have the same erasure as others, and the compilation fails (see my original message). I tried using newer downloads, with the same types of errors, but a different number of them. If I don't know what files to download to get a successful compilation, would you please send me a list of the correct ones? Thank you. --------------- from linuxfromscratch: Source Package Information * IcedTea6 Source http://icedtea.classpath.org/download/source/icedtea6-1.9.7.tar.gz 54a327a9591dab15049b81ec3c0af724 6.3 MB * OpenJDK Source http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz 0b36adbf67e4f261e1b827ed4be4f447 43 MB * JAF Source http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaf-b20.zip bc95c133620bd68c161cac9891592901 70 KB * JAXP Source http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxp-b20.zip 22e95fbdb9fb7d8b6b6fc0a1d76d1fbd 5.8 MB * JAXWS Source http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxws-b20.zip 91adfd41e6f001add4f92ae31216b1e3 5.3 MB * Estimated disk space required: 6.6 GB * Estimated build time: 23 SBU (an additional 83 SBU for testsuite) Binary Package Information * Binary download (x86): http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-1.9.7-1-x86-bin.tar.xz * Download MD5 sum: 616f3841562b2787ce101a85378029d1 * Download size (binary): 100 MB * Estimated disk space required: 846 MB * Binary download (x86_64): http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-1.9.7-1-x86_64-bin.tar.xz * Download MD5 sum: 98cf8a009c63cb2b32a94dd23b828fca * Download size (binary): 77 MB * Estimated disk space required: 564 MB Additional Downloads Required Patches * http://www.linuxfromscratch.org/patches/blfs/svn/icedtea6-1.9.7-upstream_fixes-1.patch * http://www.linuxfromscratch.org/patches/blfs/svn/icedtea6-1.9.7-generate_cacerts-1.patch * http://www.linuxfromscratch.org/patches/blfs/svn/icedtea6-1.9.7-xerces2_10-1.patch * http://www.linuxfromscratch.org/patches/blfs/svn/icedtea6-1.9.7-fixed_paths-1.patch Required Jar Files * Eclipse Java Complier http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/ecj-3.6.1.jar 448c6e65234fc61624e14b0964d75bd9 1.6 MB * Rhino Java Script ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip 40d0a9abec8169e42920214b37fa8e0e 2.9 MB * Xalan http://apache.osuosl.org/xml/xalan-j/xalan-j_2_7_1-bin.zip 99d049717c9d37a930450e630d8a6531 16.8 MB * Xerces http://apache.osuosl.org/xerces/j/Xerces-J-bin.2.11.0.zip 408500aaaf1ff9f1e03e79defe90facc 7.0 MB IcedTea6 Dependencies Required Dependencies XZ-Utils Optional Runtime Dependencies (required for source installation) ALSA Library-1.0.21, CUPS-1.4.5, GTK+-2.20.1, Xorg Libraries, and Xulrunner-1.9.2.13 Additional Requirements (for source build, including optional requirements) Apache Ant-1.8.1, UnZip-6.0, which-2.20, and Zip-3.0 User Notes: http://wiki.linuxfromscratch.org/blfs/wiki/icedtea6 Installation of IcedTea6 The instructions below install both the binary and source versions. You may stop after installing the binary version or continue on installing the source version. You can choose to keep either or both. IcedTea6 Binary Installation Begin by extracting the appropriate binary tarball and changing to the extracted dirctory. Install the binary IcedTea6 with the following commands as the root user: cp -R j2sdk-image /opt/icedtea6-1.9.7-bin && chown -R root:root /opt/icedtea6-1.9.7-bin Configure the temporary IcedTea6 installation with the following commands: export PATH_HOLD="${PATH}" && export JAVA_HOME="/opt/icedtea6-1.9.7-bin" && export CLASSPATH=".:/usr/share/java" && export PATH="${PATH}:${JAVA_HOME}/bin" The binary version is now installed. If you don't want to compile the sources, skip ahead to the configuration section. IcedTea6 Source Installation [Note] Note The source build of IcedTea6 requires Apache Ant-1.8.1. You'll need to build that first to satisfy the reciprocal dependency, and return to this section to continue building IcedTea6. Like other packages in BLFS, begin by extracting the IcedTea6 source package and changing into the extracted dirctory. IcedTea6 requires several freely available jar files for the bootstrap compiler. You may leave these items in place after the build is complete, as they will be needed by other programs, or remove them if you choose. You can optionally choose not to install them at all, and provide the necessary configure options to find the files. Install the necessary tools with the following commands as the root user: mkdir jarfiles && cd jarfiles && unzip ../../rhino1_7R2.zip && unzip ../../xalan-j_2_7_1-bin.zip && unzip ../../Xerces-J-bin.2.11.0.zip && install -v -d -m755 /usr/share/java && install -v -m755 rhino1_7R2/*.jar /usr/share/java && install -v -m755 xalan-j_2_7_1/*.jar /usr/share/java && install -v -m755 xerces-2_11_0/*.jar /usr/share/java && install -v -m755 ../../ecj-3.6.1.jar /usr/share/java && ln -s ecj-3.6.1.jar /usr/share/java/ecj.jar && ln -s xalan.jar /usr/share/java/xalan2.jar && cd .. && rm -r jarfiles IcedTea6 is composed of several individual components of the proprietary JDK that have been relicensed under an open source license. Put all of the individual components into the source tree with the following commands: mkdir drops && cp -v ../jdk6-jaf-b20.zip drops/ && cp -v ../jdk6-jaxp-b20.zip drops/ && cp -v ../jdk6-jaxws-b20.zip drops/ && cp -v ../openjdk-6-src-b20-21_jun_2010.tar.gz . Apply a patch to allow building with an installed IcedTea6 as the bootstrap JDK: patch -Np1 -i ../icedtea6-1.9.7-upstream_fixes-1.patch Apply a patch to generate a valid cacerts file using the system CA certificates: patch -Np1 -i ../icedtea6-1.9.7-generate_cacerts-1.patch Apply a patch to fix the build when using a newer version of Xerces2: patch -Np1 -i ../icedtea6-1.9.7-xerces2_10-1.patch Apply a patch to replace fixed paths with ones appropriate for BLFS: patch -Np1 -i ../icedtea6-1.9.7-fixed_paths-1.patch Configure and build the package with the following commands: unset JAVA_HOME && ./autogen.sh && ./configure --with-jdk-home=/opt/icedtea6-1.9.7-bin \ --enable-cacerts \ --disable-plugin \ --disable-webstart && make To test the results, issue: make check. The included version of jtreg is old, and the test suite is also very dependent on the host system. You should expect to see 6 or 7 failures and 1 error in the langtools tests, and 20 to 23 failures in jdk with up to 3 errors. The other 4700+ tests should pass. The reason for the variable results is due to different architechtures, versions of dependent libraries, and even the CA certificates used to generate the cacerts file. Install the package with the following commands as the root user: cp -R openjdk.build/j2sdk-image /opt/icedtea6-1.9.7 && chown -R root:root /opt/icedtea6-1.9.7 On 8/30/11, Dr Andrew John Hughes wrote: > On 14:04 Tue 30 Aug , the mad doctor kaeding wrote: >> I am trying to compile icedtea6 with itself, but get errors. >> I tried 1.9.7, and 1.10.x, with same results, but different >> numbers of errors. >> >> What am I doing wrong? >> >> Thank you >> >> Thomas >> >> ---------- >> > > I don't know because you don't give enough information here. We > at least need config.log and what is being used in bootstrap/jdk1.6.0. > > At a guess, it looks like you're using a bootstrap JDK that has newer > classes than the one being built. > > The second stage of the build builds the JDK again with itself, so that > is regularly tested. > -- > 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: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 > From dj at linuxfromscratch.org Sat Sep 3 00:16:50 2011 From: dj at linuxfromscratch.org (DJ Lucas) Date: Sat, 03 Sep 2011 02:16:50 -0500 Subject: icedtea6 cannot compile itself In-Reply-To: References: <20110831022733.GB29544@rivendell.middle-earth.co.uk> Message-ID: <4E61D462.9050907@linuxfromscratch.org> On 09/02/2011 11:57 AM, the mad doctor kaeding wrote: > Seriously? Not enough information? > No. You failed to provide any information on the host distribution, the build environment, configure arguments, etc. Building a large project such as IcedTea from source is a big undertaking, with many options. You need to first make certain that your build environment is at least relatively sane, something that we are unable to determine without you providing the information necessary to make that determination. > I'm following the instructions on > http://www.linuxfromscratch.org/blfs/view/svn/general/icedtea6.html > It instructs me to download icedtea6-1.9.7 binary and use it to > compile icedtea6-1.9.7 from source. I tried using the exact downloads > that that page links to, and get errors that some methods have the > same erasure as others, and the compilation fails (see my original > message). I tried using newer downloads, with the same types of > errors, but a different number of them. > > If I don't know what files to download to get a successful compilation, > would you please send me a list of the correct ones? Thank you. In the future, please first direct support questions to a related support list for your distribution. In this case, since your question is related to BLFS instructions, you should first try the BLFS suport list at blfs-support at linuxfromscratch.org so that they can be evaluated by the appropriate support community before requesting help from upstream developers. If the inquiry is relevant to the upstream developers, you will be directed there by the support community. The build errors and the last few lines of make's output prior to any error should be sufficient context to assist in determining a build problem for most projects. The complete output of the 'set' command might also be a useful first step toward evaluating your build environment. HTH -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From ptisnovs at icedtea.classpath.org Mon Sep 5 02:26:33 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 05 Sep 2011 09:26:33 +0000 Subject: /hg/gfx-test: * Makefile: added new classes to compile Message-ID: changeset 49478d158096 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=49478d158096 author: Pavel Tisnovsky date: Mon Sep 05 11:28:26 2011 +0200 * Makefile: added new classes to compile * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by linear gradient paint. * src/org/gfxtest/testsuites/LinearGradientPaint.java: Added new test suite containing 16 new gfx.tests. diffstat: ChangeLog | 8 + Makefile | 10 +- src/org/gfxtest/framework/CommonRenderingStyles.java | 270 ++++++++++++ src/org/gfxtest/testsuites/LinearGradientPaint.java | 419 +++++++++++++++++++ 4 files changed, 705 insertions(+), 2 deletions(-) diffs (truncated from 759 to 500 lines): diff -r 6c985b5ee97e -r 49478d158096 ChangeLog --- a/ChangeLog Fri Sep 02 10:39:52 2011 +0200 +++ b/ChangeLog Mon Sep 05 11:28:26 2011 +0200 @@ -1,3 +1,11 @@ +2011-09-05 Pavel Tisnovsky + * Makefile: added new classes to compile + * src/org/gfxtest/framework/CommonRenderingStyles.java: + Added methods supporting rendering shapes filled by linear gradient + paint. + * src/org/gfxtest/testsuites/LinearGradientPaint.java: + Added new test suite containing 16 new gfx.tests. + 2011-09-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/SpecialCases.java: Added 6 new test cases, added JavaDoc to existing test cases. diff -r 6c985b5ee97e -r 49478d158096 Makefile --- a/Makefile Fri Sep 02 10:39:52 2011 +0200 +++ b/Makefile Mon Sep 05 11:28:26 2011 +0200 @@ -130,7 +130,10 @@ $(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class \ $(CLASSES)/$(TESTSUITE_DIR)/DashedRoundRectangles.class \ $(CLASSES)/$(TESTSUITE_DIR)/PathsFromLines.class \ - $(CLASSES)/$(TESTSUITE_DIR)/SpecialCases.class + $(CLASSES)/$(TESTSUITE_DIR)/SpecialCases.class \ + $(CLASSES)/$(TESTSUITE_DIR)/GradientPaint.class \ + $(CLASSES)/$(TESTSUITE_DIR)/LinearGradientPaint.class \ + $(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class COMPARE_RESULTS = \ $(RESULTS)/AALines \ @@ -167,7 +170,10 @@ $(RESULTS)/DashedRectangles \ $(RESULTS)/DashedRoundRectangles \ $(RESULTS)/PathsFromLines \ - $(RESULTS)/SpecialCases + $(RESULTS)/SpecialCases \ + $(RESULTS)/GradientPaint \ + $(RESULTS)/LinearGradientPaint \ + $(RESULTS)/RadialGradientPaint # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') diff -r 6c985b5ee97e -r 49478d158096 src/org/gfxtest/framework/CommonRenderingStyles.java --- a/src/org/gfxtest/framework/CommonRenderingStyles.java Fri Sep 02 10:39:52 2011 +0200 +++ b/src/org/gfxtest/framework/CommonRenderingStyles.java Mon Sep 05 11:28:26 2011 +0200 @@ -44,6 +44,7 @@ import java.awt.Color; import java.awt.GradientPaint; import java.awt.Graphics2D; +import java.awt.LinearGradientPaint; import java.awt.RadialGradientPaint; import java.awt.MultipleGradientPaint.CycleMethod; @@ -88,6 +89,21 @@ private static final Color DEFAULT_GRADIENT_PAINT_SECOND_COLOR = Color.YELLOW; /** + * Default linear gradient paint first color. + */ + private static final Color DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR = Color.RED; + + /** + * Default linear gradient paint second color. + */ + private static final Color DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR = Color.WHITE; + + /** + * Default linear gradient paint third color. + */ + private static final Color DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR = Color.BLUE; + + /** * Default radial gradient paint first color. */ private static final Color DEFAULT_RADIAL_GRADIENT_PAINT_FIRST_COLOR = Color.RED; @@ -429,6 +445,260 @@ } /** + * Set horizontal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + */ + public static void setHorizontalLinearGradientFill(TestImage image, Graphics2D graphics) + { + setHorizontalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR); + } + + /** + * Set horizontal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param offset + * offset between shape border and edge of horizontal gradient, + * positive offset: gradient is narrower, negative offset: + * gradient is broader + */ + public static void setHorizontalLinearGradientFill(TestImage image, Graphics2D graphics, int offset) + { + setHorizontalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR, offset); + } + + /** + * Set horizontal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + */ + public static void setHorizontalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3) + { + setHorizontalLinearGradientFill(image, graphics, color1, color2, color3, 0); + } + + /** + * Set horizontal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + * @param offset + * offset between shape border and edge of horizontal gradient + */ + public static void setHorizontalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3, int offset) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + + float[] fractions = { 0.0f, 0.5f, 1.0f }; + Color[] colors = { color1, color2, color3 }; + + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc - radius + offset, yc, xc + radius - offset, yc, fractions, colors); + graphics.setPaint(linearGradientPaint); + } + + /** + * Set vertical linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + */ + public static void setVerticalLinearGradientFill(TestImage image, Graphics2D graphics) + { + setVerticalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR); + } + + /** + * Set vertical linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param offset + * offset between shape border and edge of horizontal gradient, + * positive offset: gradient is narrower, negative offset: + * gradient is broader + */ + public static void setVerticalLinearGradientFill(TestImage image, Graphics2D graphics, int offset) + { + setVerticalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR, offset); + } + + /** + * Set vertical linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + */ + public static void setVerticalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3) + { + setVerticalLinearGradientFill(image, graphics, color1, color2, color3, 0); + } + + /** + * Set vertical linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + * @param offset + * offset between shape border and edge of horizontal gradient + */ + public static void setVerticalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3, int offset) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + + float[] fractions = { 0.0f, 0.5f, 1.0f }; + Color[] colors = { color1, color2, color3 }; + + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc, yc - radius + offset, xc, yc + radius - offset, fractions, colors); + graphics.setPaint(linearGradientPaint); + } + + /** + * Set diagonal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + */ + public static void setDiagonalLinearGradientFill(TestImage image, Graphics2D graphics) + { + setDiagonalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR); + } + + /** + * Set diagonal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param offset + * offset between shape border and edge of horizontal gradient, + * positive offset: gradient is narrower, negative offset: + * gradient is broader + */ + public static void setDiagonalLinearGradientFill(TestImage image, Graphics2D graphics, int offset) + { + setDiagonalLinearGradientFill(image, graphics, DEFAULT_LINEAR_GRADIENT_PAINT_FIRST_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_SECOND_COLOR, DEFAULT_LINEAR_GRADIENT_PAINT_THIRD_COLOR, offset); + } + + /** + * Set diagonal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + */ + public static void setDiagonalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3) + { + setDiagonalLinearGradientFill(image, graphics, color1, color2, color3, 0); + } + + /** + * Set diagonal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param color1 + * color set for the first edge of gradient fill + * @param color2 + * color set for the second edge of gradient fill + * @param color3 + * color set for the third edge of gradient fill + * @param offset + * offset between shape border and edge of horizontal gradient + */ + public static void setDiagonalLinearGradientFill(TestImage image, Graphics2D graphics, Color color1, Color color2, Color color3, int offset) + { + // sin 45 = cos 45 = 0.707f + final double SIN_COS_45 = Math.cos(Math.PI / 4); + + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + int r2 = (int)(radius * SIN_COS_45 ); + int delta = (int) (offset * SIN_COS_45); + + // compute end points used for diagonal fill + int x1 = xc - r2 + delta; + int y1 = yc - r2 + delta; + int x2 = xc + r2 - delta; + int y2 = yc + r2 - delta; + + float[] fractions = { 0.0f, 0.5f, 1.0f }; + Color[] colors = { color1, color2, color3 }; + + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(x1, y1, x2, y2, fractions, colors); + graphics.setPaint(linearGradientPaint); + } + + /** * Set radial gradient fill for given graphics context. * * @param image diff -r 6c985b5ee97e -r 49478d158096 src/org/gfxtest/testsuites/LinearGradientPaint.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/LinearGradientPaint.java Mon Sep 05 11:28:26 2011 +0200 @@ -0,0 +1,419 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.testsuites; + +import java.awt.Graphics2D; + + + +import org.gfxtest.framework.*; +import org.gfxtest.framework.annotations.*; + +/** + * This test renders filled shapes using linear gradient paint. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at RenderStyle(RenderStyles.FILL) + at Transformation(Transformations.NONE) + at Zoom(1) +public class LinearGradientPaint extends GfxTest +{ + /** + * Test if circle drawn by graphics.drawOval() is rendered correctly. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleLinearGradientEmptyFill(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // draw the circle + CommonShapesRenderer.drawCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Horizontal gradient paint is used for filling this circle. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleHorizontalLinearGradientFill(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalLinearGradientFill(image, graphics); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Horizontal gradient paint is used for filling this circle. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleHorizontalLinearGradientFillPositiveOffset1(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalLinearGradientFill(image, graphics, image.getWidth() / 16); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Horizontal gradient paint is used for filling this circle. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleHorizontalLinearGradientFillPositiveOffset2(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalLinearGradientFill(image, graphics, image.getWidth() / 6); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Horizontal gradient paint is used for filling this circle. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleHorizontalLinearGradientFillNegativeOffset1(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color From xranby at icedtea.classpath.org Mon Sep 5 03:41:58 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 05 Sep 2011 10:41:58 +0000 Subject: /hg/icedtea6: 2011-09-05 Xerxes Ranby Message-ID: changeset fc183654bed3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc183654bed3 author: Xerxes Ranby date: Mon Sep 05 12:45:12 2011 +0200 2011-09-05 Xerxes Ranby JamVM - armhf: ensure stack is 8 byte aligned. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 9 +++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diffs (41 lines): diff -r c7dfe2b4791e -r fc183654bed3 ChangeLog --- a/ChangeLog Fri Sep 02 12:41:10 2011 +0200 +++ b/ChangeLog Mon Sep 05 12:45:12 2011 +0200 @@ -1,3 +1,12 @@ +2011-09-05 Xerxes R??nby + + JamVM + - armhf: ensure stack is 8 byte aligned. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. + (JAMVM_SHA256SUM): Updated. + 2011-09-02 Xerxes R??nby JamVM diff -r c7dfe2b4791e -r fc183654bed3 Makefile.am --- a/Makefile.am Fri Sep 02 12:41:10 2011 +0200 +++ b/Makefile.am Mon Sep 05 12:45:12 2011 +0200 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 -JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 +JAMVM_VERSION = 12d05e620a9fda129925104bc848014f91d971db +JAMVM_SHA256SUM = b7e3999f5b46cfddcf717b2d06460d34167fe9eb3b306a311f1df6d31b99ef32 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r c7dfe2b4791e -r fc183654bed3 NEWS --- a/NEWS Fri Sep 02 12:41:10 2011 +0200 +++ b/NEWS Mon Sep 05 12:45:12 2011 +0200 @@ -384,6 +384,7 @@ - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. - LP827463: Fix OpenJDK enclosingMethodInfo(). - Add support for armhf. + - armhf: ensure stack is 8 byte aligned. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Ignore assertions and verify options. From xranby at icedtea.classpath.org Mon Sep 5 03:56:11 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 05 Sep 2011 10:56:11 +0000 Subject: /hg/icedtea7: JamVM: armhf: ensure stack is 8 byte aligned. Message-ID: changeset 8e4f97b246e8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8e4f97b246e8 author: Xerxes Ranby date: Mon Sep 05 12:59:28 2011 +0200 JamVM: armhf: ensure stack is 8 byte aligned. 2011-09-05 Xerxes R?nby JamVM - armhf: ensure stack is 8 byte aligned. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 9 +++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diffs (41 lines): diff -r a8ba0d7cfa93 -r 8e4f97b246e8 ChangeLog --- a/ChangeLog Fri Sep 02 13:17:30 2011 +0200 +++ b/ChangeLog Mon Sep 05 12:59:28 2011 +0200 @@ -1,3 +1,12 @@ +2011-09-05 Xerxes R??nby + + JamVM + - armhf: ensure stack is 8 byte aligned. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. + (JAMVM_SHA256SUM): Updated. + 2011-09-02 Xerxes R??nby JamVM diff -r a8ba0d7cfa93 -r 8e4f97b246e8 Makefile.am --- a/Makefile.am Fri Sep 02 13:17:30 2011 +0200 +++ b/Makefile.am Mon Sep 05 12:59:28 2011 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 -JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 +JAMVM_VERSION = 12d05e620a9fda129925104bc848014f91d971db +JAMVM_SHA256SUM = b7e3999f5b46cfddcf717b2d06460d34167fe9eb3b306a311f1df6d31b99ef32 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r a8ba0d7cfa93 -r 8e4f97b246e8 NEWS --- a/NEWS Fri Sep 02 13:17:30 2011 +0200 +++ b/NEWS Mon Sep 05 12:59:28 2011 +0200 @@ -34,6 +34,7 @@ - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. - LP827463: Fix OpenJDK enclosingMethodInfo(). - Add support for armhf. + - armhf: ensure stack is 8 byte aligned. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Fix typo in definition of ACC_MIRANDA. From xranby at icedtea.classpath.org Mon Sep 5 03:57:53 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 05 Sep 2011 10:57:53 +0000 Subject: /hg/icedtea: JamVM: armhf: ensure stack is 8 byte aligned. Message-ID: changeset 71b9632774f8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=71b9632774f8 author: Xerxes Ranby date: Mon Sep 05 13:01:15 2011 +0200 JamVM: armhf: ensure stack is 8 byte aligned. 2011-09-05 Xerxes Ranby JamVM - armhf: ensure stack is 8 byte aligned. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 9 +++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diffs (41 lines): diff -r 4141f7541748 -r 71b9632774f8 ChangeLog --- a/ChangeLog Fri Sep 02 13:25:39 2011 +0200 +++ b/ChangeLog Mon Sep 05 13:01:15 2011 +0200 @@ -1,3 +1,12 @@ +2011-09-05 Xerxes R??nby + + JamVM + - armhf: ensure stack is 8 byte aligned. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. + (JAMVM_SHA256SUM): Updated. + 2011-09-02 Xerxes R??nby JamVM diff -r 4141f7541748 -r 71b9632774f8 Makefile.am --- a/Makefile.am Fri Sep 02 13:25:39 2011 +0200 +++ b/Makefile.am Mon Sep 05 13:01:15 2011 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 6a5776faa95649adae498e349da7a93b8b9fc355 -JAMVM_SHA256SUM = 1482dbd4d1ee44b6c50350904ae44debeaee72fb2fafeca6862db9fa00a04171 +JAMVM_VERSION = 12d05e620a9fda129925104bc848014f91d971db +JAMVM_SHA256SUM = b7e3999f5b46cfddcf717b2d06460d34167fe9eb3b306a311f1df6d31b99ef32 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 4141f7541748 -r 71b9632774f8 NEWS --- a/NEWS Fri Sep 02 13:25:39 2011 +0200 +++ b/NEWS Mon Sep 05 13:01:15 2011 +0200 @@ -19,6 +19,7 @@ - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. - LP827463: Fix OpenJDK enclosingMethodInfo(). - Add support for armhf. + - armhf: ensure stack is 8 byte aligned. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Fix typo in definition of ACC_MIRANDA. From xranby at icedtea.classpath.org Mon Sep 5 04:39:43 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 05 Sep 2011 11:39:43 +0000 Subject: /hg/buildbot: f3j, f3c, f3s: addStep check-hotspot. Message-ID: changeset 2b56af735fa6 in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=2b56af735fa6 author: Xerxes Ranby date: Mon Sep 05 13:41:42 2011 +0200 f3j, f3c, f3s: addStep check-hotspot. f3a5: addStep killall, to remove all testing zombies that slow-down the system and cause build timeouts. diffstat: icedtea/master.cfg | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diffs (43 lines): diff -r 4490440ca358 -r 2b56af735fa6 icedtea/master.cfg --- a/icedtea/master.cfg Thu Aug 11 13:00:04 2011 +0200 +++ b/icedtea/master.cfg Mon Sep 05 13:41:42 2011 +0200 @@ -320,6 +320,9 @@ "--enable-jamvm"], workdir="build")) f3j.addStep(Compile(workdir="build")) +f3j.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) f3j.addStep(JTRegCheck(command=["make", "check-langtools"], description="check-langtools", workdir="build")) @@ -338,6 +341,9 @@ "--enable-cacao"], workdir="build")) f3c.addStep(Compile(workdir="build")) +f3c.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) f3c.addStep(JTRegCheck(command=["make", "check-langtools"], description="check-langtools", workdir="build")) @@ -356,6 +362,9 @@ "--enable-shark"], workdir="build")) f3s.addStep(Compile(workdir="build")) +f3s.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) f3s.addStep(JTRegCheck(command=["make", "check-langtools"], description="check-langtools", workdir="build")) @@ -595,6 +604,9 @@ f3a5.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir")) +f3a5.addStep(ShellCommand(command=["killall", "-kill", "java"], + workdir=".", + description="killall")) f3a5.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--with-parallel-jobs=1", From xranby at icedtea.classpath.org Mon Sep 5 09:36:51 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 05 Sep 2011 16:36:51 +0000 Subject: /hg/buildbot: correct killall -s KILL java argument Message-ID: changeset 51a64788c03b in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=51a64788c03b author: Xerxes Ranby date: Mon Sep 05 18:40:06 2011 +0200 correct killall -s KILL java argument diffstat: icedtea/master.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b56af735fa6 -r 51a64788c03b icedtea/master.cfg --- a/icedtea/master.cfg Mon Sep 05 13:41:42 2011 +0200 +++ b/icedtea/master.cfg Mon Sep 05 18:40:06 2011 +0200 @@ -604,7 +604,7 @@ f3a5.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir")) -f3a5.addStep(ShellCommand(command=["killall", "-kill", "java"], +f3a5.addStep(ShellCommand(command=["killall", "-s", "KILL", "java"], workdir=".", description="killall")) f3a5.addStep(Configure(command=["../src/configure", From bugzilla-daemon at icedtea.classpath.org Mon Sep 5 09:54:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 05 Sep 2011 16:54:13 +0000 Subject: [Bug 782] New: Please support building against npapi-sdk as well Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 Summary: Please support building against npapi-sdk as well Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: enhancement Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: mgorny at gentoo.org CC: unassigned at icedtea.classpath.org Created an attachment (id=566) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=566) A simple patch to support npapi-sdk NPAPI-SDK [1] is a package providing a tiny set of NPAPI headers. It is used by a few browsers already. We [Gentoo] are working on making that package used by plugins as well. That's why the project was temporarily forked [2] to a version providing a pkg-config file for it. We're going to have that patches pushed in the next few days, so we are already pinging upstreams to prepare their buildsystems. We will be also working on removing the relevant headers from Mozilla products and making them reuse NPAPI-SDK as well. Packages building against NPAPI should use 'npapi-sdk' pkg-config package. If it's necessary to perform any kind of version check, the SDK package version will correspond to NPAPI version, and that version should be checked (rather than libxul/firefox version). I'm attaching a quick patch which makes icedtea-web build fine with npapi-sdk. Considering that the work is done on npapi-sdk 0.27, which corresponds to Firefox 6.0/xulrunner 2.0, I've added a little hack to omit libxul version check. Of course, it would be more correct if the code used NPAPI versions instead. [1]:http://code.google.com/p/npapi-sdk/ [2]:https://github.com/mgorny/npapi-sdk/ -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Tue Sep 6 02:37:23 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 06 Sep 2011 09:37:23 +0000 Subject: /hg/gfx-test: * src/org/gfxtest/testsuites/LinearGradientPaint.j... Message-ID: changeset b92ad5c954c0 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b92ad5c954c0 author: Pavel Tisnovsky date: Tue Sep 06 11:39:17 2011 +0200 * src/org/gfxtest/testsuites/LinearGradientPaint.java: Added 22 new gfx. tests. * src/org/gfxtest/framework/CommonShapesRenderer.java: Added method for rendering empty rectangle. * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by gradient with various color bands. diffstat: ChangeLog | 37 + src/org/gfxtest/framework/CommonRenderingStyles.java | 115 ++++ src/org/gfxtest/framework/CommonShapesRenderer.java | 24 + src/org/gfxtest/testsuites/LinearGradientPaint.java | 501 +++++++++++++++++++ 4 files changed, 677 insertions(+), 0 deletions(-) diffs (truncated from 921 to 500 lines): diff -r 49478d158096 -r b92ad5c954c0 ChangeLog --- a/ChangeLog Mon Sep 05 11:28:26 2011 +0200 +++ b/ChangeLog Tue Sep 06 11:39:17 2011 +0200 @@ -1,4 +1,15 @@ +2011-09-06 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/LinearGradientPaint.java: + Added 22 new tests. + * src/org/gfxtest/framework/CommonShapesRenderer.java: + Added method for rendering empty rectangle. + * src/org/gfxtest/framework/CommonRenderingStyles.java: + Added methods supporting rendering shapes filled by gradient + with various color bands. + 2011-09-05 Pavel Tisnovsky + * Makefile: added new classes to compile * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by linear gradient @@ -7,10 +18,12 @@ Added new test suite containing 16 new gfx.tests. 2011-09-02 Pavel Tisnovsky + * src/org/gfxtest/testsuites/SpecialCases.java: Added 6 new test cases, added JavaDoc to existing test cases. 2011-08-19 Pavel Tisnovsky + * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by radial gradient paint. @@ -20,6 +33,7 @@ Created new test suite containing 12 new gfx.tests. 2011-08-18 Pavel Tisnovsky + * src/org/gfxtest/testsuites/GradientPaint.java: Created new test suite containing 16 new gfx.tests. * src/org/gfxtest/common/CommonShapesRenderer.java: @@ -28,6 +42,7 @@ Added methods supporting rendering shapes filled by gradient paint. 2011-08-17 Pavel Tisnovsky + * src/org/gfxtest/common/Configuration.java: Added JavaDoc. * src/org/gfxtest/framework/CommonRenderingStyles.java: @@ -39,11 +54,13 @@ Added new test cases. 2011-08-16 Pavel Tisnovsky + * src/org/gfxtest/testsuites/BlankImage.java: Added new test cases (rendering using transparency etc.), added JavaDoc. 2011-08-12 Pavel Tisnovsky + * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: * src/org/gfxtest/testsuites/NormalCubicCurves.java: @@ -51,6 +68,7 @@ Refactored, added new test cases (rendering using transparency etc.) 2011-08-11 Pavel Tisnovsky + * Makefile: added new classes to compile * src/org/gfxtest/framework/CommonRenderingStyles.java: Added class containing static methods for setting various rendering @@ -62,16 +80,19 @@ Javadoc. 2011-08-09 Pavel Tisnovsky + * src/org/gfxtest/testsuites/ColorPaint.java: Created new test suite containing 12 gfx.tests. 2011-08-08 Pavel Tisnovsky + * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: Fixed minor issues in two tests. * src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java: Created new test suite containing 12 gfx.tests. 2011-08-05 Pavel Tisnovsky + * src/org/gfxtest/framework/CubicCurvePointSet.java: Added new methods for fetching points arrays. * src/org/gfxtest/framework/GfxTest.java: @@ -85,31 +106,37 @@ Added new test cases. 2011-08-04 Pavel Tisnovsky + * src/org/gfxtest/framework/CubicCurvePointSet.java: added * src/org/gfxtest/testsuites/NormalCubicCurves.java: Refactoring, added more test cases including special cases (multiple control points). 2011-08-04 Pavel Tisnovsky + * diff.diff: removed as it's just a garbage. * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: Added new tests - drawing curves using extra width stroke. 2011-08-03 Pavel Tisnovsky + * diff.diff: removed as it's just a garbage. * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: Added tests for special cases - multiple control points. 2011-08-03 Pavel Tisnovsky + * src/org/gfxtest/testsuites/ColorPalette.java: added new method * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: Refactoring, added new test cases. 2011-08-02 Pavel Tisnovsky + * src/org/gfxtest/testsuites/PathsFromLines.java: created new test cases. 2011-08-01 Pavel Tisnovsky + * src/org/gfxtest/harness/ExternalCommands.java: * src/org/gfxtest/framework/GfxTestConfiguration.java: Fixed issue: each test suite can be called from command line without @@ -117,21 +144,26 @@ are used instead. Code refactoring, added missing JavaDoc. 2011-08-01 Pavel Tisnovsky + * src/org/gfxtest/harness/ExternalCommands.java: Code refactoring and added missing JavaDoc. 2011-07-29 Pavel Tisnovsky + * src/org/gfxtest/testsuites/AALines.java: improved JavaDoc. 2011-07-29 Pavel Tisnovsky + * Makefile: added new class to compile & run: PathsFromLines.java * src/org/gfxtest/testsuites/PathsFromLines.java: created new test suite containing test using Path2D class for rendering lines. 2011-07-28 Pavel Tisnovsky + * src/org/gfxtest/testsuites/NormalLines.java: added new tests 2011-07-27 Pavel Tisnovsky + * Makefile: Added new build targets - doc and clean-doc * src/org/gfxtest/framework/GfxTest.java: @@ -140,22 +172,26 @@ Fixed javadoc tool warnings, added doc to all methods and attributes. 2011-07-27 Pavel Tisnovsky + * Makefile: added new class to compile & run: NormalCubicCurves.java * src/org/gfxtest/testsuites/NormalCubicCurves.java: created Added new test suite - drawing of normal cubic curves. 2011-07-26 Pavel Tisnovsky + * src/org/gfxtest/testsuites/NormalQuadraticCurve.java: renamed * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: renamed * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: created Added new test suite - drawing of normal quadratic curves using Path2D. 2011-07-26 Pavel Tisnovsky + * Makefile: added new class to compile & run: NormalQuadraticCurve.java * src/org/gfxtest/testsuites/NormalQuadraticCurve.java: created Added new test suite - drawing of normal quadratic curves. 2011-07-22 Pavel Tisnovsky + * src/org/gfxtest/harness/PixelPanel.java: created * src/org/gfxtest/harness/MainWindow.java: Add capability of showing values of selected pixels from @@ -163,6 +199,7 @@ the selected pixel. 2011-07-21 Pavel Tisnovsky + * src/org/gfxtest/ImageDiffer/ImageUtils.java: * src/org/gfxtest/harness/MainWindow.java: Add image zooming capability into gfx-test harness. diff -r 49478d158096 -r b92ad5c954c0 src/org/gfxtest/framework/CommonRenderingStyles.java --- a/src/org/gfxtest/framework/CommonRenderingStyles.java Mon Sep 05 11:28:26 2011 +0200 +++ b/src/org/gfxtest/framework/CommonRenderingStyles.java Tue Sep 06 11:39:17 2011 +0200 @@ -518,10 +518,45 @@ // calculate radius of circle int radius = CommonShapesRenderer.calculateRadius(image); + // numbers ranging from 0.0 to 1.0 specifying the distribution of colors along the gradient float[] fractions = { 0.0f, 0.5f, 1.0f }; + + // array of colors corresponding to each fractional value Color[] colors = { color1, color2, color3 }; + // create linear gradient object LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc - radius + offset, yc, xc + radius - offset, yc, fractions, colors); + + // set fill style + graphics.setPaint(linearGradientPaint); + } + + /** + * Set horizontal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param fractions + * numbers ranging from 0.0 to 1.0 specifying the distribution of + * colors along the gradient + * @param colors + * array of colors corresponding to each fractional value + */ + public static void setHorizontalLinearGradientFill(TestImage image, Graphics2D graphics, float[] fractions, Color[] colors) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + + // create linear gradient object + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc - radius, yc, xc + radius, yc, fractions, colors); + + // set fill style graphics.setPaint(linearGradientPaint); } @@ -599,10 +634,45 @@ // calculate radius of circle int radius = CommonShapesRenderer.calculateRadius(image); + // numbers ranging from 0.0 to 1.0 specifying the distribution of colors along the gradient float[] fractions = { 0.0f, 0.5f, 1.0f }; + + // array of colors corresponding to each fractional value Color[] colors = { color1, color2, color3 }; + // create linear gradient object LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc, yc - radius + offset, xc, yc + radius - offset, fractions, colors); + + // set fill style + graphics.setPaint(linearGradientPaint); + } + + /** + * Set vertical linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param fractions + * numbers ranging from 0.0 to 1.0 specifying the distribution of + * colors along the gradient + * @param colors + * array of colors corresponding to each fractional value + */ + public static void setVerticalLinearGradientFill(TestImage image, Graphics2D graphics, float[] fractions, Color[] colors) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + + // create linear gradient object + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(xc, yc - radius, xc, yc + radius, fractions, colors); + + // set fill style graphics.setPaint(linearGradientPaint); } @@ -691,10 +761,55 @@ int x2 = xc + r2 - delta; int y2 = yc + r2 - delta; + // numbers ranging from 0.0 to 1.0 specifying the distribution of colors along the gradient float[] fractions = { 0.0f, 0.5f, 1.0f }; + + // array of colors corresponding to each fractional value Color[] colors = { color1, color2, color3 }; + // create linear gradient object LinearGradientPaint linearGradientPaint = new LinearGradientPaint(x1, y1, x2, y2, fractions, colors); + + // set fill style + graphics.setPaint(linearGradientPaint); + } + + /** + * Set diagonal linear gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param fractions + * numbers ranging from 0.0 to 1.0 specifying the distribution of + * colors along the gradient + * @param colors + * array of colors corresponding to each fractional value + */ + public static void setDiagonalLinearGradientFill(TestImage image, Graphics2D graphics, float[] fractions, Color[] colors) + { + // sin 45 = cos 45 = 0.707f + final double SIN_COS_45 = Math.cos(Math.PI / 4); + + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + int r2 = (int)(radius * SIN_COS_45 ); + + // compute end points used for diagonal fill + int x1 = xc - r2; + int y1 = yc - r2; + int x2 = xc + r2; + int y2 = yc + r2; + + // create linear gradient object + LinearGradientPaint linearGradientPaint = new LinearGradientPaint(x1, y1, x2, y2, fractions, colors); + + // set fill style graphics.setPaint(linearGradientPaint); } diff -r 49478d158096 -r b92ad5c954c0 src/org/gfxtest/framework/CommonShapesRenderer.java --- a/src/org/gfxtest/framework/CommonShapesRenderer.java Mon Sep 05 11:28:26 2011 +0200 +++ b/src/org/gfxtest/framework/CommonShapesRenderer.java Tue Sep 06 11:39:17 2011 +0200 @@ -155,6 +155,30 @@ } /** + * Draw rectangle onto the graphics canvas. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + */ + public static void drawRectangle(TestImage image, Graphics2D graphics) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate size of the rectangle + int size = calculateRadius(image); + + // draw the rectangle + graphics.drawRect(xc - size, yc - size, size << 1, size << 1); + + // draw crosses at interesting points of image + drawCrossesForBasicShapes(graphics, xc, yc, size); + } + + /** * Draw filled circle onto the graphics canvas. * * @param image diff -r 49478d158096 -r b92ad5c954c0 src/org/gfxtest/testsuites/LinearGradientPaint.java --- a/src/org/gfxtest/testsuites/LinearGradientPaint.java Mon Sep 05 11:28:26 2011 +0200 +++ b/src/org/gfxtest/testsuites/LinearGradientPaint.java Tue Sep 06 11:39:17 2011 +0200 @@ -40,6 +40,7 @@ package org.gfxtest.testsuites; +import java.awt.Color; import java.awt.Graphics2D; @@ -58,6 +59,20 @@ @Zoom(1) public class LinearGradientPaint extends GfxTest { + // numbers ranging from 0.0 to 1.0 specifying the distribution of colors along the gradient + private static final float[] SpectrumFractions = { 0.0f, 1.0f/6, 2.0f/6, 3.0f/6, 4.0f/6, 5.0f/6, 1.0f }; + + // array of colors corresponding to each fractional value + private static final Color[] SpectrumColors = { + Color.MAGENTA, + Color.BLUE, + Color.CYAN, + Color.GREEN, + Color.YELLOW, + Color.ORANGE, + Color.RED + }; + /** * Test if circle drawn by graphics.drawOval() is rendered correctly. * @@ -78,6 +93,25 @@ } /** + * Test if rectangle is rendered correctly. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testRectangleLinearGradientEmptyFill(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // draw the rectangle + CommonShapesRenderer.drawRectangle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** * Test if filled circle drawn by graphics.fillOval() is rendered correctly. * Horizontal gradient paint is used for filling this circle. * @@ -189,6 +223,29 @@ /** * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Horizontal linear gradient paint is used for filling this circle using + * whole color spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleHorizontalColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalLinearGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. * Vertical gradient paint is used for filling this circle. * * @param image @@ -299,6 +356,29 @@ /** * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Vertical linear gradient paint is used for filling this circle using + * whole color spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleVerticalColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setVerticalLinearGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. * Diagonal gradient paint is used for filling this circle. * * @param image @@ -408,6 +488,427 @@ } /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Diagonal linear gradient paint is used for filling this circle using + * whole color spectrum. From bugzilla-daemon at icedtea.classpath.org Tue Sep 6 07:14:01 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Sep 2011 14:14:01 +0000 Subject: [Bug 783] Jboss server instance is suddenly shutting down.. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=783 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpath | |.org, xerxes at zafena.se AssignedTo|neugens at limasoftware.net |ahughes at redhat.com Severity|major |normal Component|IcedRobot |IcedTea7 OS/Version|Solaris |Linux Priority|P5 |P1 Product|IcedRobot |IcedTea Platform|all |x86_64 Version|unspecified |7-1.6 --- Comment #1 from Xerxes R?nby 2011-09-06 14:14:00 --- Moving bug from the IcedRobot to the IcedTea project. I have checked your log: vm_info: OpenJDK 64-Bit Server VM (1.6.0-b09) for linux-amd64 JRE (1.6.0-b09), built on Dec 16 2008 12:10:53 by "mockbuild" with gcc 4.1.2 20080704 (Red Hat 4.1.2-44) Please check with Red Hat if they provide a more recent version of OpenJDK built using icedtea6 version 1.8 or later that have been tested on: OS:Red Hat Enterprise Linux Server release 5.3 (Tikanga) I noticed that the crash happened in the debug routines of your VM, if possible try remove -Dsun.jvm.hotspot.debugger.useProcDebugger and -Dsun.jvm.hotspot.debugger.useWindbgDebugger from the command line. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Sep 6 07:16:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Sep 2011 14:16:17 +0000 Subject: [Bug 783] Jboss server instance is suddenly shutting down.. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=783 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC|icedrobot- | |dev at icedtea.classpath.org | Priority|P1 |P5 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Tue Sep 6 08:06:43 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 06 Sep 2011 15:06:43 +0000 Subject: /hg/icedtea7: Integrate updated system library provisioning for ... Message-ID: changeset 0af3b9f0e92e in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0af3b9f0e92e author: Andrew John Hughes date: Tue Sep 06 16:06:22 2011 +0100 Integrate updated system library provisioning for zlib, libpng, libjpeg and giflib. PR770: Zero 7033954 regression: missing mapfile 2011-09-06 Andrew John Hughes * patches/hotspot-gcc-pr36917.patch: Redundant, was removed from IcedTea6. * patches/libraries.patch, * patches/linker-libs-order.patch, * patches/pr261.patch: Updated and recreated in the IcedTea7 forest. * Makefile.am: (JDK_CHANGESET): Updated. (JDK_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove above. (ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS, USE_SYSTEM_ZLIB, JPEG_LIBS, JPEG_CFLAGS, USE_SYSTEM_JPEG, PNG_LIBS, PNG_CFLAGS, USE_SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS, USE_SYSTEM_GIF. * NEWS: Mention new system library provision and cleanup ordering. Mention fix for PR770. * acinclude.m4: (IT_CHECK_FOR_ZLIB): New macro to check for zlib. (IT_CHECK_FOR_JPEG): Likewise for libjpeg. (IT_CHECK_FOR_PNG): Likewise for libpng. (IT_CHECK_FOR_GIF): Likewise for giflib. * configure.ac: Remove old AC_CHECK_LIB calls for jpeg, gif and zlib and PKG_CHECK_MODULES call for libpng. Add calls to new macros above. * remove-intree-libraries.sh.in: Make removal of zlib, libpng, giflib and libjpeg files dependent on whether or not the system versions are used (the default). diffstat: ChangeLog | 33 + Makefile.am | 36 +- NEWS | 4 +- acinclude.m4 | 102 +++ configure.ac | 27 +- patches/hotspot-gcc-pr36917.patch | 8 - patches/libraries.patch | 1257 ------------------------------------- patches/linker-libs-order.patch | 52 - patches/pr261.patch | 38 - remove-intree-libraries.sh.in | 73 +- 10 files changed, 195 insertions(+), 1435 deletions(-) diffs (truncated from 1797 to 500 lines): diff -r 8e4f97b246e8 -r 0af3b9f0e92e ChangeLog --- a/ChangeLog Mon Sep 05 12:59:28 2011 +0200 +++ b/ChangeLog Tue Sep 06 16:06:22 2011 +0100 @@ -1,3 +1,36 @@ +2011-09-06 Andrew John Hughes + + * patches/hotspot-gcc-pr36917.patch: + Redundant, was removed from IcedTea6. + * patches/libraries.patch, + * patches/linker-libs-order.patch, + * patches/pr261.patch: + Updated and recreated in the IcedTea7 forest. + * Makefile.am: + (JDK_CHANGESET): Updated. + (JDK_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Remove above. + (ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS, + USE_SYSTEM_ZLIB, JPEG_LIBS, JPEG_CFLAGS, + USE_SYSTEM_JPEG, PNG_LIBS, PNG_CFLAGS, + USE_SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS, + USE_SYSTEM_GIF. + * NEWS: Mention new system library provision + and cleanup ordering. Mention fix for PR770. + * acinclude.m4: + (IT_CHECK_FOR_ZLIB): New macro to check for zlib. + (IT_CHECK_FOR_JPEG): Likewise for libjpeg. + (IT_CHECK_FOR_PNG): Likewise for libpng. + (IT_CHECK_FOR_GIF): Likewise for giflib. + * configure.ac: + Remove old AC_CHECK_LIB calls for jpeg, gif + and zlib and PKG_CHECK_MODULES call for libpng. + Add calls to new macros above. + * remove-intree-libraries.sh.in: + Make removal of zlib, libpng, giflib and libjpeg + files dependent on whether or not the system versions + are used (the default). + 2011-09-05 Xerxes R??nby JamVM diff -r 8e4f97b246e8 -r 0af3b9f0e92e Makefile.am --- a/Makefile.am Mon Sep 05 12:59:28 2011 +0200 +++ b/Makefile.am Tue Sep 06 16:06:22 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 1dd9b3d73b22 JAXP_CHANGESET = c40983d6ae70 JAXWS_CHANGESET = 83db5e316798 -JDK_CHANGESET = e46d527097f1 +JDK_CHANGESET = db7a2639858b LANGTOOLS_CHANGESET = fb7fb3071b64 OPENJDK_CHANGESET = 3defd24c2671 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21 -JDK_SHA256SUM = 0cd074fb2400c95d013373847b5c52bb13997acbb6530507e384856583e1abd4 +JDK_SHA256SUM = 81b510c80f3af0a1cd19704c616a68ff131362b517996ae65cb91c9a5849fcdc LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e @@ -246,13 +246,11 @@ # Patch list ICEDTEA_PATCHES = \ - patches/libraries.patch \ patches/debian/uname.patch \ patches/sparc-ptracefix.patch \ patches/sparc-trapsfix.patch \ patches/override-redirect-metacity.patch \ patches/security-updates.patch \ - patches/hotspot-gcc-pr36917.patch \ patches/alpha-fixes.patch \ patches/alt-jar.patch \ patches/use-idx_t.patch \ @@ -262,9 +260,7 @@ patches/signed-types.patch \ patches/lc_ctype.patch \ patches/tests-jdk.patch \ - patches/linker-libs-order.patch \ patches/samejvm-safe.patch \ - patches/pr261.patch \ patches/parisc-opt.patch \ patches/security/6592792.patch \ patches/security/6733959.patch \ @@ -515,6 +511,13 @@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" endif +if USE_SYSTEM_ZLIB +ICEDTEA_ENV += \ + USE_SYSTEM_ZLIB="true" \ + ZLIB_LIBS="${ZLIB_LIBS}" \ + ZLIB_CFLAGS="${ZLIB_CFLAGS}" +endif + if USE_SYSTEM_LCMS ICEDTEA_ENV += \ USE_SYSTEM_LCMS="true" \ @@ -522,6 +525,27 @@ LCMS_CFLAGS="${LCMS2_CFLAGS}" endif +if USE_SYSTEM_JPEG +ICEDTEA_ENV += \ + USE_SYSTEM_JPEG="true" \ + JPEG_LIBS="${JPEG_LIBS}" \ + JPEG_CFLAGS="${JPEG_CFLAGS}" +endif + +if USE_SYSTEM_PNG +ICEDTEA_ENV += \ + USE_SYSTEM_PNG="true" \ + PNG_LIBS="${PNG_LIBS}" \ + PNG_CFLAGS="${PNG_CFLAGS}" +endif + +if USE_SYSTEM_GIF +ICEDTEA_ENV += \ + USE_SYSTEM_GIF="true" \ + GIF_LIBS="${GIF_LIBS}" \ + GIF_CFLAGS="${GIF_CFLAGS}" +endif + # OpenJDK boot build environment. ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \ diff -r 8e4f97b246e8 -r 0af3b9f0e92e NEWS --- a/NEWS Mon Sep 05 12:59:28 2011 +0200 +++ b/NEWS Tue Sep 06 16:06:22 2011 +0100 @@ -13,10 +13,11 @@ New in release 2.0 (2011-XX-XX): * Bug fixes - - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException - Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP. - Fixed regression test runtime/7020373. + - Convert to optional system library usage via USE_SYSTEM_ZLIB/JPEG/PNG/GIF. - PR586: Add missing sources to src.zip. + - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException - G356743: Support building against libpng 1.5. - S7070134: Hotspot crashes with sigsegv from PorterStemmer - S7044738: Loop unroll optimization causes incorrect result @@ -25,6 +26,7 @@ * Zero/Shark - PR757, 7066143: 7009309 regression: x86 stubRoutines - PR753, 7066143: 7009923 regression + - PR770: Zero 7033954 regression: missing mapfile - methodHandles_zero missing. - sharkContext typo in assert - sharedRuntime needs rework after indy reorg diff -r 8e4f97b246e8 -r 0af3b9f0e92e acinclude.m4 --- a/acinclude.m4 Mon Sep 05 12:59:28 2011 +0200 +++ b/acinclude.m4 Tue Sep 06 16:06:22 2011 +0100 @@ -1956,6 +1956,108 @@ AC_SUBST(ENABLE_SYSTEM_LCMS) ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_ZLIB], +[ + AC_MSG_CHECKING([whether to use the system zlib install]) + AC_ARG_ENABLE([system-zlib], + [AS_HELP_STRING(--enable-system-zlib,use the system ZLIB [[default=yes]])], + [ + ENABLE_SYSTEM_ZLIB="${enableval}" + ], + [ + ENABLE_SYSTEM_ZLIB="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_ZLIB}) + if test x"${ENABLE_SYSTEM_ZLIB}" = "xyes"; then + dnl Check for ZLIB headers and libraries. + PKG_CHECK_MODULES(ZLIB, zlib,[ZLIB_FOUND=yes],[ZLIB_FOUND=no]) + if test "x${ZLIB_FOUND}" = xno + then + AC_MSG_ERROR([Could not find ZLIB; install ZLIB or build with --disable-system-zlib to use the in-tree copy.]) + fi + AC_SUBST(ZLIB_CFLAGS) + AC_SUBST(ZLIB_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_ZLIB, test x"${ENABLE_SYSTEM_ZLIB}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_ZLIB) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_JPEG], +[ + AC_MSG_CHECKING([whether to use the system jpeg install]) + AC_ARG_ENABLE([system-jpeg], + [AS_HELP_STRING(--enable-system-jpeg,use the system libjpeg [[default=yes]])], + [ + ENABLE_SYSTEM_JPEG="${enableval}" + ], + [ + ENABLE_SYSTEM_JPEG="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_JPEG}) + if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then + dnl Check for JPEG headers and libraries. + AC_CHECK_LIB([jpeg], [main], + , [AC_MSG_ERROR("Could not find JPEG library; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")]) + AC_CHECK_HEADER([jpeglib.h], + , [AC_MSG_ERROR("Could not find JPEG header; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")]) + JPEG_LIBS="-ljpeg" + AC_SUBST(JPEG_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_JPEG, test x"${ENABLE_SYSTEM_JPEG}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_JPEG) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_PNG], +[ + AC_MSG_CHECKING([whether to use the system libpng install]) + AC_ARG_ENABLE([system-png], + [AS_HELP_STRING(--enable-system-png,use the system PNG [[default=yes]])], + [ + ENABLE_SYSTEM_PNG="${enableval}" + ], + [ + ENABLE_SYSTEM_PNG="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_PNG}) + if test x"${ENABLE_SYSTEM_PNG}" = "xyes"; then + dnl Check for PNG headers and libraries. + PKG_CHECK_MODULES(PNG, libpng,[LIBPNG_FOUND=yes],[LIBPNG_FOUND=no]) + if test "x${LIBPNG_FOUND}" = xno + then + AC_MSG_ERROR([Could not find libpng; install libpng or build with --disable-system-png to use the in-tree copy.]) + fi + AC_SUBST(PNG_CFLAGS) + AC_SUBST(PNG_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_PNG, test x"${ENABLE_SYSTEM_PNG}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_PNG) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_GIF], +[ + AC_MSG_CHECKING([whether to use the system giflib install]) + AC_ARG_ENABLE([system-gif], + [AS_HELP_STRING(--enable-system-gif,use the system giflib [[default=yes]])], + [ + ENABLE_SYSTEM_GIF="${enableval}" + ], + [ + ENABLE_SYSTEM_GIF="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_GIF}) + if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then + dnl Check for GIF headers and libraries. + AC_CHECK_LIB([gif], [main], + , [AC_MSG_ERROR("Could not find GIF library; install GIF or build with --disable-system-gif to use the in-tree copy.")]) + AC_CHECK_HEADER([gif_lib.h], + , [AC_MSG_ERROR("Could not find GIF header; install GIF or build with --disable-system-gif to use the in-tree copy.")]) + GIF_LIBS="-lgif" + AC_SUBST(GIF_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_GIF, test x"${ENABLE_SYSTEM_GIF}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_GIF) +]) + AC_DEFUN([IT_ENABLE_JAMVM], [ AC_MSG_CHECKING(whether to use JamVM as VM) diff -r 8e4f97b246e8 -r 0af3b9f0e92e configure.ac --- a/configure.ac Mon Sep 05 12:59:28 2011 +0200 +++ b/configure.ac Tue Sep 06 16:06:22 2011 +0100 @@ -167,12 +167,13 @@ AC_CHECK_HEADERS([X11/X.h],[] ,[AC_MSG_ERROR("xorg headers were not found - try installing xorg-x11-proto-devel.")]) -AC_CHECK_LIB(jpeg, main, - , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")]) -AC_CHECK_LIB(gif, main, - , [AC_MSG_ERROR("giflib not found - try installing giflib-devel")]) -AC_CHECK_LIB(z, main, - , [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) + +IT_CHECK_FOR_ZLIB +IT_CHECK_FOR_JPEG +IT_CHECK_FOR_PNG +IT_CHECK_FOR_GIF +IT_CHECK_FOR_LCMS +AC_CONFIG_FILES([remove-intree-libraries.sh]) dnl Check for Xproto headers and libraries. PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) @@ -296,17 +297,6 @@ AC_CONFIG_FILES([tapset/jstack.stp]) fi -dnl Check for libpng headers and libraries. -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] - ,[LIBPNG_FOUND=no]) -if test "x${LIBPNG_FOUND}" = xno -then - AC_MSG_ERROR([Could not find libpng - \ - Try installing libpng-devel.]) -fi -AC_SUBST(LIBPNG_CFLAGS) -AC_SUBST(LIBPNG_LIBS) - dnl Check for libXtst headers and libraries. PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) if test "x${XTST_FOUND}" = xno @@ -440,9 +430,6 @@ AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) -IT_CHECK_FOR_LCMS -AC_CONFIG_FILES([remove-intree-libraries.sh]) - # Arguments passed to configure. AC_SUBST(CONFIGURE_ARGS) CONFIGURE_ARGS="$ac_configure_args" diff -r 8e4f97b246e8 -r 0af3b9f0e92e patches/hotspot-gcc-pr36917.patch --- a/patches/hotspot-gcc-pr36917.patch Mon Sep 05 12:59:28 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/i486.make~ 2008-07-10 22:04:18.000000000 +0200 -+++ openjdk/hotspot/make/linux/makefiles/i486.make 2008-07-24 12:23:11.344839305 +0200 -@@ -34,3 +34,6 @@ - CFLAGS += -DVM_LITTLE_ENDIAN - - OPT_CFLAGS/compactingPermGenGen.o = -O1 -+ -+# GCC PR tree-optimization/36917 -+OPT_CFLAGS/ciTypeFlow.o += $(OPT_CFLAGS) -fno-ivopts diff -r 8e4f97b246e8 -r 0af3b9f0e92e patches/libraries.patch --- a/patches/libraries.patch Mon Sep 05 12:59:28 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1277 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2011-06-11 00:38:06.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:12:16.465040427 +0100 -@@ -70,12 +70,10 @@ - $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ - $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) - -- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) -- OTHER_CXXFLAGS += $(ZINCLUDE) -- LDDFLAGS += $(ZIPOBJS) -+ OTHER_LDLIBS += -lz - else - OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI -- OTHER_LDLIBS += $(JVMLIB) -+ OTHER_LDLIBS += -lz $(JVMLIB) - endif - - CXXFLAGS_DBG += -DFULL -@@ -94,12 +92,12 @@ - RES = $(OBJDIR)/$(PGRM).res - else - LDOUTPUT = -o #Have a space -- LDDFLAGS += -lc -+ LDDFLAGS += -lz -lc - OTHER_LDLIBS += $(LIBCXX) - # setup the list of libraries to link in... - ifeq ($(PLATFORM), linux) - ifeq ("$(CC_VER_MAJOR)", "3") -- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic -+ OTHER_LDLIBS += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic - endif - endif #LINUX - endif #PLATFORM -diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk.orig/jdk/make/common/Program.gmk 2011-06-11 00:38:06.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2011-06-13 15:12:16.465040427 +0100 -@@ -91,6 +91,7 @@ - endif - endif - ifeq ($(PLATFORM), linux) -+ LDFLAGS += -lz - LDFLAGS += $(LDFLAG_Z_ORIGIN) - LDFLAGS += -Wl,--allow-shlib-undefined - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli -@@ -247,7 +248,6 @@ - endif - - OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin --OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 - - OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' - VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' -diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile ---- openjdk.orig/jdk/make/java/jli/Makefile 2011-06-11 00:38:06.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2011-06-13 15:12:16.465040427 +0100 -@@ -44,7 +44,6 @@ - - include $(BUILDDIR)/common/Defs.gmk - --ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) - LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin - LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin - -@@ -69,13 +68,7 @@ - parse_manifest.c \ - version_comp.c \ - wildcard.c \ -- jli_util.c \ -- inflate.c \ -- inftrees.c \ -- inffast.c \ -- zadler32.c \ -- zcrc32.c \ -- zutil.c -+ jli_util.c - - ifneq ($(PLATFORM), windows) - FILES_c += ergo.c -@@ -105,7 +98,7 @@ - # Note: its important to keep this order meaning -lc is the - # last library otherwise it could cause compatibility issues - # by pulling in SUNW_private symbols from libc -- LDLIBS = -ldl -lc -+ LDLIBS = -ldl -lz -lc - ifeq ($(USE_PTHREADS),true) - LDLIBS += -lpthread - endif # USE_PTHREADS -@@ -129,7 +122,6 @@ - - OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) - OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) --OTHER_INCLUDES += -I$(ZIP_SRC) - - # - # Library to compile. -@@ -164,4 +156,4 @@ - # - # Add to ambient vpath so we pick up the library files - # --vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) -+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) -diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk ---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2010-07-29 21:55:27.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100 -@@ -29,16 +29,4 @@ - Deflater.c \ - Inflater.c \ - ZipFile.c \ -- zip_util.c \ -- compress.c \ -- deflate.c \ -- gzio.c \ -- infback.c \ -- inffast.c \ -- inflate.c \ -- inftrees.c \ -- trees.c \ -- uncompr.c \ -- zadler32.c \ -- zcrc32.c \ -- zutil.c -+ zip_util.c -diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile ---- openjdk.orig/jdk/make/java/zip/Makefile 2011-06-11 00:38:06.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2011-06-13 15:12:16.477040613 +0100 -@@ -74,16 +74,10 @@ - CPPFLAGS += -UDEBUG - endif - --CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) - CPPFLAGS += -I$(SHARE_SRC)/native/java/io - CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io - - # --# Add to ambient vpath so we pick up the library files --# --vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) -- --# - # Link to JVM library for JVM_Zip* functions - # --OTHER_LDLIBS = $(JVMLIB) -+OTHER_LDLIBS = $(JVMLIB) -lz -diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100 -@@ -25,51 +25,7 @@ - - FILES_c = \ - imageioJPEG.c \ -- jpegdecoder.c \ -- jcomapi.c \ -- jdapimin.c \ -- jdapistd.c \ -- jdcoefct.c \ -- jdcolor.c \ -- jddctmgr.c \ -- jdhuff.c \ -- jdinput.c \ -- jdmainct.c \ -- jdmarker.c \ -- jdmaster.c \ -- jdmerge.c \ -- jdphuff.c \ -- jdpostct.c \ -- jdsample.c \ -- jerror.c \ -- jidctflt.c \ -- jidctfst.c \ From ptisnovs at redhat.com Wed Sep 7 02:24:23 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 07 Sep 2011 11:24:23 +0200 Subject: Reviewer needed: backport of "5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" into IcedTea6 HEAD Message-ID: <4E673847.9010500@redhat.com> Greetings, I'd like to push backport of '5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"' into IcedTea6 HEAD. Tested on RHEL 5 x86_64 - this backport does not break API compatibility and the regression test contained in the backport works properly. Mercurial diff created against recent IcedTea6 HEAD is stored in an attachment. ChangeLog entry: 2011-09-06 Pavel Tisnovsky * Makefile.am: added new patch * NEWS: updated with backport * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: Backport of 5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" Can anybody please review this patch please? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: 5082756_hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110907/bac6753f/5082756_hg.diff From ptisnovs at icedtea.classpath.org Wed Sep 7 02:53:44 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 07 Sep 2011 09:53:44 +0000 Subject: /hg/gfx-test: * src/org/gfxtest/testsuites/RadialGradientPaint.j... Message-ID: changeset c43356096cb8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=c43356096cb8 author: Pavel Tisnovsky date: Wed Sep 07 11:55:36 2011 +0200 * src/org/gfxtest/testsuites/RadialGradientPaint.java: Added 6 new gfx. tests. * src/org/gfxtest/framework/CommonRenderingStyles.java: Added methods supporting rendering shapes filled by radial fill with various color bands. diffstat: ChangeLog | 8 + src/org/gfxtest/framework/CommonRenderingStyles.java | 25 ++ src/org/gfxtest/testsuites/RadialGradientPaint.java | 164 ++++++++++++++++++- 3 files changed, 191 insertions(+), 6 deletions(-) diffs (273 lines): diff -r b92ad5c954c0 -r c43356096cb8 ChangeLog --- a/ChangeLog Tue Sep 06 11:39:17 2011 +0200 +++ b/ChangeLog Wed Sep 07 11:55:36 2011 +0200 @@ -1,3 +1,11 @@ +2011-09-07 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/RadialGradientPaint.java: + Added 6 new gfx. tests. + * src/org/gfxtest/framework/CommonRenderingStyles.java: + Added methods supporting rendering shapes filled by radial + fill with various color bands. + 2011-09-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/LinearGradientPaint.java: diff -r b92ad5c954c0 -r c43356096cb8 src/org/gfxtest/framework/CommonRenderingStyles.java --- a/src/org/gfxtest/framework/CommonRenderingStyles.java Tue Sep 06 11:39:17 2011 +0200 +++ b/src/org/gfxtest/framework/CommonRenderingStyles.java Wed Sep 07 11:55:36 2011 +0200 @@ -910,6 +910,31 @@ } /** + * Set radial gradient fill for given graphics context. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @param fractions + * numbers ranging from 0.0 to 1.0 specifying the distribution of + * colors along the gradient + * @param colors + * array of colors corresponding to each fractional value + */ + public static void setRadialGradientFill(TestImage image, Graphics2D graphics, float[] fractions, Color[] colors) + { + // calculate center of the image + int xc = image.getCenterX(); + int yc = image.getCenterY(); + + // calculate radius of circle + int radius = CommonShapesRenderer.calculateRadius(image); + RadialGradientPaint gradientPaint = new RadialGradientPaint(xc, yc, radius, fractions, colors); + graphics.setPaint(gradientPaint); + } + + /** * Set zero pixels wide stroke and default cap and join style. * * @param graphics diff -r b92ad5c954c0 -r c43356096cb8 src/org/gfxtest/testsuites/RadialGradientPaint.java --- a/src/org/gfxtest/testsuites/RadialGradientPaint.java Tue Sep 06 11:39:17 2011 +0200 +++ b/src/org/gfxtest/testsuites/RadialGradientPaint.java Wed Sep 07 11:55:36 2011 +0200 @@ -40,6 +40,7 @@ package org.gfxtest.testsuites; +import java.awt.Color; import java.awt.Graphics2D; import java.awt.MultipleGradientPaint.CycleMethod; @@ -59,7 +60,20 @@ @Zoom(1) public class RadialGradientPaint extends GfxTest { - + // numbers ranging from 0.0 to 1.0 specifying the distribution of colors along the gradient + private static final float[] SpectrumFractions = { 0.0f, 1.0f/6, 2.0f/6, 3.0f/6, 4.0f/6, 5.0f/6, 1.0f }; + + // array of colors corresponding to each fractional value + private static final Color[] SpectrumColors = { + Color.MAGENTA, + Color.BLUE, + Color.CYAN, + Color.GREEN, + Color.YELLOW, + Color.ORANGE, + Color.RED + }; + /** * Test if filled circle drawn by graphics.fillOval() is rendered correctly. * Radial gradient paint is used for filling this circle. @@ -215,6 +229,29 @@ } /** + * Test if filled circle drawn by graphics.fillOval() is rendered correctly. + * Radial Gradient paint is used for filling this circle using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCircleRadialGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the circle + CommonShapesRenderer.drawFilledCircle(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** * Test if filled rectangle is rendered correctly. * Radial gradient paint is used for filling this rectangle. * @@ -230,7 +267,30 @@ CommonRenderingStyles.setStrokeColor(graphics); // set fill color CommonRenderingStyles.setRadialGradientFill(image, graphics); - // draw the circle + // draw the rectangle + CommonShapesRenderer.drawFilledRect(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled rectangle is rendered correctly. + * Radial Gradient paint is used for filling this shape using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testRectangleRadialGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the rectangle CommonShapesRenderer.drawFilledRect(image, graphics); // test return value return TestResult.PASSED; @@ -252,7 +312,30 @@ CommonRenderingStyles.setStrokeColor(graphics); // set fill color CommonRenderingStyles.setRadialGradientFill(image, graphics); - // draw the circle + // draw the round rectangle + CommonShapesRenderer.drawFilledRoundRect(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled round rectangle is rendered correctly. + * Radial Gradient paint is used for filling this shape using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testRoundRectangleRadialGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the round rectangle CommonShapesRenderer.drawFilledRoundRect(image, graphics); // test return value return TestResult.PASSED; @@ -274,7 +357,30 @@ CommonRenderingStyles.setStrokeColor(graphics); // set fill color CommonRenderingStyles.setRadialGradientFill(image, graphics); - // draw the circle + // draw the arc + CommonShapesRenderer.drawFilledArc(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled arc is rendered correctly. + * Radial Gradient paint is used for filling this shape using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testArcRadialGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the arc CommonShapesRenderer.drawFilledArc(image, graphics); // test return value return TestResult.PASSED; @@ -296,7 +402,30 @@ CommonRenderingStyles.setStrokeColor(graphics); // set fill color CommonRenderingStyles.setRadialGradientFill(image, graphics); - // draw the circle + // draw the polygon + CommonShapesRenderer.drawFilledPolygon(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled polygon is rendered correctly. + * Radial Gradient paint is used for filling this shape using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testPolygonRadialGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the polygon CommonShapesRenderer.drawFilledPolygon(image, graphics); // test return value return TestResult.PASSED; @@ -318,7 +447,30 @@ CommonRenderingStyles.setStrokeColor(graphics); // set fill color CommonRenderingStyles.setRadialGradientFill(image, graphics); - // draw the circle + // draw the closed path + CommonShapesRenderer.drawFilledClosedPath(image, graphics); + // test return value + return TestResult.PASSED; + } + + /** + * Test if filled closed path is rendered correctly. + * Radial Gradient paint is used for filling this shape using whole color + * spectrum. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClosedPathGradientFillColorSpectrum(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setRadialGradientFill(image, graphics, SpectrumFractions, SpectrumColors); + // draw the closed path CommonShapesRenderer.drawFilledClosedPath(image, graphics); // test return value return TestResult.PASSED; From bugzilla-daemon at icedtea.classpath.org Wed Sep 7 04:17:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Sep 2011 11:17:31 +0000 Subject: [Bug 783] Jboss server instance is suddenly shutting down.. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=783 --- Comment #2 from srinu_ammina 2011-09-07 11:17:30 --- (In reply to comment #1) > Moving bug from the IcedRobot to the IcedTea project. > I have checked your log: > vm_info: OpenJDK 64-Bit Server VM (1.6.0-b09) for linux-amd64 JRE (1.6.0-b09), > built on Dec 16 2008 12:10:53 by "mockbuild" with gcc 4.1.2 20080704 (Red Hat > 4.1.2-44) > Please check with Red Hat if they provide a more recent version of OpenJDK > built using icedtea6 version 1.8 or later that have been tested on: > OS:Red Hat Enterprise Linux Server release 5.3 (Tikanga) > I noticed that the crash happened in the debug routines of your VM, if possible > try remove > -Dsun.jvm.hotspot.debugger.useProcDebugger and > -Dsun.jvm.hotspot.debugger.useWindbgDebugger > from the command line. Hi Thanks for the input. Here we are running two server instances on the same jboss server but one instance is working fine. It is happening with only another instance. So if there is an issue with the jdk version it should be same with another instance also rt? could you please guide in this regard. And could you please elobarate on how to perform these steps.. -Dsun.jvm.hotspot.debugger.useProcDebugger and -Dsun.jvm.hotspot.debugger.useWindbgDebugger from the command line. Thanks for your support. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From jvanek at redhat.com Wed Sep 7 08:51:05 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 07 Sep 2011 17:51:05 +0200 Subject: Reviewer needed: backport of "5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" into IcedTea6 HEAD In-Reply-To: <4E673847.9010500@redhat.com> References: <4E673847.9010500@redhat.com> Message-ID: <4E6792E9.4060203@redhat.com> On 09/07/2011 11:24 AM, Pavel Tisnovsky wrote: > Greetings, > > I'd like to push backport of '5082756: Image I/O plug-ins set metadata boolean > attributes to "true" or "false"' into IcedTea6 HEAD. Tested on RHEL 5 x86_64 - > this backport does not break API compatibility and the regression test contained > in the backport works properly. > > Mercurial diff created against recent IcedTea6 HEAD is stored in an attachment. > > ChangeLog entry: > > 2011-09-06 Pavel Tisnovsky > > * Makefile.am: added new patch > * NEWS: updated with backport > * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: > Backport of 5082756: Image I/O plug-ins set metadata > boolean attributes to "true" or "false" > > Can anybody please review this patch please? > > Thank you in advance, > Pavel Maybe typo in changelog - true and false should be in capital letters? Otherwise changes looks ok for me. Thanx for nice "teaching" patches J. From ahughes at redhat.com Wed Sep 7 10:47:19 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 7 Sep 2011 18:47:19 +0100 Subject: Reviewer needed: backport of "5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" into IcedTea6 HEAD In-Reply-To: <4E673847.9010500@redhat.com> References: <4E673847.9010500@redhat.com> Message-ID: <20110907174719.GC18346@rivendell.middle-earth.co.uk> On 11:24 Wed 07 Sep , Pavel Tisnovsky wrote: > Greetings, > > I'd like to push backport of '5082756: Image I/O plug-ins set metadata boolean > attributes to "true" or "false"' into IcedTea6 HEAD. Tested on RHEL 5 x86_64 - > this backport does not break API compatibility and the regression test contained > in the backport works properly. > > Mercurial diff created against recent IcedTea6 HEAD is stored in an attachment. > > ChangeLog entry: > > 2011-09-06 Pavel Tisnovsky > > * Makefile.am: added new patch > * NEWS: updated with backport > * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: > Backport of 5082756: Image I/O plug-ins set metadata > boolean attributes to "true" or "false" > > Can anybody please review this patch please? > > Thank you in advance, > Pavel This looks fine. Do the tests pass? -- 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: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed Sep 7 21:19:37 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Sep 2011 04:19:37 +0000 Subject: [Bug 784] New: SEGV in java Cassandra code Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=784 Summary: SEGV in java Cassandra code Product: IcedTea Version: 6-1.0 Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: teddyyyy123 at gmail.com Created an attachment (id=568) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=568) err log exported by JVM we are running the apache Cassandra code, when I do Cassandra compact and insert records at the same time, I always reproducibly get a SEGV in java. the debug file exported shows the following: # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00002aaaab70e191, pid=17779, tid=1123891520 # # JRE version: 6.0_20-b20 # Java VM: OpenJDK 64-Bit Server VM (19.0-b09 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.9.8 # Distribution: CentOS release 5.6 (Final), package rhel-1.22.1.9.8.el5_6-x86_64 # Problematic frame: # J org.apache.cassandra.utils.ByteBufferUtil.compareUnsigned(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # --------------- T H R E A D --------------- Current thread (0x000000000180b000): JavaThread "ReadStage:48" [_thread_in_Java, id=18222, stack(0x0000000042ed3000,0x0000000042fd4000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00002aab12f6d680 Registers: RAX=0x00002aab12f51000, RBX=0x00000000cfebf24d, RCX=0x0000000000000000, RDX=0x0000000008b64ede RSP=0x0000000042fd26e0, RBP=0x0000000000000000, RSI=0x00000000cfebf24d, RDI=0x0000000000000001 R8 =0x0000000008b64ede, R9 =0x00002aaab8000000, R10=0x000000000001c680, R11=0x0000000000000032 R12=0x0000000000000000, R13=0x000000000001c680, R14=0x000000000001c6b2, R15=0x000000000180b000 RIP=0x00002aaaab70e191, EFL=0x0000000000010293, CSGSFS=0x0000000000000033, ERR=0x0000000000000004 TRAPNO=0x000000000000000e Register to memory mapping: RAX=0x00002aab12f51000 0x00002aab12f51000 is pointing to unknown location RBX=0x00000000cfebf24d 0x00000000cfebf24d is pointing to unknown location RCX=0x0000000000000000 0x0000000000000000 is pointing to unknown location RDX=0x0000000008b64ede 0x0000000008b64ede is pointing to unknown location RSP=0x0000000042fd26e0 0x0000000042fd26e0 is pointing into the stack for thread: 0x000000000180b000 "ReadStage:48" prio=10 tid=0x000000000180b000 nid=0x472e runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE RBP=0x0000000000000000 0x0000000000000000 is pointing to unknown location RSI=0x00000000cfebf24d 0x00000000cfebf24d is pointing to unknown location RDI=0x0000000000000001 0x0000000000000001 is pointing to unknown location R8 =0x0000000008b64ede 0x0000000008b64ede is pointing to unknown location R10=0x000000000001c680 0x000000000001c680 is pointing to unknown location R11=0x0000000000000032 0x0000000000000032 is pointing to unknown location R12=0x0000000000000000 0x0000000000000000 is pointing to unknown location R13=0x000000000001c680 0x000000000001c680 is pointing to unknown location R14=0x000000000001c6b2 0x000000000001c6b2 is pointing to unknown location R15=0x000000000180b000 "ReadStage:48" prio=10 tid=0x000000000180b000 nid=0x472e runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE Top of Stack: (sp=0x0000000042fd26e0) Top of Stack: (sp=0x0000000042fd26e0) 0x0000000042fd26e0: cfebf24d00000001 000000079c2683b0 0x0000000042fd26f0: 0000000799002870 d12001b100000032 0x0000000042fd2700: 0000000799002870 00000000d12001b1 0x0000000042fd2710: 0001c6809c268420 00002aaaab5a4a98 0x0000000042fd2720: fffe398008b64ede 0000000708b64f10 0x0000000042fd2730: 00002aaab8000000 00002aaa00000008 0x0000000042fd2740: 0000000799001da0 00002ad17d5244e3 0x0000000042fd2750: 00000000f384d076 00002aaaab70715c 0x0000000042fd2760: 00000000f32003b4 00002aaaab69b3b8 0x0000000042fd2770: 0000000799001ef8 000000079c268460 0x0000000042fd2780: 0000000799002718 00002aaaab69e1e4 0x0000000042fd2790: 00000007990026b8 cfed4c6600000000 0x0000000042fd27a0: 0000000799002718 00000002f320050b 0x0000000042fd27b0: 00002aaaab1e6000 00002aaaab716a98 0x0000000042fd27c0: 0000000799002718 00002aaaab7172c8 0x0000000042fd27d0: 0000000799002560 00002aaaab7ee13c 0x0000000042fd27e0: 0000000799002690 00002aaaab7190e4 0x0000000042fd27f0: 0000000799001960 0000000799001a08 0x0000000042fd2800: 0000000799002690 00000b6b4e5b110f 0x0000000042fd2810: 000000068903b7a8 0000000799002690 0x0000000042fd2820: f1247d42d12076fd 000000000001c4b0 0x0000000042fd2830: 00000000c7e25800 fffffffef1247d46 0x0000000042fd2840: 00000000f3200454 00000000ffffffff 0x0000000042fd2850: 0000000799002950 00002aaaab6830e4 0x0000000042fd2860: 000000074e5b110f 00000007990019b8 0x0000000042fd2870: 0000000799001960 0000000799001a08 0x0000000042fd2880: 00000007d12076fd 0000000799002690 0x0000000042fd2890: 00000007990021d8 0000000042fd2898 0x0000000042fd28a0: 000000067f541ddd 0000000042fd28f0 0x0000000042fd28b0: 0000000042fd2938 00002aaaab52085a 0x0000000042fd28c0: 000000067f541e28 00002aaaab52085a 0x0000000042fd28d0: 000000004e5b110f 000000068903b7a8 Instructions: (pc=0x00002aaaab70e191) 0x00002aaaab70e181: c4 0c 00 00 45 3b d6 0f 8d c6 0c 00 00 4d 63 ea 0x00002aaaab70e191: 46 0f be 0c 28 41 3b e9 0f 85 e8 01 00 00 ff c1 Stack: [0x0000000042ed3000,0x0000000042fd4000], sp=0x0000000042fd26e0, free space=1021k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) J org.apache.cassandra.utils.ByteBufferUtil.compareUnsigned(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I [error occurred during error reporting (printing native stack), id 0xb] -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Wed Sep 7 23:28:44 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 08 Sep 2011 08:28:44 +0200 Subject: Reviewer needed: backport of "5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" into IcedTea6 HEAD In-Reply-To: <4E6792E9.4060203@redhat.com> References: <4E673847.9010500@redhat.com> <4E6792E9.4060203@redhat.com> Message-ID: <4E68609C.30601@redhat.com> Jiri Vanek wrote: > On 09/07/2011 11:24 AM, Pavel Tisnovsky wrote: >> Greetings, >> >> I'd like to push backport of '5082756: Image I/O plug-ins set metadata >> boolean >> attributes to "true" or "false"' into IcedTea6 HEAD. Tested on RHEL 5 >> x86_64 - >> this backport does not break API compatibility and the regression test >> contained >> in the backport works properly. >> >> Mercurial diff created against recent IcedTea6 HEAD is stored in an >> attachment. >> >> ChangeLog entry: >> >> 2011-09-06 Pavel Tisnovsky >> >> * Makefile.am: added new patch >> * NEWS: updated with backport >> * >> patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: >> >> Backport of 5082756: Image I/O plug-ins set metadata >> boolean attributes to "true" or "false" >> >> Can anybody please review this patch please? >> >> Thank you in advance, >> Pavel > Maybe typo in changelog - true and false should be in capital letters? > Otherwise changes looks ok for me. > Thanx for nice "teaching" patches > > J. Hi Jiri, name of the fix is AFAIK correct because it's name is based on bug description from Oracle database. Ie the bug caused that image metadata represents boolean attributes as "true" and "false" strings and it was corrected to "TRUE" and "FALSE" by this fix (as is defined in DTD). Pavel From ptisnovs at redhat.com Thu Sep 8 02:37:36 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 08 Sep 2011 11:37:36 +0200 Subject: Reviewer needed: backport of "5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" into IcedTea6 HEAD In-Reply-To: <20110907174719.GC18346@rivendell.middle-earth.co.uk> References: <4E673847.9010500@redhat.com> <20110907174719.GC18346@rivendell.middle-earth.co.uk> Message-ID: <4E688CE0.9030302@redhat.com> Dr Andrew John Hughes wrote: > On 11:24 Wed 07 Sep , Pavel Tisnovsky wrote: >> Greetings, >> >> I'd like to push backport of '5082756: Image I/O plug-ins set metadata boolean >> attributes to "true" or "false"' into IcedTea6 HEAD. Tested on RHEL 5 x86_64 - >> this backport does not break API compatibility and the regression test contained >> in the backport works properly. >> >> Mercurial diff created against recent IcedTea6 HEAD is stored in an attachment. >> >> ChangeLog entry: >> >> 2011-09-06 Pavel Tisnovsky >> >> * Makefile.am: added new patch >> * NEWS: updated with backport >> * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: >> Backport of 5082756: Image I/O plug-ins set metadata >> boolean attributes to "true" or "false" >> >> Can anybody please review this patch please? >> >> Thank you in advance, >> Pavel > > This looks fine. Do the tests pass? > Yes, the new test (BooleanAttributes.java) and also the patched test (ITXtTest.java) pass. From ptisnovs at icedtea.classpath.org Thu Sep 8 02:42:42 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 08 Sep 2011 09:42:42 +0000 Subject: /hg/icedtea6: S5082756: Image I/O plug-ins set metadata boolean ... Message-ID: changeset daabd8a14b5e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=daabd8a14b5e author: ptisnovs date: Thu Sep 08 11:42:33 2011 +0200 S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch | 352 ++++++++++ 4 files changed, 363 insertions(+), 1 deletions(-) diffs (403 lines): diff -r fc183654bed3 -r daabd8a14b5e ChangeLog --- a/ChangeLog Mon Sep 05 12:45:12 2011 +0200 +++ b/ChangeLog Thu Sep 08 11:42:33 2011 +0200 @@ -1,3 +1,11 @@ +2011-09-06 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: + Backport of 5082756: Image I/O plug-ins set metadata + boolean attributes to "true" or "false" + 2011-09-05 Xerxes R??nby JamVM diff -r fc183654bed3 -r daabd8a14b5e Makefile.am --- a/Makefile.am Mon Sep 05 12:45:12 2011 +0200 +++ b/Makefile.am Thu Sep 08 11:42:33 2011 +0200 @@ -377,7 +377,8 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \ patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \ - patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch + patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ + patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r fc183654bed3 -r daabd8a14b5e NEWS --- a/NEWS Mon Sep 05 12:45:12 2011 +0200 +++ b/NEWS Thu Sep 08 11:42:33 2011 +0200 @@ -369,6 +369,7 @@ - S6806261: BigDecimal.longValueExact() method throws NullPointerException - S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog + - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * CACAO - CA149: Used wrong class loader. diff -r fc183654bed3 -r daabd8a14b5e patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch Thu Sep 08 11:42:33 2011 +0200 @@ -0,0 +1,360 @@ +# HG changeset patch +# User bae +# Date 1231854912 -10800 +# Node ID 80fb12052ae4c62ec98e28003d9f3994ca5ca6a3 +# Parent 91bc016862c466cb6141a2199f4089a48ee9b283 +5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" +Reviewed-by: igor, prr +Contributed-by: Martin von Gagern + +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java Tue Jan 13 16:55:12 2009 +0300 +@@ -153,7 +153,7 @@ + node.setAttribute("imageWidth", Integer.toString(imageWidth)); + node.setAttribute("imageHeight", Integer.toString(imageHeight)); + node.setAttribute("interlaceFlag", +- interlaceFlag ? "true" : "false"); ++ interlaceFlag ? "TRUE" : "FALSE"); + root.appendChild(node); + + // Local color table +@@ -185,9 +185,9 @@ + node.setAttribute("disposalMethod", + disposalMethodNames[disposalMethod]); + node.setAttribute("userInputFlag", +- userInputFlag ? "true" : "false"); ++ userInputFlag ? "TRUE" : "FALSE"); + node.setAttribute("transparentColorFlag", +- transparentColorFlag ? "true" : "false"); ++ transparentColorFlag ? "TRUE" : "FALSE"); + node.setAttribute("delayTime", + Integer.toString(delayTime)); + node.setAttribute("transparentColorIndex", +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java Tue Jan 13 16:55:12 2009 +0300 +@@ -158,13 +158,10 @@ + } + } + String value = attr.getNodeValue(); +- // XXX Should be able to use equals() here instead of +- // equalsIgnoreCase() but some boolean attributes are incorrectly +- // set to "true" or "false" by the J2SE core metadata classes +- // getAsTree() method (which are duplicated above). See bug 5082756. +- if (value.equalsIgnoreCase("TRUE")) { ++ // Allow lower case booleans for backward compatibility, #5082756 ++ if (value.equals("TRUE") || value.equals("true")) { + return true; +- } else if (value.equalsIgnoreCase("FALSE")) { ++ } else if (value.equals("FALSE") || value.equals("false")) { + return false; + } else { + fatal(node, "Attribute " + name + " must be 'TRUE' or 'FALSE'!"); +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java Tue Jan 13 16:55:12 2009 +0300 +@@ -202,7 +202,7 @@ + compression_node.appendChild(node); + + node = new IIOMetadataNode("Lossless"); +- node.setAttribute("value", "true"); ++ node.setAttribute("value", "TRUE"); + compression_node.appendChild(node); + + // NumProgressiveScans not in stream +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Tue Jan 13 16:55:12 2009 +0300 +@@ -955,7 +955,7 @@ + + // Lossless - false + IIOMetadataNode lossless = new IIOMetadataNode("Lossless"); +- lossless.setAttribute("value", "false"); ++ lossless.setAttribute("value", "FALSE"); + compression.appendChild(lossless); + + // NumProgressiveScans - count sos segments +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Tue Jan 13 16:55:12 2009 +0300 +@@ -600,7 +600,7 @@ + IIOMetadataNode iTXt_node = new IIOMetadataNode("iTXtEntry"); + iTXt_node.setAttribute("keyword", iTXt_keyword.get(i)); + iTXt_node.setAttribute("compressionFlag", +- iTXt_compressionFlag.get(i) ? "1" : "0"); ++ iTXt_compressionFlag.get(i) ? "TRUE" : "FALSE"); + iTXt_node.setAttribute("compressionMethod", + iTXt_compressionMethod.get(i).toString()); + iTXt_node.setAttribute("languageTag", +@@ -832,7 +832,7 @@ + } + + node = new IIOMetadataNode("BlackIsZero"); +- node.setAttribute("value", "true"); ++ node.setAttribute("value", "TRUE"); + chroma_node.appendChild(node); + + if (PLTE_present) { +@@ -894,7 +894,7 @@ + compression_node.appendChild(node); + + node = new IIOMetadataNode("Lossless"); +- node.setAttribute("value", "true"); ++ node.setAttribute("value", "TRUE"); + compression_node.appendChild(node); + + node = new IIOMetadataNode("NumProgressiveScans"); +@@ -1162,12 +1162,13 @@ + } + } + String value = attr.getNodeValue(); +- if (value.equals("true")) { ++ // Allow lower case booleans for backward compatibility, #5082756 ++ if (value.equals("TRUE") || value.equals("true")) { + return true; +- } else if (value.equals("false")) { ++ } else if (value.equals("FALSE") || value.equals("false")) { + return false; + } else { +- fatal(node, "Attribute " + name + " must be 'true' or 'false'!"); ++ fatal(node, "Attribute " + name + " must be 'TRUE' or 'FALSE'!"); + return false; + } + } +diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java +--- openjdk.orig/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java Tue Jan 13 16:55:12 2009 +0300 +@@ -242,8 +242,12 @@ + + /** + * A constant returned by getAttributeDataType +- * indicating that the value of an attribute is one of 'true' or +- * 'false'. ++ * indicating that the value of an attribute is one of the boolean ++ * values 'true' or 'false'. ++ * Attribute values of type DATATYPE_BOOLEAN should be marked as ++ * enumerations, and the permitted values should be the string ++ * literal values "TRUE" or "FALSE", although a plugin may also ++ * recognise lower or mixed case equivalents. + */ + int DATATYPE_BOOLEAN = 1; + +diff -r 91bc016862c4 -r 80fb12052ae4 test/javax/imageio/metadata/BooleanAttributes.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/javax/imageio/metadata/BooleanAttributes.java Tue Jan 13 16:55:12 2009 +0300 +@@ -0,0 +1,202 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Sun designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Sun in the LICENSE file that accompanied this code. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/** ++ * @test ++ * @bug 5082756 ++ * @summary ensure that boolean attributes follow ( "TRUE" | "FALSE" ) ++ * including correct (i.e. upper) case ++ * ++ * @run main BooleanAttributes ++ */ ++ ++import java.awt.image.BufferedImage; ++import java.io.ByteArrayInputStream; ++import java.io.ByteArrayOutputStream; ++import java.io.StringReader; ++import java.util.Arrays; ++import java.util.List; ++import javax.imageio.IIOImage; ++import javax.imageio.ImageIO; ++import javax.imageio.ImageReader; ++import javax.imageio.ImageTypeSpecifier; ++import javax.imageio.ImageWriteParam; ++import javax.imageio.ImageWriter; ++import javax.imageio.metadata.IIOMetadata; ++import javax.imageio.stream.ImageInputStream; ++import javax.imageio.stream.ImageOutputStream; ++import javax.imageio.stream.MemoryCacheImageInputStream; ++import javax.imageio.stream.MemoryCacheImageOutputStream; ++import javax.xml.transform.Result; ++import javax.xml.transform.Source; ++import javax.xml.transform.TransformerFactory; ++import javax.xml.transform.dom.DOMResult; ++import javax.xml.transform.stream.StreamSource; ++import javax.xml.xpath.XPath; ++import javax.xml.xpath.XPathConstants; ++import javax.xml.xpath.XPathFactory; ++import org.w3c.dom.Document; ++import org.w3c.dom.Element; ++import org.w3c.dom.Node; ++import org.w3c.dom.NodeList; ++ ++public class BooleanAttributes { ++ ++ private static TransformerFactory transformerFactory = ++ TransformerFactory.newInstance(); ++ ++ private static XPath xpathEngine = XPathFactory.newInstance().newXPath(); ++ ++ public static void main(String[] args) throws Exception { ++ test("image/png", false, "", ++ "Chroma/BlackIsZero/@value", ++ "Compression/Lossless/@value"); ++ ++ test("image/png", false, ++ "" + ++ "" + ++ "", ++ "iTXt/iTXtEntry/@compressionFlag"); ++ ++ test("image/png", false, ++ "" + ++ "" + ++ "", ++ "iTXt/iTXtEntry/@compressionFlag"); ++ ++ test("image/gif", false, "", ++ "Chroma/BlackIsZero/@value", ++ "Compression/Lossless/@value"); ++ ++ test("image/gif", false, ++ "" + ++ "" + ++ "" + ++ "" + ++ "" + ++ "" + ++ "" + ++ "", ++ "ImageDescriptor/@interlaceFlag", ++ "LocalColorTable/@sortFlag", ++ "GraphicControlExtension/@userInputFlag", ++ "GraphicControlExtension/@transparentColorFlag"); ++ ++ test("image/gif", true, ++ "" + ++ "" + ++ "" + ++ "" + ++ "" + ++ "", ++ "GlobalColorTable/@sortFlag"); ++ ++ test("image/jpeg", false, "", ++ "Compression/Lossless/@value"); ++ } ++ ++ private static void transform(Source src, Result dst) ++ throws Exception ++ { ++ transformerFactory.newTransformer().transform(src, dst); ++ } ++ ++ private static void verify(Node meta, String[] xpaths, boolean required) ++ throws Exception ++ { ++ for (String xpath: xpaths) { ++ NodeList list = (NodeList) ++ xpathEngine.evaluate(xpath, meta, XPathConstants.NODESET); ++ if (list.getLength() == 0 && required) ++ throw new AssertionError("Missing value: " + xpath); ++ for (int i = 0; i < list.getLength(); ++i) { ++ String value = list.item(i).getNodeValue(); ++ if (!(value.equals("TRUE") || value.equals("FALSE"))) ++ throw new AssertionError(xpath + " has value " + value); ++ } ++ } ++ } ++ ++ public static void test(String mimeType, boolean useStreamMeta, ++ String metaXml, String... boolXpaths) ++ throws Exception ++ { ++ BufferedImage img = ++ new BufferedImage(16, 16, BufferedImage.TYPE_INT_RGB); ++ ImageWriter iw = ImageIO.getImageWritersByMIMEType(mimeType).next(); ++ ByteArrayOutputStream os = new ByteArrayOutputStream(); ++ ImageOutputStream ios = new MemoryCacheImageOutputStream(os); ++ iw.setOutput(ios); ++ ImageWriteParam param = null; ++ IIOMetadata streamMeta = iw.getDefaultStreamMetadata(param); ++ IIOMetadata imageMeta = ++ iw.getDefaultImageMetadata(new ImageTypeSpecifier(img), param); ++ IIOMetadata meta = useStreamMeta ? streamMeta : imageMeta; ++ Source src = new StreamSource(new StringReader(metaXml)); ++ DOMResult dst = new DOMResult(); ++ transform(src, dst); ++ Document doc = (Document)dst.getNode(); ++ Element node = doc.getDocumentElement(); ++ String metaFormat = node.getNodeName(); ++ ++ // Verify that the default metadata gets formatted correctly. ++ verify(meta.getAsTree(metaFormat), boolXpaths, false); ++ ++ meta.mergeTree(metaFormat, node); ++ ++ // Verify that the merged metadata gets formatte correctly. ++ verify(meta.getAsTree(metaFormat), boolXpaths, true); ++ ++ iw.write(streamMeta, new IIOImage(img, null, imageMeta), param); ++ iw.dispose(); ++ ios.close(); ++ ImageReader ir = ImageIO.getImageReader(iw); ++ byte[] bytes = os.toByteArray(); ++ if (bytes.length == 0) ++ throw new AssertionError("Zero length image file"); ++ ByteArrayInputStream is = new ByteArrayInputStream(bytes); ++ ImageInputStream iis = new MemoryCacheImageInputStream(is); ++ ir.setInput(iis); ++ if (useStreamMeta) meta = ir.getStreamMetadata(); ++ else meta = ir.getImageMetadata(0); ++ ++ // Verify again after writing and re-reading the image ++ verify(meta.getAsTree(metaFormat), boolXpaths, true); ++ } ++ ++ public static void xtest(Object... eatAnyArguments) { ++ System.err.println("Disabled test! Change xtest back into test!"); ++ } ++ ++} +diff -r 91bc016862c4 -r 80fb12052ae4 test/javax/imageio/plugins/png/ITXtTest.java +--- openjdk.orig/jdk/test/javax/imageio/plugins/png/ITXtTest.java Mon Jan 12 16:02:47 2009 -0800 ++++ openjdk/jdk/test/javax/imageio/plugins/png/ITXtTest.java Tue Jan 13 16:55:12 2009 +0300 +@@ -123,7 +123,7 @@ + } + t.keyword = e.getAttribute("keyword"); + t.isCompressed = +- (Integer.valueOf(e.getAttribute("compressionFlag")).intValue() == 1); ++ Boolean.valueOf(e.getAttribute("compressionFlag")).booleanValue(); + t.compression = + Integer.valueOf(e.getAttribute("compressionMethod")).intValue(); + t.language = e.getAttribute("languageTag"); From ptisnovs at icedtea.classpath.org Thu Sep 8 03:51:21 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 08 Sep 2011 10:51:21 +0000 Subject: /hg/gfx-test: Added new test suite containing 5 new gfx.tests Co... Message-ID: changeset 9fe7efd696f4 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9fe7efd696f4 author: Pavel Tisnovsky date: Thu Sep 08 12:53:15 2011 +0200 Added new test suite containing 5 new gfx.tests Constructive area geometry (CAG) diffstat: ChangeLog | 7 +++++++ Makefile | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (37 lines): diff -r c43356096cb8 -r 9fe7efd696f4 ChangeLog --- a/ChangeLog Wed Sep 07 11:55:36 2011 +0200 +++ b/ChangeLog Thu Sep 08 12:53:15 2011 +0200 @@ -1,3 +1,10 @@ +2011-09-08 Pavel Tisnovsky + + * Makefile: added new classes to compile + * src/org/gfxtest/testsuites/CAGOperations.java: + Added new test suite containing 5 new gfx.tests + Constructive area geometry (CAG) + 2011-09-07 Pavel Tisnovsky * src/org/gfxtest/testsuites/RadialGradientPaint.java: diff -r c43356096cb8 -r 9fe7efd696f4 Makefile --- a/Makefile Wed Sep 07 11:55:36 2011 +0200 +++ b/Makefile Thu Sep 08 12:53:15 2011 +0200 @@ -133,7 +133,8 @@ $(CLASSES)/$(TESTSUITE_DIR)/SpecialCases.class \ $(CLASSES)/$(TESTSUITE_DIR)/GradientPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/LinearGradientPaint.class \ - $(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class + $(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class \ + $(CLASSES)/$(TESTSUITE_DIR)/CAGOperations.class COMPARE_RESULTS = \ $(RESULTS)/AALines \ @@ -173,7 +174,8 @@ $(RESULTS)/SpecialCases \ $(RESULTS)/GradientPaint \ $(RESULTS)/LinearGradientPaint \ - $(RESULTS)/RadialGradientPaint + $(RESULTS)/RadialGradientPaint \ + $(RESULTS)/CAGOperations # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') From ptisnovs at redhat.com Thu Sep 8 08:12:49 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 08 Sep 2011 17:12:49 +0200 Subject: Reviewer needed: backport of "6296893: BMP Writer handles TopDown property incorrectly for some of the compression types" to IcedTea6 HEAD Message-ID: <4E68DB71.1000808@redhat.com> Greetings, here's another backport I'd like to push to IcedTea6 HEAD: 6296893: BMP Writer handles TopDown property incorrectly for some of the compression types It fixes the BMP writer behaviour. The regression test contained in this backport works correctly. Tested on RHEL 5 x86_64. ChangeLog entry: 2011-09-08 Pavel Tisnovsky * Makefile.am: added new patch * NEWS: updated with backport * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: Backport of 6296893: BMP Writer handles TopDown property incorrectly for some of the compression types Can anybody please review this patch? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: 6296893_hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110908/553e9b00/6296893_hg.diff From ahughes at redhat.com Thu Sep 8 08:24:26 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 8 Sep 2011 16:24:26 +0100 Subject: Reviewer needed: backport of "6296893: BMP Writer handles TopDown property incorrectly for some of the compression types" to IcedTea6 HEAD In-Reply-To: <4E68DB71.1000808@redhat.com> References: <4E68DB71.1000808@redhat.com> Message-ID: <20110908152426.GA29880@rivendell.middle-earth.co.uk> On 17:12 Thu 08 Sep , Pavel Tisnovsky wrote: > Greetings, > > here's another backport I'd like to push to IcedTea6 HEAD: > > 6296893: BMP Writer handles TopDown property incorrectly for some of the > compression types > > It fixes the BMP writer behaviour. The regression test contained in this > backport works correctly. Tested on RHEL 5 x86_64. > > > ChangeLog entry: > > 2011-09-08 Pavel Tisnovsky > > * Makefile.am: added new patch > * NEWS: updated with backport > * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: > Backport of 6296893: BMP Writer handles TopDown property incorrectly > for some of the compression types > > > > Can anybody please review this patch? > > Thank you in advance, > Pavel This looks fine. What's your progress with getting some of these into OpenJDK6? -- 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: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Thu Sep 8 08:36:18 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 08 Sep 2011 17:36:18 +0200 Subject: Reviewer needed: backport of "6296893: BMP Writer handles TopDown property incorrectly for some of the compression types" to IcedTea6 HEAD In-Reply-To: <20110908152426.GA29880@rivendell.middle-earth.co.uk> References: <4E68DB71.1000808@redhat.com> <20110908152426.GA29880@rivendell.middle-earth.co.uk> Message-ID: <4E68E0F2.70402@redhat.com> Dr Andrew John Hughes wrote: > On 17:12 Thu 08 Sep , Pavel Tisnovsky wrote: >> Greetings, >> >> here's another backport I'd like to push to IcedTea6 HEAD: >> >> 6296893: BMP Writer handles TopDown property incorrectly for some of the >> compression types >> >> It fixes the BMP writer behaviour. The regression test contained in this >> backport works correctly. Tested on RHEL 5 x86_64. >> >> >> ChangeLog entry: >> >> 2011-09-08 Pavel Tisnovsky >> >> * Makefile.am: added new patch >> * NEWS: updated with backport >> * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: >> Backport of 6296893: BMP Writer handles TopDown property incorrectly >> for some of the compression types >> >> >> >> Can anybody please review this patch? >> >> Thank you in advance, >> Pavel > > This looks fine. thank you > > What's your progress with getting some of these into OpenJDK6? I thought that OpenJDK6 is now closed for new patches, but I could try to sent some fixes to the appropriate mail lists. From ptisnovs at icedtea.classpath.org Thu Sep 8 09:17:22 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 08 Sep 2011 16:17:22 +0000 Subject: /hg/icedtea6: Backport of 6296893: BMP Writer handles TopDown pr... Message-ID: changeset fb9bfc043a45 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fb9bfc043a45 author: ptisnovs date: Thu Sep 08 18:10:28 2011 +0200 Backport of 6296893: BMP Writer handles TopDown property incorrectly for some of the compression types diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch | 193 ++++++++++ 4 files changed, 204 insertions(+), 1 deletions(-) diffs (238 lines): diff -r daabd8a14b5e -r fb9bfc043a45 ChangeLog --- a/ChangeLog Thu Sep 08 11:42:33 2011 +0200 +++ b/ChangeLog Thu Sep 08 18:10:28 2011 +0200 @@ -1,3 +1,11 @@ +2011-09-08 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: + Backport of 6296893: BMP Writer handles TopDown property incorrectly + for some of the compression types + 2011-09-06 Pavel Tisnovsky * Makefile.am: added new patch diff -r daabd8a14b5e -r fb9bfc043a45 Makefile.am --- a/Makefile.am Thu Sep 08 11:42:33 2011 +0200 +++ b/Makefile.am Thu Sep 08 18:10:28 2011 +0200 @@ -378,7 +378,8 @@ patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \ patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \ patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ - patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch + patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ + patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r daabd8a14b5e -r fb9bfc043a45 NEWS --- a/NEWS Thu Sep 08 11:42:33 2011 +0200 +++ b/NEWS Thu Sep 08 18:10:28 2011 +0200 @@ -370,6 +370,7 @@ - S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" + - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * CACAO - CA149: Used wrong class loader. diff -r daabd8a14b5e -r fb9bfc043a45 patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch Thu Sep 08 18:10:28 2011 +0200 @@ -0,0 +1,195 @@ +# HG changeset patch +# User bae +# Date 1244713662 -14400 +# Node ID 378feb59435b30ea3759a41ff165dadbad4604ec +# Parent b92e3fbbcb630d12708d33a5c94183c9b72e3458 +6296893: BMP Writer handles TopDown property incorrectly for some of the compression types +Reviewed-by: igor, prr + +diff -r b92e3fbbcb63 -r 378feb59435b src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java +--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java Mon Jun 08 13:56:45 2009 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java Thu Jun 11 13:47:42 2009 +0400 +@@ -506,6 +506,19 @@ + + writeFileHeader(fileSize, offset); + ++ /* According to MSDN description, the top-down image layout ++ * is allowed only if compression type is BI_RGB or BI_BITFIELDS. ++ * Images with any other compression type must be wrote in the ++ * bottom-up layout. ++ */ ++ if (compressionType == BMPConstants.BI_RGB || ++ compressionType == BMPConstants.BI_BITFIELDS) ++ { ++ isTopDown = bmpParam.isTopDown(); ++ } else { ++ isTopDown = false; ++ } ++ + writeInfoHeader(headerSize, bitsPerPixel); + + // compression +@@ -588,8 +601,6 @@ + return; + } + +- isTopDown = bmpParam.isTopDown(); +- + int maxBandOffset = bandOffsets[0]; + for (int i = 1; i < bandOffsets.length; i++) + if (bandOffsets[i] > maxBandOffset) +@@ -1299,7 +1310,7 @@ + stream.writeInt(w); + + // height +- stream.writeInt(h); ++ stream.writeInt(isTopDown ? -h : h); + + // number of planes + stream.writeShort(1); +diff -r b92e3fbbcb63 -r 378feb59435b test/javax/imageio/plugins/bmp/TopDownTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/javax/imageio/plugins/bmp/TopDownTest.java Thu Jun 11 13:47:42 2009 +0400 +@@ -0,0 +1,142 @@ ++/* ++ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/** ++ * @test ++ * @bug 6296893 ++ * @summary Test verifies that the isTopDown flag does not cause ++ * a writing of bmp image in wrong scanline layout. ++ * @run main TopDownTest ++ */ ++ ++import java.awt.Color; ++import java.awt.Graphics; ++import java.awt.image.BufferedImage; ++ ++import java.awt.image.IndexColorModel; ++import java.io.File; ++import java.io.IOException; ++import javax.imageio.IIOImage; ++import javax.imageio.ImageIO; ++import javax.imageio.ImageWriteParam; ++import javax.imageio.ImageWriter; ++import javax.imageio.plugins.bmp.BMPImageWriteParam; ++import javax.imageio.stream.ImageOutputStream; ++import static java.awt.image.BufferedImage.TYPE_INT_RGB; ++import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; ++ ++public class TopDownTest { ++ ++ public static void main(String[] args) throws IOException { ++ BufferedImage src = createTestImage(24); ++ ++ writeWithCompression(src, "BI_BITFIELDS"); ++ ++ writeWithCompression(src, "BI_RGB"); ++ ++ src = createTestImage(8); ++ writeWithCompression(src, "BI_RLE8"); ++ ++ src = createTestImage(4); ++ writeWithCompression(src, "BI_RLE4"); ++ ++ } ++ ++ private static void writeWithCompression(BufferedImage src, ++ String compression) throws IOException ++ { ++ System.out.println("Compression: " + compression); ++ ImageWriter writer = ImageIO.getImageWritersByFormatName("BMP").next(); ++ if (writer == null) { ++ throw new RuntimeException("Test failed: no bmp writer available"); ++ } ++ File fout = File.createTempFile(compression + "_", ".bmp", ++ new File(".")); ++ ++ ImageOutputStream ios = ImageIO.createImageOutputStream(fout); ++ writer.setOutput(ios); ++ ++ BMPImageWriteParam param = (BMPImageWriteParam) ++ writer.getDefaultWriteParam(); ++ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); ++ param.setCompressionType(compression); ++ param.setTopDown(true); ++ writer.write(null, new IIOImage(src, null, null), param); ++ writer.dispose(); ++ ios.flush(); ++ ios.close(); ++ ++ BufferedImage dst = ImageIO.read(fout); ++ ++ verify(dst); ++ } ++ ++ private static void verify(BufferedImage dst) { ++ int top_rgb = dst.getRGB(50, 25); ++ System.out.printf("top_rgb: %x\n", top_rgb); ++ int bot_rgb = dst.getRGB(50, 75); ++ System.out.printf("bot_rgb: %x\n", bot_rgb); ++ ++ // expect to see blue color on the top of image ++ if (top_rgb != 0xff0000ff) { ++ throw new RuntimeException("Invaid top color: " + ++ Integer.toHexString(bot_rgb)); ++ } ++ if (bot_rgb != 0xffff0000) { ++ throw new RuntimeException("Invalid bottom color: " + ++ Integer.toHexString(bot_rgb)); ++ } ++ } ++ ++ private static BufferedImage createTestImage(int bpp) { ++ ++ BufferedImage img = null; ++ switch (bpp) { ++ case 8: ++ img = new BufferedImage(100, 100, TYPE_BYTE_INDEXED); ++ break; ++ case 4: { ++ byte[] r = new byte[16]; ++ byte[] g = new byte[16]; ++ byte[] b = new byte[16]; ++ ++ r[1] = (byte)0xff; ++ b[0] = (byte)0xff; ++ ++ IndexColorModel icm = new IndexColorModel(4, 16, r, g, b); ++ img = new BufferedImage(100, 100, TYPE_BYTE_INDEXED, icm); ++ } ++ break; ++ case 24: ++ default: ++ img = new BufferedImage(100, 100, TYPE_INT_RGB); ++ } ++ Graphics g = img.createGraphics(); ++ g.setColor(Color.blue); ++ g.fillRect(0, 0, 100, 50); ++ g.setColor(Color.red); ++ g.fillRect(0, 50, 100, 50); ++ g.dispose(); ++ return img; ++ } ++} From ahughes at redhat.com Thu Sep 8 09:27:17 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 8 Sep 2011 17:27:17 +0100 Subject: Reviewer needed: backport of "6296893: BMP Writer handles TopDown property incorrectly for some of the compression types" to IcedTea6 HEAD In-Reply-To: <4E68E0F2.70402@redhat.com> References: <4E68DB71.1000808@redhat.com> <20110908152426.GA29880@rivendell.middle-earth.co.uk> <4E68E0F2.70402@redhat.com> Message-ID: <20110908162716.GB29880@rivendell.middle-earth.co.uk> On 17:36 Thu 08 Sep , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 17:12 Thu 08 Sep , Pavel Tisnovsky wrote: > >> Greetings, > >> > >> here's another backport I'd like to push to IcedTea6 HEAD: > >> > >> 6296893: BMP Writer handles TopDown property incorrectly for some of the > >> compression types > >> > >> It fixes the BMP writer behaviour. The regression test contained in this > >> backport works correctly. Tested on RHEL 5 x86_64. > >> > >> > >> ChangeLog entry: > >> > >> 2011-09-08 Pavel Tisnovsky > >> > >> * Makefile.am: added new patch > >> * NEWS: updated with backport > >> * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: > >> Backport of 6296893: BMP Writer handles TopDown property incorrectly > >> for some of the compression types > >> > >> > >> > >> Can anybody please review this patch? > >> > >> Thank you in advance, > >> Pavel > > > > This looks fine. > thank you > > > > What's your progress with getting some of these into OpenJDK6? > > I thought that OpenJDK6 is now closed for new patches, but I could try to sent > some fixes to the appropriate mail lists. No, only OpenJDK7 was ever closed during the period before the release, but that's now open again via the 7u trees. -- 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: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From andrew at icedtea.classpath.org Thu Sep 8 09:50:16 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 08 Sep 2011 16:50:16 +0000 Subject: /hg/icedtea7: Fix duplicate gboolean definition. Message-ID: changeset 9f7e31696ac5 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9f7e31696ac5 author: Andrew John Hughes date: Thu Sep 08 17:50:11 2011 +0100 Fix duplicate gboolean definition. 2011-09-08 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bring in fix for duplicate gboolean definition. (JDK_SHA256SUM): Likewise. diffstat: ChangeLog | 7 +++++++ Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 0af3b9f0e92e -r 9f7e31696ac5 ChangeLog --- a/ChangeLog Tue Sep 06 16:06:22 2011 +0100 +++ b/ChangeLog Thu Sep 08 17:50:11 2011 +0100 @@ -1,3 +1,10 @@ +2011-09-08 Andrew John Hughes + + * Makefile.am: + (JDK_CHANGESET): Bring in fix for duplicate + gboolean definition. + (JDK_SHA256SUM): Likewise. + 2011-09-06 Andrew John Hughes * patches/hotspot-gcc-pr36917.patch: diff -r 0af3b9f0e92e -r 9f7e31696ac5 Makefile.am --- a/Makefile.am Tue Sep 06 16:06:22 2011 +0100 +++ b/Makefile.am Thu Sep 08 17:50:11 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 1dd9b3d73b22 JAXP_CHANGESET = c40983d6ae70 JAXWS_CHANGESET = 83db5e316798 -JDK_CHANGESET = db7a2639858b +JDK_CHANGESET = 097557275d7e LANGTOOLS_CHANGESET = fb7fb3071b64 OPENJDK_CHANGESET = 3defd24c2671 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21 -JDK_SHA256SUM = 81b510c80f3af0a1cd19704c616a68ff131362b517996ae65cb91c9a5849fcdc +JDK_SHA256SUM = b303e4c87e490ae9c33dc529320f7884ddd2dc2f2c1cfcde70790cb757b6ed1a LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e From andrew at icedtea.classpath.org Thu Sep 8 16:04:05 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 08 Sep 2011 23:04:05 +0000 Subject: /hg/icedtea6-hg: 52 new changesets Message-ID: changeset bfbd7ccaa20c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bfbd7ccaa20c author: Andrew John Hughes date: Wed Jul 06 20:55:06 2011 +0100 Normalise whitespace in JPEG code. 2011-07-06 Andrew John Hughes * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/ codec/jpeg/ImageFormatException.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGCodec.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGDecodeParam.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGEncodeParam.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGHuffmanTable.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGImageDecoder.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGImageEncoder.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGQTable.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /TruncatedFileException.java, * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEG ImageDecoderImpl.java, * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEG ImageEncoderImpl.java, * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEG Param.java: Normalise whitespace using Oracle normaliser. changeset 944778c61e3c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=944778c61e3c author: Andrew John Hughes date: Wed Jul 06 23:24:30 2011 +0100 PR icedtea/752: Increase binary compatibility of JPEG classes. 2011-07-06 Andrew John Hughes Make JPEG classes more binary compatible with Oracle versions. * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /ImageFormatException.java: Extend RuntimeException. (ImageFormatException()): Call superclass constructor. * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGCodec.java: (JPEGCodec()): Make explicit private constructor to prevent implicit public one. * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGHuffmanTable.java: Don't extend javax.imageio.plugins.jpeg.JPEGHuffmanTable. (lengths): Added. (symbols): Added. (JPEGHuffmanTable(short[], short[])): Perform checks outlined in documentation. (getLengths()): Added. (getSymbols()): Return symbols. * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /JPEGImageEncoder.java: (getDefaultColorId(ColorModel)): Fix typo (was DefaultColorID). * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg /TruncatedFileException.java: (TruncatedFileException(BufferedImage)): Add missing constructor. (TruncatedFileException(Raster)): Likewise. (getBufferedImage()): Implemented. (getRaster()): Add missing method. (TruncatedFileException()): Removed. (TruncatedFileException(String)): Likewise. * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEG ImageDecoderImpl.java: (decodeAsBufferedImage()): Remove unneeded qualification and convert from com.sun JPEGHuffmanTable to javax.imageio one. * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEG ImageEncoderImpl.java: (getDefaultColorId(ColorModel)): Fix typo (was DefaultColorID). * NEWS: Updated. changeset 922f35a6bf90 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=922f35a6bf90 author: ptisnovs date: Thu Jul 07 11:47:06 2011 +0200 Fixed test location (added missing prefix 'jdk' into path). changeset b98c208a3244 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b98c208a3244 author: ptisnovs date: Thu Jul 07 13:43:41 2011 +0200 Backport of 6842838 and 6882768. changeset 380a9db76b36 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=380a9db76b36 author: Andrew John Hughes date: Thu Jul 07 13:14:02 2011 +0100 Merge changeset d987bfbdfd8d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d987bfbdfd8d author: Andrew John Hughes date: Thu Jul 07 14:17:12 2011 +0100 Bump to b23 release tarball. Remove last vesitages of md5sum usage. 2011-07-06 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Updated. (OPENJDK_SHA256SUM): Replaces OPENJDK_MD5SUM. (download- openjdk): Use sha256 as with all other bundles. (download-hotspot): Likewise. * configure.ac: Remove check for md5sum. * hotspot.map: Move to sha256. changeset 0911ad28ea98 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0911ad28ea98 author: Andrew John Hughes date: Thu Jul 07 14:19:34 2011 +0100 Merge changeset 67985e03e768 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=67985e03e768 author: ptisnovs date: Fri Jul 08 14:10:47 2011 +0200 S6711682: JCheckBox in JTable: checkbox doesn't always respond to the first mouse click changeset 4ca76ee4a7a1 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4ca76ee4a7a1 author: ptisnovs date: Mon Jul 11 10:59:47 2011 +0200 Added @ignore tag to regression test 7020373 because binary jar file needed to run the test is missing in OpenJDK6. changeset aae82c1ccf7d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aae82c1ccf7d author: Xerxes R?nby date: Mon Jul 11 14:19:14 2011 +0200 Removal of the ARM assembler port, unbreaks Zero and Shark builds. 2011-07-11 Xerxes R?nby Removal of the ARM assembler port, unbreaks Zero and Shark builds. * Makefile.am: (ICEDTEA_PATCHES): Remove patches/arm.patch (clean-ports): Removed. (stamps/ports.stamp): Likewise. (hotspot-ports): Likewise. * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed. * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise. * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise. * arm_port/hotspot/tools/mkbc.c: Likewise. * patches/arm.patch: Likewise. changeset ad05410af28a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad05410af28a author: Xerxes R?nby date: Mon Jul 11 23:31:50 2011 +0200 NEWS: Updated, mention removal of the ARM assembler port and Thumb2 JIT. 2011-07-11 Xerxes R?nby * NEWS: Updated. changeset 97402362be7d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=97402362be7d author: Andrew John Hughes date: Mon Jul 11 22:52:13 2011 +0100 List ARM removal in a more prominent location. 2011-07-11 Andrew John Hughes * NEWS: Place ARM removal in a more prominent location. changeset 802bc279de76 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=802bc279de76 author: Andrew John Hughes date: Mon Jul 11 23:02:26 2011 +0100 Sync NEWS file with other branches. 2011-07-11 Andrew John Hughes * NEWS: Import 1.10.2, 1.9.8, 1.8.8 and 1.10.1 release announcements. Sync 1.10 announcement with final version. Remove items from the 1.11 list that have been released in 1.10.1 & 1.10.2. changeset 15b2923c12a0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=15b2923c12a0 author: Andrew John Hughes date: Mon Jul 11 23:52:57 2011 +0100 Fix addvm cleanup of jvm.cfg when it doesn't exist. 2011-07-11 Andrew John Hughes * Makefile.am: (clean-add-jamvm): Only perform sed on jvm.cfg if it exists and use correct path as in original rule. (clean-add-jamvm-debug): Likewise. (clean-add- cacao): Likewise. (clean-add-cacao-debug): Likewise. (clean-add-jamvm): Likewise. (clean-add-jamvm-debug): Likewise. changeset 32fa8c401cee in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=32fa8c401cee author: Andrew John Hughes date: Tue Jul 12 02:01:39 2011 +0100 PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan 2011-05-25 Andrew John Hughes * Makefile.am: (ENDORSED_DIR): Removed. (ICEDTEA_ECJ_PATCHES): Add xsltproc.patch. Remove endorsed- dir-for-jvmti.patch. (ICEDTEA_ENV_ECJ): Set XSLT. Don't set ICEDTEA_ENDORSED_DIR or ENDORSED. (bootstrap-directory- stage1): Don't link xalan2, xerces2 or xalan2 serialiser. * acinclude.m4: (IT_FIND_XALAN2_JAR): Removed. (IT_FIND_XALAN2_SERIALIZER_JAR): Likewise. (IT_FIND_XERCES2_JAR): Likewise. (IT_FIND_XML_COMMONS_API_JAR): Likewise. * configure.ac: Replace calls to IT_FIND_XALAN2_JAR, IT_FIND_XALAN2_SERIALIZER_JAR, IT_FIND_XERCES2_JAR and IT_FIND_XML_COMMONS_API_JAR with call to IT_FIND_TOOL for xsltproc. * patches/ecj/xsltproc.patch: Patch jvmti.make in HotSpot to use xsltproc instead of Java's XSLT when bootstrapping. * patches/ecj/endorsed-dir-for-jvmti.patch: Remove addition of $(ENDORSED) to jvmti.make. * NEWS: Update and make bug fixes more prominent. changeset 98a64707ae8c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=98a64707ae8c author: ptisnovs date: Tue Jul 12 09:52:46 2011 +0200 6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage changeset fffcbae2c099 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fffcbae2c099 author: ptisnovs date: Tue Jul 12 17:14:42 2011 +0200 Fix of regression test jdk/test/java/util/zip/ConstructDeflaterInput.java changeset d987aa111762 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d987aa111762 author: Andrew John Hughes date: Wed Jul 13 21:27:14 2011 +0100 Add b23 changes. 2011-07-13 Andrew John Hughes * NEWS: Add b23 changes. changeset 3d5ae12b32b7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3d5ae12b32b7 author: Andrew John Hughes date: Wed Jul 13 21:28:45 2011 +0100 Merge changeset 7f168fd8f368 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7f168fd8f368 author: ptisnovs date: Fri Jul 15 14:05:59 2011 +0200 6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg changeset 76fc1df7874f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=76fc1df7874f author: ptisnovs date: Fri Jul 15 14:11:36 2011 +0200 Added ChangeLog entry. changeset 523bbe184992 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=523bbe184992 author: dlila date: Fri Jul 15 08:46:37 2011 -0400 Backport anyblit fix. changeset 406c0d434ca3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=406c0d434ca3 author: dlila date: Fri Jul 15 08:53:07 2011 -0400 Merge changeset 50eeb180dd77 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=50eeb180dd77 author: ptisnovs date: Tue Jul 19 13:19:30 2011 +0200 Fix for regression test hotspot/7020373, added missing source used to create the reproducer, removed unecessary patch patches/jtreg-7020373-add-ignore-tag.patch changeset 96f22f84fb9d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=96f22f84fb9d author: ptisnovs date: Wed Jul 20 10:28:01 2011 +0200 S4917091: javac rejects array over 128 in length changeset c2a1c2cf027e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c2a1c2cf027e author: ptisnovs date: Thu Jul 21 09:42:07 2011 +0200 S6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5 changeset 3c107fae0e9d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3c107fae0e9d author: ptisnovs date: Fri Jul 22 10:26:38 2011 +0200 S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux changeset 8fa33e715417 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8fa33e715417 author: ptisnovs date: Mon Jul 25 13:41:45 2011 +0200 S5047314: [Col] Collator.compare() runs indefinitely for a certain set of Thai strings changeset a6ba1170da98 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a6ba1170da98 author: ptisnovs date: Mon Jul 25 13:44:57 2011 +0200 Fixed typo in NEWS, removed unnecessary patch file. changeset c1229a523e02 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c1229a523e02 author: ptisnovs date: Fri Jul 29 11:23:42 2011 +0200 S6669869: Beans.isDesignTime() and other queries should be per- AppContext changeset 2ed07eebd884 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2ed07eebd884 author: ptisnovs date: Mon Aug 01 17:06:47 2011 +0200 S6934356: Vector.writeObject() serialization may deadlock. changeset 013f83c2fa16 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=013f83c2fa16 author: Xerxes R?nby date: Tue Aug 02 15:02:27 2011 +0200 JamVM: Updated to 2011-08-01 revision. 2011-08-02 Xerxes R?nby JamVM - Put parsing of -cp and -classpath options back in. - Fix threading of references list during compaction. - Further fix to freeClassData for native methods. - Fix class GC with classes containing Miranda methods. - Propogate initialisation errors to top-level * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-01 revision. (JAMVM_SHA256SUM): Updated. changeset 9193b3c49dd0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9193b3c49dd0 author: Xerxes R?nby date: Tue Aug 09 11:21:50 2011 +0200 JamVM: Updated to 2011-08-08 revision. 2011-08-09 Xerxes R?nby JamVM - Remove empty clobber. - Use dots instead of slashes in classname for exception. - Correct thrown exception by bootstrap loader. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-08 revision. (JAMVM_SHA256SUM): Updated. changeset 305c98561e8d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=305c98561e8d author: Xerxes Ranby date: Tue Aug 09 11:34:28 2011 +0200 CACAO: Updated to 2011-08-08 revision. 2011-08-09 Xerxes R?nby CACAO - CA159: Exception handler blocks / register mixup. - Set thread to RUNNABLE during Thread.start. - Removed state-setting function call that would be done by the thread itself, creating a nasty race. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-08 revision. (CACAO_SHA256SUM): Updated. changeset 7c0028a7e2a3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7c0028a7e2a3 author: Xerxes Ranby date: Wed Aug 10 16:33:51 2011 +0200 PR772: JamVM + jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. 2011-08-10 Xerxes Ranby JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. * NEWS: Updated. * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. * Makefile.am: Apply JamVM patch. changeset fbfd59dbdf30 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fbfd59dbdf30 author: ptisnovs date: Thu Aug 11 10:11:19 2011 +0200 Fixed typo in the name of patch fixing bug 6934356. changeset 4c641e5e379d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4c641e5e379d author: ptisnovs date: Thu Aug 11 16:48:40 2011 +0200 S7036582: Improve test coverage of java.math.BigDecimal changeset f418ea6127b6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f418ea6127b6 author: Xerxes Ranby date: Fri Aug 12 17:02:19 2011 +0200 Zero/Shark: PR690: Shark fails to JIT using hs20, PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. 2011-08-12 Xerxes Ranby Zero/Shark - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. * patches/pr690-shark-jit-hs20.patch: New patch backported from OpenJDK 7 bug 7032458. * patches/pr696-zero-fast_aldc-hs20.patch: New patch backported from OpenJDK 7 bug 7032458 and 7030207. * Makefile.am: Added new patches. * NEWS: Updated. changeset e93e0b640f06 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e93e0b640f06 author: ptisnovs date: Mon Aug 15 10:47:57 2011 +0200 6806261: BigDecimal.longValueExact() method throws NullPointerException changeset 773cee7545f2 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=773cee7545f2 author: ptisnovs date: Mon Aug 15 11:10:04 2011 +0200 Added LDFLAGS for JamVM to fix the SELinux executable flag issue. changeset a690c9e7e3bc in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a690c9e7e3bc author: Xerxes Ranby date: Mon Aug 15 11:49:11 2011 +0200 JamVM: Updated to 2011-08-15 revision. 2011-08-15 Xerxes Ranby JamVM - Fix typo in definition of ACC_MIRANDA. - Intern strings when creating a StackTraceElement. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-15 revision. (JAMVM_SHA256SUM): Updated. changeset 0e26a40dddf3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e26a40dddf3 author: Xerxes Ranby date: Mon Aug 15 12:08:18 2011 +0200 JamVM: Ignore assertions and verify options. 2011-08-15 Xerxes R?nby JamVM - Ignore assertions and verify options. * NEWS: Updated. * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. * Makefile.am: Apply JamVM patch. changeset 79671aecc0b0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=79671aecc0b0 author: Xerxes Ranby date: Mon Aug 15 14:29:30 2011 +0200 JamVM: Fix regression introduced by; Intern strings when creating a StackTraceElement. 2011-08-15 Xerxes Ranby JamVM - Fix regression introduced by, Intern strings when creating a StackTraceElement, changeset 4dbc2ee340a600fc17451dfbcfc09e1f9844fc59. * NEWS: Updated. * patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.pa tch: New patch. * Makefile.am: Apply JamVM patch. changeset 1bec501e2dc7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1bec501e2dc7 author: ptisnovs date: Tue Aug 16 16:09:29 2011 +0200 S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError changeset 759b17771e6a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=759b17771e6a author: Xerxes Ranby date: Fri Aug 19 13:36:29 2011 +0200 JamVM: LP827463: Fix OpenJDK enclosingMethodInfo(), Updated JamVM to 2011-08-19 revision. 2011-08-19 Xerxes Ranby JamVM - LP827463: Fix OpenJDK enclosingMethodInfo(). - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. * NEWS: Updated. * patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.pa tch: Replaced by upstream, Fix for StackTraceElement checkin, changeset 500a6c2f3b9769c73d872ea78de4237e427a443e. * Makefile.am (ICEDTEA_PATCHES): Remove upstreamed JamVM patch. (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. (JAMVM_SHA256SUM): Updated. changeset 9468557f98c0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9468557f98c0 author: Xerxes Ranby date: Tue Aug 30 12:30:04 2011 +0200 CACAO: CA149: Used wrong class loader, Updated to 2011-08-29 revision. 2011-08-30 Xerxes Ranby CACAO - CA149: Used wrong class loader. - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack index of caller was off by one, causing many apt (Annotation Processing Tool) failures. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-29 revision. (CACAO_SHA256SUM): Updated. changeset b9ac502a6189 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b9ac502a6189 author: Deepak Bhole date: Tue Aug 30 11:30:12 2011 -0400 S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog * Makefile.am: Apply new patch for S6826104. * NEWS: Updated. * patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.pa tch: New patch that fixes S6826104. changeset c7dfe2b4791e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c7dfe2b4791e author: Xerxes Ranby date: Fri Sep 02 12:41:10 2011 +0200 JamVM: Add support for armhf. 2011-09-02 Xerxes Ranby JamVM - Add support for armhf. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. (JAMVM_SHA256SUM): Updated. changeset fc183654bed3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc183654bed3 author: Xerxes Ranby date: Mon Sep 05 12:45:12 2011 +0200 2011-09-05 Xerxes Ranby JamVM - armhf: ensure stack is 8 byte aligned. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. (JAMVM_SHA256SUM): Updated. changeset daabd8a14b5e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=daabd8a14b5e author: ptisnovs date: Thu Sep 08 11:42:33 2011 +0200 S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" changeset fb9bfc043a45 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fb9bfc043a45 author: ptisnovs date: Thu Sep 08 18:10:28 2011 +0200 Backport of 6296893: BMP Writer handles TopDown property incorrectly for some of the compression types changeset 8bddd11809ac in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8bddd11809ac author: Andrew John Hughes date: Fri Sep 09 00:03:53 2011 +0100 Drop 6578583; upstreamed. 2011-09-08 Andrew John Hughes * patches/openjdk/6578583-modality-broken-vista.patch: Removed. * Makefile.am: Drop above patch, upstreamed. diffstat: ChangeLog | 530 + INSTALL | 16 +- Makefile.am | 190 +- NEWS | 485 +- acinclude.m4 | 136 +- arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 583 - arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7695 ---------- arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 6336 -------- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 7456 --------- arm_port/hotspot/tools/mkbc.c | 607 - configure.ac | 14 +- hotspot.map | 3 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java | 20 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java | 118 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java | 74 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 60 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java | 70 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 14 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 40 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java | 64 +- overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java | 48 +- overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java | 65 +- overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java | 154 +- overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java | 846 +- patches/arm.patch | 162 - patches/ecj/endorsed-dir-for-jvmti.patch | 12 - patches/ecj/xsltproc.patch | 53 + patches/gcc-suffix.patch | 29 + patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch | 173 - patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch | 43 - patches/hotspot/hs20/arm.patch | 56 - patches/hotspot/hs20/gcc-suffix.patch | 29 - patches/hotspot/hs20/ia64-fix.patch | 14 - patches/hotspot/hs20/params-cast-size_t.patch | 259 - patches/hotspot/hs20/powerpc-stacksize.patch | 39 - patches/hotspot/hs20/sparc-buildfixes.patch | 24 - patches/hotspot/hs20/systemtap.patch | 99 - patches/hotspot/hs20/text-relocations.patch | 60 - patches/hotspot/original/7032388-work_without_cmov_instruction.patch | 152 - patches/hotspot/original/arm.patch | 54 - patches/hotspot/original/gcc-suffix.patch | 29 - patches/hotspot/original/ia64-fix.patch | 28 - patches/hotspot/original/no-precompiled-headers.patch | 33 - patches/hotspot/original/params-cast-size_t.patch | 284 - patches/hotspot/original/sparc-buildfixes.patch | 32 - patches/hotspot/original/systemtap.patch | 97 - patches/hotspot/original/text-relocations.patch | 58 - patches/hotspot/original/too-many-args.patch | 45 - patches/ia64-fix.patch | 14 + patches/jamvm/ignore-assertions-and-verify-options.patch | 19 + patches/jamvm/jmm_GetLongAttribute_201.patch | 21 + patches/jaxp-serial-version-uid.patch | 51 - patches/jtreg-ConstructDeflaterInput-fix.patch | 9 + patches/jtreg-hotspot-Test7020373-fix.patch | 185 + patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch | 306 + patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch | 115 + patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch | 352 + patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch | 193 + patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch | 109 + patches/openjdk/6390045-error_cannot_access_java_lang_void.patch | 101 + patches/openjdk/6578583-modality-broken-vista.patch | 1439 - patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch | 21 - patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch | 89 + patches/openjdk/6633275-shaped_translucent_windows.patch | 117 +- patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch | 343 + patches/openjdk/6679308-Poor_text_rendering_on_translucent_image.patch | 1 - patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch | 175 + patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch | 95 + patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch | 105 + patches/openjdk/6768387-jtable_not_serializable.patch | 104 - patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch | 394 + patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch | 16 + patches/openjdk/6842838-64-bit_failure_in_handling_invalid_manifest.patch | 269 + patches/openjdk/6882768-test_for_6842838_is_broken.patch | 94 + patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch | 290 + patches/openjdk/6997495-test_correction_6857159.patch | 20 - patches/openjdk/7029905-demo_applet_html_files.patch | 52 - patches/openjdk/7032388-work_without_cmov_instruction.patch | 173 + patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 + patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch | 6163 ++++++++ patches/openjdk/7042040-no_disk_space_check.patch | 112 - patches/openjdk/7049339-anyblit-broken.patch | 109 + patches/params-cast-size_t.patch | 259 + patches/powerpc-stacksize.patch | 39 + patches/pr690-shark-jit-hs20.patch | 58 + patches/pr696-zero-fast_aldc-hs20.patch | 42 + patches/security/20110215/6878713.patch | 138 - patches/security/20110607/6213702.patch | 105 - patches/security/20110607/6618658.patch | 24 - patches/security/20110607/7012520.patch | 24 - patches/security/20110607/7013519.patch | 48 - patches/security/20110607/7013969.patch | 25 - patches/security/20110607/7013971.patch | 132 - patches/security/20110607/7016495.patch | 422 - patches/security/20110607/7020198.patch | 138 - patches/security/20110607/7020373.patch | 37 - patches/sparc-buildfixes.patch | 24 + patches/systemtap.patch | 99 + patches/text-relocations.patch | 60 + patches/xjc.patch | 14 +- 100 files changed, 12405 insertions(+), 28470 deletions(-) diffs (truncated from 43473 to 500 lines): diff -r 73e0d37b9ec3 -r 8bddd11809ac ChangeLog --- a/ChangeLog Fri Jul 01 14:41:45 2011 +0200 +++ b/ChangeLog Fri Sep 09 00:03:53 2011 +0100 @@ -1,3 +1,467 @@ +2011-09-08 Andrew John Hughes + + * patches/openjdk/6578583-modality-broken-vista.patch: + Removed. + * Makefile.am: Drop above patch, upstreamed. + +2011-09-08 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch: + Backport of 6296893: BMP Writer handles TopDown property incorrectly + for some of the compression types + +2011-09-06 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch: + Backport of 5082756: Image I/O plug-ins set metadata + boolean attributes to "true" or "false" + +2011-09-05 Xerxes R??nby + + JamVM + - armhf: ensure stack is 8 byte aligned. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-09-03 revision. + (JAMVM_SHA256SUM): Updated. + +2011-09-02 Xerxes R??nby + + JamVM + - Add support for armhf. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-31 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-30 Deepak Bhole + + S6826104, RH730015: Getting a NullPointer exception when clicked on Application & + Toolkit Modal dialog + * Makefile.am: Apply new patch for S6826104. + * NEWS: Updated. + * patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch: + New patch that fixes S6826104. + +2011-08-30 Xerxes R??nby + + CACAO + - CA149: Used wrong class loader. + - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): + [OPENJDK] stack index of caller was off by one, causing many apt + (Annotation Processing Tool) failures. + * NEWS: Updated. + * Makefile.am + (CACAO_VERSION): Updated CACAO to 2011-08-29 revision. + (CACAO_SHA256SUM): Updated. + +2011-08-19 Xerxes R??nby + + JamVM + - LP827463: Fix OpenJDK enclosingMethodInfo(). + - "Fix" handling of CLI bootclasspath options. + - Fix for StackTraceElement checkin. + * NEWS: Updated. + * patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch: + Replaced by upstream, Fix for StackTraceElement checkin, + changeset 500a6c2f3b9769c73d872ea78de4237e427a443e. + * Makefile.am + (ICEDTEA_PATCHES): Remove upstreamed JamVM patch. + (JAMVM_VERSION): Updated JamVM to 2011-08-19 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-16 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch: + Backport of 6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) + throws StackOverflowError + +2011-08-15 Xerxes R??nby + + JamVM + - Fix regression introduced by, Intern strings when creating a StackTraceElement, + changeset 4dbc2ee340a600fc17451dfbcfc09e1f9844fc59. + * NEWS: Updated. + * patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch: New patch. + * Makefile.am: Apply JamVM patch. + +2011-08-15 Xerxes R??nby + + JamVM + - Ignore assertions and verify options. + * NEWS: Updated. + * patches/jamvm/ignore-assertions-and-verify-options.patch: New patch. + * Makefile.am: Apply JamVM patch. + +2011-08-15 Xerxes R??nby + + JamVM + - Fix typo in definition of ACC_MIRANDA. + - Intern strings when creating a StackTraceElement. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-15 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-15 Pavel Tisnovsky + + * Makefile.am: added LDFLAGS for JamVM to fix the SELinux + executable flag issue. + +2011-08-15 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch: + Backport of 6806261: BigDecimal.longValueExact() method throws + NullPointerException + +2011-08-12 Xerxes R??nby + + Zero/Shark + - PR690: Shark fails to JIT using hs20. + - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. + * patches/pr690-shark-jit-hs20.patch: New patch backported from + OpenJDK 7 bug 7032458. + * patches/pr696-zero-fast_aldc-hs20.patch: New patch backported from + OpenJDK 7 bug 7032458 and 7030207. + * Makefile.am: Added new patches. + * NEWS: Updated. + +2011-08-11 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch: + Backport of 7036582: Improve test coverage of java.math.BigDecimal + +2011-08-11 Pavel Tisnovsky + + * Makefile.am: fixed typo in patch name + * patches/openjdk/6934356_Vector_writeObject_serialization_DL.patch: + Deleted + * patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch: + Added as replacement of deleted patch file. + +2011-08-10 Xerxes R??nby + + JamVM + - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + * NEWS: Updated. + * patches/jamvm/jmm_GetLongAttribute_201.patch: New patch. + * Makefile.am: Apply JamVM patch. + +2011-08-09 Xerxes R??nby + + CACAO + - CA159: Exception handler blocks / register mixup. + - Set thread to RUNNABLE during Thread.start. + - Removed state-setting function call that would be done by the thread + itself, creating a nasty race. + * NEWS: Updated. + * Makefile.am + (CACAO_VERSION): Updated CACAO to 2011-08-08 revision. + (CACAO_SHA256SUM): Updated. + +2011-08-09 Xerxes R??nby + + JamVM + - Remove empty clobber. + - Use dots instead of slashes in classname for exception. + - Correct thrown exception by bootstrap loader. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-08 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-02 Xerxes R??nby + + JamVM + - Put parsing of -cp and -classpath options back in. + - Fix threading of references list during compaction. + - Further fix to freeClassData for native methods. + - Fix class GC with classes containing Miranda methods. + - Propogate initialisation errors to top-level + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-08-01 revision. + (JAMVM_SHA256SUM): Updated. + +2011-08-01 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6934356_Vector_writeObject_serialization_DL.patch: + Backport of 6934356. + +2011-07-29 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch: + Backport of 6669869. + +2011-07-25 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch: + Backport of 5047314. + +2011-07-22 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch: + Backport of 6752638. + +2011-07-21 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6390045-error_cannot_access_java_lang_void.patch: + Backport of 6390045. + +2011-07-20 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch: + Backport of 4917091. + +2011-07-19 Marc Schoenefeld + Pavel Tisnovsky + + * Makefile.am: added new patch + * patches/jtreg-hotspot-Test7020373-fix.patch: + Fix for regression test hotspot/7020373, added missing + source used to create the reproducer. + * patches/jtreg-7020373-add-ignore-tag.patch: + Removed because it is not longer needed. + +2011-07-15 Denis Lila + + * Makefile.am: Added patch. + * NEWS: Added backport. + * patches/openjdk/7049339-anyblit-broken.patch: + Backport of S7049339. + +2011-07-15 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch: + Backport of 6613904. + +2011-07-13 Andrew John Hughes + + * NEWS: Add b23 changes. + +2011-07-12 Pavel Tisnovsky + + * Makefile.am: added new patch + * patches/jtreg-ConstructDeflaterInput-fix.patch: + Regression test jdk/test/java/util/zip/ConstructDeflaterInput.java + should be run in othervm mode to not to print messages to JTreg + log files (such messages must be stored in .jtr file). + +2011-07-12 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch: + Backport of 6758179. + +2011-05-25 Andrew John Hughes + + * Makefile.am: + (ENDORSED_DIR): Removed. + (ICEDTEA_ECJ_PATCHES): Add xsltproc.patch. + Remove endorsed-dir-for-jvmti.patch. + (ICEDTEA_ENV_ECJ): Set XSLT. Don't + set ICEDTEA_ENDORSED_DIR or ENDORSED. + (bootstrap-directory-stage1): Don't link + xalan2, xerces2 or xalan2 serialiser. + * acinclude.m4: + (IT_FIND_XALAN2_JAR): Removed. + (IT_FIND_XALAN2_SERIALIZER_JAR): Likewise. + (IT_FIND_XERCES2_JAR): Likewise. + (IT_FIND_XML_COMMONS_API_JAR): Likewise. + * configure.ac: + Replace calls to IT_FIND_XALAN2_JAR, + IT_FIND_XALAN2_SERIALIZER_JAR, + IT_FIND_XERCES2_JAR and + IT_FIND_XML_COMMONS_API_JAR with call to + IT_FIND_TOOL for xsltproc. + * patches/ecj/xsltproc.patch: + Patch jvmti.make in HotSpot to use + xsltproc instead of Java's XSLT + when bootstrapping. + * patches/ecj/endorsed-dir-for-jvmti.patch: + Remove addition of $(ENDORSED) to + jvmti.make. + * NEWS: Update and make bug fixes more + prominent. + +2011-07-11 Andrew John Hughes + + * Makefile.am: + (clean-add-jamvm): Only perform sed on jvm.cfg + if it exists and use correct path as in original + rule. + (clean-add-jamvm-debug): Likewise. + (clean-add-cacao): Likewise. + (clean-add-cacao-debug): Likewise. + (clean-add-jamvm): Likewise. + (clean-add-jamvm-debug): Likewise. + +2011-07-11 Andrew John Hughes + + * NEWS: Import 1.10.2, 1.9.8, 1.8.8 and + 1.10.1 release announcements. Sync 1.10 + announcement with final version. Remove + items from the 1.11 list that have been + released in 1.10.1 & 1.10.2. + +2011-07-11 Andrew John Hughes + + * NEWS: Place ARM removal in a more + prominent location. + +2011-07-11 Xerxes R??nby + + * NEWS: Updated. + +2011-07-11 Xerxes R??nby + + Removal of the ARM assembler port, unbreaks Zero and Shark builds. + * Makefile.am: + (ICEDTEA_PATCHES): Remove patches/arm.patch. + (clean-ports): Removed. + (stamps/ports.stamp): Likewise. + (hotspot-ports): Likewise. + * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed. + * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise. + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise. + * arm_port/hotspot/tools/mkbc.c: Likewise. + * patches/arm.patch: Likewise. + +2011-07-11 Pavel Tisnovsky + + * Makefile.am: added new patch + * patches/jtreg-7020373-add-ignore-tag.patch: + Added @ignore tag to this regression test because binary jar + file needed to run the test is missing in OpenJDK6. + +2011-07-08 Pavel Tisnovsky + + * Makefile.am: added new patch + * NEWS: updated with backport + * patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch: + Backport of 6711682. + +2011-07-07 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Updated. + (OPENJDK_SHA256SUM): Replaces OPENJDK_MD5SUM. + (download-openjdk): Use sha256 as with all + other bundles. + (download-hotspot): Likewise. + * configure.ac: Remove check for md5sum. + * hotspot.map: Move to sha256. + +2011-07-07 Pavel Tisnovsky + + * Makefile.am: added new patches + * NEWS: updated with backports + * patches/openjdk/6842838-64-bit_failure_in_handling_invalid_manifest.patch: + * patches/openjdk/6882768-test_for_6842838_is_broken.patch: + Backport of 6842838 and 6882768. + +2011-07-07 Pavel Tisnovsky + + * patches/openjdk/6679308-Poor_text_rendering_on_translucent_image.patch: + Fixed test location (added missing prefix 'jdk' into path). + +2011-07-06 Andrew John Hughes + + Make JPEG classes more binary compatible with + Oracle versions. + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java: + Extend RuntimeException. + (ImageFormatException()): Call superclass constructor. + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java: + (JPEGCodec()): Make explicit private constructor to prevent implicit public one. + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java: + Don't extend javax.imageio.plugins.jpeg.JPEGHuffmanTable. + (lengths): Added. + (symbols): Added. + (JPEGHuffmanTable(short[], short[])): Perform checks outlined in documentation. + (getLengths()): Added. + (getSymbols()): Return symbols. + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java: + (getDefaultColorId(ColorModel)): Fix typo (was DefaultColorID). + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java: + (TruncatedFileException(BufferedImage)): Add missing constructor. + (TruncatedFileException(Raster)): Likewise. + (getBufferedImage()): Implemented. + (getRaster()): Add missing method. + (TruncatedFileException()): Removed. + (TruncatedFileException(String)): Likewise. + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java: + (decodeAsBufferedImage()): Remove unneeded qualification and convert from com.sun JPEGHuffmanTable + to javax.imageio one. + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java: + (getDefaultColorId(ColorModel)): Fix typo (was DefaultColorID). + * NEWS: Updated. + +2011-07-06 Andrew John Hughes + + * patches/security/20110215/6878713.patch, + * patches/security/20110607/6213702.patch, + * patches/security/20110607/6618658.patch, + * patches/security/20110607/7012520.patch, + * patches/security/20110607/7013519.patch, + * patches/security/20110607/7013969.patch, + * patches/security/20110607/7013971.patch, + * patches/security/20110607/7016495.patch, + * patches/security/20110607/7020198.patch, + * patches/security/20110607/7020373.patch: + Removed; upstream. + * Makefile.am: + (JAXWS_DROP_ZIP): Updatede. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Set to empty. + * patches/xjc.patch: Revert to pre-security + patch version (security patch is now part of the + tarball, not a patch) + +2011-07-06 Andrew John Hughes + + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java: + Normalise whitespace using Oracle normaliser. + 2011-07-01 Pavel Tisnovsky * Makefile.am: added new patches @@ -478,6 +942,54 @@ make the test compatible with OpenJDK7/IcedTea7, disabling printing unnecessary information to error output. +2011-05-18 Andrew John Hughes + + * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/hs20/arm.patch, + * patches/hotspot/hs20/gcc-suffix.patch, + * patches/hotspot/hs20/ia64-fix.patch, + * patches/hotspot/hs20/params-cast-size_t.patch, + * patches/hotspot/hs20/powerpc-stacksize.patch, + * patches/hotspot/hs20/sparc-buildfixes.patch, + * patches/hotspot/hs20/systemtap.patch, + * patches/hotspot/hs20/text-relocations.patch: + Moved to main tree. + * patches/hotspot/original/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/original/arm.patch, + * patches/hotspot/original/gcc-suffix.patch, + * patches/hotspot/original/ia64-fix.patch, + * patches/hotspot/original/no-precompiled-headers.patch, + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/sparc-buildfixes.patch, + * patches/hotspot/original/systemtap.patch, + * patches/hotspot/original/text-relocations.patch, + * patches/hotspot/original/too-many-args.patch: + Dropped; hs19 no longer supported. + * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch, + * patches/openjdk/6997495-test_correction_6857159.patch, From ptisnovs at redhat.com Fri Sep 9 02:24:29 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 09 Sep 2011 11:24:29 +0200 Subject: Reviewer needed: backport of "6795544: GIFImageWriter does not write the subImage of BufferedImage to a file correctly" into IcedTea6 HEAD Message-ID: <4E69DB4D.4040300@redhat.com> Greetings, Here's yet another backport I'd like to push to IcedTea6 HEAD: "6795544: GIFImageWriter does not write the subImage of BufferedImage to a file correctly" Tested on RHEL 5 x86_64, including successful run of JTreg test contained in the patch. ChangeLog entry: 2011-09-09 Pavel Tisnovsky * Makefile.am: added new patch * NEWS: updated with backport * patches/openjdk/6795544-GIFImageWriter_does_not_write_subImage.patch: Backport of 6795544: GIFImageWriter does not write the subImage of BufferedImage to a file correctly. Can anybody please review this change? Thank you in advance Pavel PS: I'm going to ask for backport this change to OpenJDK6 too. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: 6795544_hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110909/09b24d13/6795544_hg.diff From ptisnovs at icedtea.classpath.org Fri Sep 9 04:46:34 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 09 Sep 2011 11:46:34 +0000 Subject: /hg/gfx-test: Added new test cases - subtraction, intersection a... Message-ID: changeset 221ec39deecf in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=221ec39deecf author: Pavel Tisnovsky date: Fri Sep 09 13:48:28 2011 +0200 Added new test cases - subtraction, intersection and XOR constructive area geometry operations. diffstat: ChangeLog | 9 + Makefile | 4 +- src/org/gfxtest/testsuites/CAGOperationsOnAreas.java | 603 +++++++++++++++++++ 3 files changed, 614 insertions(+), 2 deletions(-) diffs (truncated from 644 to 500 lines): diff -r 9fe7efd696f4 -r 221ec39deecf ChangeLog --- a/ChangeLog Thu Sep 08 12:53:15 2011 +0200 +++ b/ChangeLog Fri Sep 09 13:48:28 2011 +0200 @@ -1,3 +1,12 @@ +2011-09-09 Pavel Tisnovsky + + * Makefile: renamed classes to compile + * src/org/gfxtest/testsuites/CAGOperations.java: + * src/org/gfxtest/testsuites/CAGOperationsOnAreas.java: + Renamed, because new similar CAG tests will be prepared. + Added new test cases - subtraction, intersection and XOR + constructive area geometry operations. + 2011-09-08 Pavel Tisnovsky * Makefile: added new classes to compile diff -r 9fe7efd696f4 -r 221ec39deecf Makefile --- a/Makefile Thu Sep 08 12:53:15 2011 +0200 +++ b/Makefile Fri Sep 09 13:48:28 2011 +0200 @@ -134,7 +134,7 @@ $(CLASSES)/$(TESTSUITE_DIR)/GradientPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/LinearGradientPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class \ - $(CLASSES)/$(TESTSUITE_DIR)/CAGOperations.class + $(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnAreas.class COMPARE_RESULTS = \ $(RESULTS)/AALines \ @@ -175,7 +175,7 @@ $(RESULTS)/GradientPaint \ $(RESULTS)/LinearGradientPaint \ $(RESULTS)/RadialGradientPaint \ - $(RESULTS)/CAGOperations + $(RESULTS)/CAGOperationsOnAreas # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') diff -r 9fe7efd696f4 -r 221ec39deecf src/org/gfxtest/testsuites/CAGOperationsOnAreas.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/CAGOperationsOnAreas.java Fri Sep 09 13:48:28 2011 +0200 @@ -0,0 +1,603 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.testsuites; + +import java.awt.Graphics2D; +import java.awt.geom.Area; +import java.awt.geom.Ellipse2D; + + + +import org.gfxtest.framework.*; +import org.gfxtest.framework.annotations.*; + + + +/** + * This test checks the process of creating and rendering new geometric shapes + * by performing boolean operations on existing ones. This process is often + * called Constructive area geometry (CAG). All CAG operations - union, + * intersection, subtraction and XOR - is processed on two Areas. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at RenderStyle(RenderStyles.FILL) + at Transformation(Transformations.NONE) + at Zoom(1) +public class CAGOperationsOnAreas extends GfxTest +{ + + /** + * Compute radius of circle from the position of center point in an image. + * + * @param xc + * x-coordinate of the center of the test image. + * @param y + * y-coordinate of the center of the test image. + * @return radius of circle + */ + private int computeRadius(int xc, int yc) + { + return ((xc > yc ? yc : xc) << 1) / 3; + } + + /** + * Create circle area. + * + * @param xc + * the X coordinate of the center of circle + * @param yc + * the Y coordinate of the center of circle + * @param radius + * radius of circle + * @return newly created area containing one circle + */ + private Area createCircleArea(int xc, int yc, int radius) + { + Ellipse2D circle = new Ellipse2D.Double(xc - radius, yc - radius, radius << 1, radius << 1); + return new Area(circle); + } + + /** + * Create area composed of only one circle. This circle is placed on the + * left side of the image. + * + * @param image + * image to which line is to be drawn + * @return newly created area containing one circle + */ + private Area createFirstCircleArea(TestImage image) + { + int xc = image.getCenterX(); + int yc = image.getCenterY(); + int radius = computeRadius(xc, yc); + int x1 = xc - 3 * (radius >> 2); + return createCircleArea(x1, yc, radius); + } + + /** + * Create area composed of only one circle. This circle is placed on the + * right side of the image. + * + * @param image + * image to which line is to be drawn + * @return newly created area containing one circle + */ + private Area createSecondCircleArea(TestImage image) + { + int xc = image.getCenterX(); + int yc = image.getCenterY(); + int radius = computeRadius(xc, yc); + int x2 = xc + 3 * (radius >> 2); + return createCircleArea(x2, yc, radius); + } + + /** + * Create new area composed from two circles using union operator. + * + * @param image + * image to which line is to be drawn + * @return new area composed of two circles + */ + private Area createAreaFromCirclesUsingUnionOperator(TestImage image) + { + Area circle1Area = createFirstCircleArea(image); + Area circle2Area = createSecondCircleArea(image); + Area area = new Area(); + area.add(circle1Area); + area.add(circle2Area); + return area; + } + + /** + * Create new area composed from two circles using subtract operator. + * + * @param image + * image to which line is to be drawn + * @return new area composed of two circles + */ + private Area createAreaFromCirclesUsingSubtractOperator(TestImage image) + { + Area circle1Area = createFirstCircleArea(image); + Area circle2Area = createSecondCircleArea(image); + Area area = new Area(); + area.add(circle1Area); + area.subtract(circle2Area); + return area; + } + + /** + * Create new area composed from two circles using subtract operator. + * + * @param image + * image to which line is to be drawn + * @return new area composed of two circles + */ + private Area createAreaFromCirclesUsingInverseSubtractOperator(TestImage image) + { + Area circle1Area = createFirstCircleArea(image); + Area circle2Area = createSecondCircleArea(image); + Area area = new Area(); + area.add(circle2Area); + area.subtract(circle1Area); + return area; + } + + /** + * Create new area composed from two circles using intersect operator. + * + * @param image + * image to which line is to be drawn + * @return new area composed of two circles + */ + private Area createAreaFromCirclesUsingIntersectOperator(TestImage image) + { + Area circle1Area = createFirstCircleArea(image); + Area circle2Area = createSecondCircleArea(image); + Area area = new Area(); + area.add(circle1Area); + area.intersect(circle2Area); + return area; + } + + /** + * Create new area composed from two circles using XOR operator. + * + * @param image + * image to which line is to be drawn + * @return new area composed of two circles + */ + private Area createAreaFromCirclesUsingXorOperator(TestImage image) + { + Area circle1Area = createFirstCircleArea(image); + Area circle2Area = createSecondCircleArea(image); + Area area = new Area(); + area.add(circle1Area); + area.exclusiveOr(circle2Area); + return area; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using union operator. The shape is rendered + * using stroke. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testUnionStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area using union operator + Area area = createAreaFromCirclesUsingUnionOperator(image); + // draw the area + graphics.draw(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using subtract operator. The shape is + * rendered using stroke. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSubtractStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area using subtract operator + Area area = createAreaFromCirclesUsingSubtractOperator(image); + // draw the area + graphics.draw(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using inverse subtract operator. The shape + * is rendered using stroke. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testInverseSubtractStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area using subtract operator + Area area = createAreaFromCirclesUsingInverseSubtractOperator(image); + // draw the area + graphics.draw(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using intersect operator. The shape is + * rendered using stroke. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIntersectStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area using intersect operator + Area area = createAreaFromCirclesUsingIntersectOperator(image); + // draw the area + graphics.draw(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using XOR operator. The shape is rendered + * using stroke. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testXorStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area using XOR operator + Area area = createAreaFromCirclesUsingXorOperator(image); + // draw the area + graphics.draw(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using union operator. The shape is rendered + * using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testUnionColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using union operator + Area area = createAreaFromCirclesUsingUnionOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using subtract operator. The shape is + * rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSubtractColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using subtract operator + Area area = createAreaFromCirclesUsingSubtractOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using intersect operator. The shape is + * rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIntersectColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using intersect operator + Area area = createAreaFromCirclesUsingIntersectOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using XOR operator. The shape is rendered + * using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testXorColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using XOR operator + Area area = createAreaFromCirclesUsingXorOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using union operator. The shape is rendered + * using horizontal gradient paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testUnionColorHorizontalGradientPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using union operator + Area area = createAreaFromCirclesUsingUnionOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two circles using subtract operator. The shape is rendered + * using horizontal gradient paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ From andrew at icedtea.classpath.org Fri Sep 9 09:34:23 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Sep 2011 16:34:23 +0000 Subject: /hg/icedtea7: Fix another duplicate gboolean definition. Message-ID: changeset 094e2ade4134 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=094e2ade4134 author: Andrew John Hughes date: Fri Sep 09 17:34:17 2011 +0100 Fix another duplicate gboolean definition. 2011-09-09 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bring in fix for another duplicate gboolean definition. (JDK_SHA256SUM): Likewise. diffstat: ChangeLog | 7 +++++++ Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 9f7e31696ac5 -r 094e2ade4134 ChangeLog --- a/ChangeLog Thu Sep 08 17:50:11 2011 +0100 +++ b/ChangeLog Fri Sep 09 17:34:17 2011 +0100 @@ -1,3 +1,10 @@ +2011-09-09 Andrew John Hughes + + * Makefile.am: + (JDK_CHANGESET): Bring in fix for another + duplicate gboolean definition. + (JDK_SHA256SUM): Likewise. + 2011-09-08 Andrew John Hughes * Makefile.am: diff -r 9f7e31696ac5 -r 094e2ade4134 Makefile.am --- a/Makefile.am Thu Sep 08 17:50:11 2011 +0100 +++ b/Makefile.am Fri Sep 09 17:34:17 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 1dd9b3d73b22 JAXP_CHANGESET = c40983d6ae70 JAXWS_CHANGESET = 83db5e316798 -JDK_CHANGESET = 097557275d7e +JDK_CHANGESET = 80fe75968a0b LANGTOOLS_CHANGESET = fb7fb3071b64 OPENJDK_CHANGESET = 3defd24c2671 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21 -JDK_SHA256SUM = b303e4c87e490ae9c33dc529320f7884ddd2dc2f2c1cfcde70790cb757b6ed1a +JDK_SHA256SUM = c083590700305ffdea31a1487956d8304cdbb3a5da79e92c3f2efc3e8a26a06d LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e From ptisnovs at icedtea.classpath.org Mon Sep 12 06:08:57 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 12 Sep 2011 13:08:57 +0000 Subject: /hg/gfx-test: Added new test suite containing 5 new gfx.tests fr... Message-ID: changeset b07fde3d88fd in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b07fde3d88fd author: Pavel Tisnovsky date: Mon Sep 12 15:10:51 2011 +0200 Added new test suite containing 5 new gfx.tests from the domain of Constructive area geometry (CAG): org/gfxtest/testsuites/CAGOperationsOnRectangles.java diffstat: ChangeLog | 13 +- Makefile | 6 +- src/org/gfxtest/framework/TestImage.java | 10 + src/org/gfxtest/testsuites/CAGOperationsOnAreas.java | 603 -------------- src/org/gfxtest/testsuites/CAGOperationsOnCircles.java | 603 ++++++++++++++ src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java | 352 ++++++++ 6 files changed, 981 insertions(+), 606 deletions(-) diffs (truncated from 1640 to 500 lines): diff -r 221ec39deecf -r b07fde3d88fd ChangeLog --- a/ChangeLog Fri Sep 09 13:48:28 2011 +0200 +++ b/ChangeLog Mon Sep 12 15:10:51 2011 +0200 @@ -1,3 +1,14 @@ +2011-09-12 Pavel Tisnovsky + + * Makefile: added new class to compile + * src/org/gfxtest/framework/TestImage.java: + Added new getter getGrid(). + * src/org/gfxtest/testsuites/CAGOperationsOnAreas.java: + * src/org/gfxtest/testsuites/CAGOperationsOnCircles.java: + * src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java: + Added new test suite containing 5 new gfx.tests from the domain of + Constructive area geometry (CAG) + 2011-09-09 Pavel Tisnovsky * Makefile: renamed classes to compile @@ -11,7 +22,7 @@ * Makefile: added new classes to compile * src/org/gfxtest/testsuites/CAGOperations.java: - Added new test suite containing 5 new gfx.tests + Added new test suite containing 5 new gfx.tests from the domain of Constructive area geometry (CAG) 2011-09-07 Pavel Tisnovsky diff -r 221ec39deecf -r b07fde3d88fd Makefile --- a/Makefile Fri Sep 09 13:48:28 2011 +0200 +++ b/Makefile Mon Sep 12 15:10:51 2011 +0200 @@ -134,7 +134,8 @@ $(CLASSES)/$(TESTSUITE_DIR)/GradientPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/LinearGradientPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class \ - $(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnAreas.class + $(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnCircles.class \ + $(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnRectangles.class COMPARE_RESULTS = \ $(RESULTS)/AALines \ @@ -175,7 +176,8 @@ $(RESULTS)/GradientPaint \ $(RESULTS)/LinearGradientPaint \ $(RESULTS)/RadialGradientPaint \ - $(RESULTS)/CAGOperationsOnAreas + $(RESULTS)/CAGOperationsOnCircles \ + $(RESULTS)/CAGOperationsOnRectangles # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') diff -r 221ec39deecf -r b07fde3d88fd src/org/gfxtest/framework/TestImage.java --- a/src/org/gfxtest/framework/TestImage.java Fri Sep 09 13:48:28 2011 +0200 +++ b/src/org/gfxtest/framework/TestImage.java Mon Sep 12 15:10:51 2011 +0200 @@ -245,6 +245,16 @@ } /** + * Return the value used to draw a grid on the background of the image. + * + * @return grid size + */ + public int getGrid() + { + return GRID_SIZE; + } + + /** * Return x-coordinate of the center of the test image. * * @return x-coordinate of the center of the test image. diff -r 221ec39deecf -r b07fde3d88fd src/org/gfxtest/testsuites/CAGOperationsOnAreas.java --- a/src/org/gfxtest/testsuites/CAGOperationsOnAreas.java Fri Sep 09 13:48:28 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,603 +0,0 @@ -/* - Java gfx-test framework - - Copyright (C) 2010, 2011 Red Hat - -This file is part of IcedTea. - -IcedTea is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -IcedTea is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. -*/ - -package org.gfxtest.testsuites; - -import java.awt.Graphics2D; -import java.awt.geom.Area; -import java.awt.geom.Ellipse2D; - - - -import org.gfxtest.framework.*; -import org.gfxtest.framework.annotations.*; - - - -/** - * This test checks the process of creating and rendering new geometric shapes - * by performing boolean operations on existing ones. This process is often - * called Constructive area geometry (CAG). All CAG operations - union, - * intersection, subtraction and XOR - is processed on two Areas. - * - * @author Pavel Tisnovsky - */ - at TestType(TestTypes.RENDER_TEST) - at RenderStyle(RenderStyles.FILL) - at Transformation(Transformations.NONE) - at Zoom(1) -public class CAGOperationsOnAreas extends GfxTest -{ - - /** - * Compute radius of circle from the position of center point in an image. - * - * @param xc - * x-coordinate of the center of the test image. - * @param y - * y-coordinate of the center of the test image. - * @return radius of circle - */ - private int computeRadius(int xc, int yc) - { - return ((xc > yc ? yc : xc) << 1) / 3; - } - - /** - * Create circle area. - * - * @param xc - * the X coordinate of the center of circle - * @param yc - * the Y coordinate of the center of circle - * @param radius - * radius of circle - * @return newly created area containing one circle - */ - private Area createCircleArea(int xc, int yc, int radius) - { - Ellipse2D circle = new Ellipse2D.Double(xc - radius, yc - radius, radius << 1, radius << 1); - return new Area(circle); - } - - /** - * Create area composed of only one circle. This circle is placed on the - * left side of the image. - * - * @param image - * image to which line is to be drawn - * @return newly created area containing one circle - */ - private Area createFirstCircleArea(TestImage image) - { - int xc = image.getCenterX(); - int yc = image.getCenterY(); - int radius = computeRadius(xc, yc); - int x1 = xc - 3 * (radius >> 2); - return createCircleArea(x1, yc, radius); - } - - /** - * Create area composed of only one circle. This circle is placed on the - * right side of the image. - * - * @param image - * image to which line is to be drawn - * @return newly created area containing one circle - */ - private Area createSecondCircleArea(TestImage image) - { - int xc = image.getCenterX(); - int yc = image.getCenterY(); - int radius = computeRadius(xc, yc); - int x2 = xc + 3 * (radius >> 2); - return createCircleArea(x2, yc, radius); - } - - /** - * Create new area composed from two circles using union operator. - * - * @param image - * image to which line is to be drawn - * @return new area composed of two circles - */ - private Area createAreaFromCirclesUsingUnionOperator(TestImage image) - { - Area circle1Area = createFirstCircleArea(image); - Area circle2Area = createSecondCircleArea(image); - Area area = new Area(); - area.add(circle1Area); - area.add(circle2Area); - return area; - } - - /** - * Create new area composed from two circles using subtract operator. - * - * @param image - * image to which line is to be drawn - * @return new area composed of two circles - */ - private Area createAreaFromCirclesUsingSubtractOperator(TestImage image) - { - Area circle1Area = createFirstCircleArea(image); - Area circle2Area = createSecondCircleArea(image); - Area area = new Area(); - area.add(circle1Area); - area.subtract(circle2Area); - return area; - } - - /** - * Create new area composed from two circles using subtract operator. - * - * @param image - * image to which line is to be drawn - * @return new area composed of two circles - */ - private Area createAreaFromCirclesUsingInverseSubtractOperator(TestImage image) - { - Area circle1Area = createFirstCircleArea(image); - Area circle2Area = createSecondCircleArea(image); - Area area = new Area(); - area.add(circle2Area); - area.subtract(circle1Area); - return area; - } - - /** - * Create new area composed from two circles using intersect operator. - * - * @param image - * image to which line is to be drawn - * @return new area composed of two circles - */ - private Area createAreaFromCirclesUsingIntersectOperator(TestImage image) - { - Area circle1Area = createFirstCircleArea(image); - Area circle2Area = createSecondCircleArea(image); - Area area = new Area(); - area.add(circle1Area); - area.intersect(circle2Area); - return area; - } - - /** - * Create new area composed from two circles using XOR operator. - * - * @param image - * image to which line is to be drawn - * @return new area composed of two circles - */ - private Area createAreaFromCirclesUsingXorOperator(TestImage image) - { - Area circle1Area = createFirstCircleArea(image); - Area circle2Area = createSecondCircleArea(image); - Area area = new Area(); - area.add(circle1Area); - area.exclusiveOr(circle2Area); - return area; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using union operator. The shape is rendered - * using stroke. - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testUnionStrokePaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // create area using union operator - Area area = createAreaFromCirclesUsingUnionOperator(image); - // draw the area - graphics.draw(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using subtract operator. The shape is - * rendered using stroke. - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testSubtractStrokePaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // create area using subtract operator - Area area = createAreaFromCirclesUsingSubtractOperator(image); - // draw the area - graphics.draw(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using inverse subtract operator. The shape - * is rendered using stroke. - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testInverseSubtractStrokePaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // create area using subtract operator - Area area = createAreaFromCirclesUsingInverseSubtractOperator(image); - // draw the area - graphics.draw(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using intersect operator. The shape is - * rendered using stroke. - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testIntersectStrokePaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // create area using intersect operator - Area area = createAreaFromCirclesUsingIntersectOperator(image); - // draw the area - graphics.draw(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using XOR operator. The shape is rendered - * using stroke. - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testXorStrokePaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // create area using XOR operator - Area area = createAreaFromCirclesUsingXorOperator(image); - // draw the area - graphics.draw(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using union operator. The shape is rendered - * using color paint (fill). - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testUnionColorPaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // set fill color - CommonRenderingStyles.setFillColor(graphics); - // create area using union operator - Area area = createAreaFromCirclesUsingUnionOperator(image); - // draw the area - graphics.fill(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using subtract operator. The shape is - * rendered using color paint (fill). - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testSubtractColorPaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // set fill color - CommonRenderingStyles.setFillColor(graphics); - // create area using subtract operator - Area area = createAreaFromCirclesUsingSubtractOperator(image); - // draw the area - graphics.fill(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using intersect operator. The shape is - * rendered using color paint (fill). - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testIntersectColorPaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // set fill color - CommonRenderingStyles.setFillColor(graphics); - // create area using intersect operator - Area area = createAreaFromCirclesUsingIntersectOperator(image); - // draw the area - graphics.fill(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape - * constructed from two circles using XOR operator. The shape is rendered - * using color paint (fill). - * - * @param image - * image to which line is to be drawn - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testXorColorPaint(TestImage image, Graphics2D graphics) - { - // set stroke color - CommonRenderingStyles.setStrokeColor(graphics); - // set fill color - CommonRenderingStyles.setFillColor(graphics); - // create area using XOR operator - Area area = createAreaFromCirclesUsingXorOperator(image); - // draw the area - graphics.fill(area); - return TestResult.PASSED; - } - - /** - * Checks the process of creating and rendering new geometric shape From jvanek at redhat.com Mon Sep 12 10:59:20 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 12 Sep 2011 19:59:20 +0200 Subject: [icedtea-web][rfc] make current reproducers more verbose Message-ID: <4E6E4878.7040409@redhat.com> 2011-09-12 Jiri Vanek * tests/jnlp_tests/: all current reproducers (AccessClassInPackage AddShutdownHook AllStackTraces CreateClassLoader deadlocktest ReadEnvironment ReadProperties RedirectStreams ReplaceSecurityManager SetContextClassLoader simpletest1 simpletest2) junit's asserts are enchanted for reason, so junit assertion exception message is much clearer. -------------- next part -------------- A non-text attachment was scrubbed... Name: verboseReproducers.patch Type: text/x-patch Size: 21356 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110912/264b6af3/verboseReproducers.patch From dbhole at redhat.com Mon Sep 12 11:09:17 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 12 Sep 2011 14:09:17 -0400 Subject: [icedtea-web][rfc] make current reproducers more verbose In-Reply-To: <4E6E4878.7040409@redhat.com> References: <4E6E4878.7040409@redhat.com> Message-ID: <20110912180917.GE18298@redhat.com> * Jiri Vanek [2011-09-12 14:07]: > 2011-09-12 Jiri Vanek > * tests/jnlp_tests/: all current reproducers (AccessClassInPackage > AddShutdownHook AllStackTraces CreateClassLoader deadlocktest > ReadEnvironment ReadProperties RedirectStreams ReplaceSecurityManager > SetContextClassLoader simpletest1 simpletest2) junit's asserts are enchanted > for reason, so junit assertion exception message is much clearer. Hi Jiri, What issue does this fix? How do I reproduce it? Cheers, Deepak From jvanek at redhat.com Mon Sep 12 11:29:59 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 12 Sep 2011 20:29:59 +0200 Subject: [icedtea-web][rfc] make current reproducers more verbose In-Reply-To: <20110912180917.GE18298@redhat.com> References: <4E6E4878.7040409@redhat.com> <20110912180917.GE18298@redhat.com> Message-ID: <4E6E4FA7.2040408@redhat.com> On 09/12/2011 08:09 PM, Deepak Bhole wrote: > * Jiri Vanek [2011-09-12 14:07]: >> 2011-09-12 Jiri Vanek >> * tests/jnlp_tests/: all current reproducers (AccessClassInPackage >> AddShutdownHook AllStackTraces CreateClassLoader deadlocktest >> ReadEnvironment ReadProperties RedirectStreams ReplaceSecurityManager >> SetContextClassLoader simpletest1 simpletest2) junit's asserts are enchanted >> for reason, so junit assertion exception message is much clearer. > > Hi Jiri, > > What issue does this fix? How do I reproduce it? > > Cheers, > Deepak > It fixs "nothing". But when something goes wrong you will be informed instead of standart "assertion error". You can reproduce behaviour when you will break some reproducer (but keep it compilable). I got to troubles here when I wrote scripts for including icedtea-web into daily report and I simulated failures - it was quite digging to find what and why got wrong. Now it is much easier. Thanx for looking into it! J. From ptisnovs at icedtea.classpath.org Tue Sep 13 06:11:44 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 13 Sep 2011 13:11:44 +0000 Subject: /hg/gfx-test: Added ten new test cases to a test Message-ID: changeset 3e4f4c420eba in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=3e4f4c420eba author: Pavel Tisnovsky date: Tue Sep 13 15:13:33 2011 +0200 Added ten new test cases to a test src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java | 240 ++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) diffs (262 lines): diff -r b07fde3d88fd -r 3e4f4c420eba ChangeLog --- a/ChangeLog Mon Sep 12 15:10:51 2011 +0200 +++ b/ChangeLog Tue Sep 13 15:13:33 2011 +0200 @@ -1,3 +1,8 @@ +2011-09-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java: + Added ten new test cases. + 2011-09-12 Pavel Tisnovsky * Makefile: added new class to compile diff -r b07fde3d88fd -r 3e4f4c420eba src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java --- a/src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java Mon Sep 12 15:10:51 2011 +0200 +++ b/src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java Tue Sep 13 15:13:33 2011 +0200 @@ -339,6 +339,246 @@ } /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using union operator. The shape is + * rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testUnionColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using union operator + Area area = createAreaFromRectanglesUsingUnionOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using subtract operator. The shape is + * rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSubtractColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using subtract operator + Area area = createAreaFromRectanglesUsingSubtractOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using inverse subtract operator. The + * shape is rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testInverseSubtractColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using inverse subtract operator + Area area = createAreaFromRectanglesUsingInverseSubtractOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using intersect operator. The + * shape is rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIntersectColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using intersect operator + Area area = createAreaFromRectanglesUsingIntersectOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using XOR operator. The + * shape is rendered using color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testXorColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area using XOR operator + Area area = createAreaFromRectanglesUsingXorOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using union operator. The shape is + * rendered using horizontal gradient color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testUnionHorizontalGradiendPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using union operator + Area area = createAreaFromRectanglesUsingUnionOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using subtract operator. The shape is + * rendered using horizontal gradient color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testSubtractHorizontalGradiendPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using subtract operator + Area area = createAreaFromRectanglesUsingSubtractOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using inverse subtract operator. The + * shape is rendered using horizontal gradient color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testInverseSubtractHorizontalGradiendPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using inverse subtract operator + Area area = createAreaFromRectanglesUsingInverseSubtractOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using intersect operator. The + * shape is rendered using horizontal gradient color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testIntersectHorizontalGradiendPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using intersect operator + Area area = createAreaFromRectanglesUsingIntersectOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** + * Checks the process of creating and rendering new geometric shape + * constructed from two rectangles using XOR operator. The + * shape is rendered using horizontal gradient color paint (fill). + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testXorHorizontalGradiendPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setHorizontalGradientFill(image, graphics); + // create area using XOR operator + Area area = createAreaFromRectanglesUsingXorOperator(image); + // draw the area + graphics.fill(area); + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args From dbhole at redhat.com Tue Sep 13 10:01:24 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 13 Sep 2011 13:01:24 -0400 Subject: IcedTea-Web 1.1.2 released! In-Reply-To: <20110902094718.3b7c5953@workstation64.home> References: <20110831183605.GG14689@redhat.com> <20110902094718.3b7c5953@workstation64.home> Message-ID: <20110913170124.GC3343@redhat.com> * Andreas Radke [2011-09-02 03:47]: > Packages built for ArchLinux. Sadly my issue with my broker application > isn't solved. I'm still thinking this is not caused by the web plugin > but by the jre itself - see my mail to the icedtea 1.10.3 release. > > Anything I can do to give you enough information to fix this? > Hi, Can you please run firefox as ICEDTEAPLUGIN_DEBUG=true firefox 2>&1 | tee console.log And then send me the console.log and ~/.icedtea/log/* files? Please check them to make sure there is nothing confidential in them. Cheers, Deepak From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 10:06:54 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Sep 2011 17:06:54 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #1 from Deepak Bhole 2011-09-13 17:06:54 --- This patch will break distros that don't provide npapi-sdk.pc (e.g. Fedora). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 10:20:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Sep 2011 17:20:17 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #2 from Micha? G?rny 2011-09-13 17:20:17 --- (In reply to comment #1) > This patch will break distros that don't provide npapi-sdk.pc (e.g. Fedora). Will it? Unless I did something terribly wrong, it will just fallback to mozilla-plugin. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 10:31:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Sep 2011 17:31:05 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #3 from Deepak Bhole 2011-09-13 17:31:04 --- Doh. Sorry, my mistake. Your patch is fine. I will propose it to the list. Thanks! -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Tue Sep 13 10:34:49 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 13 Sep 2011 13:34:49 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 Message-ID: <20110913173449.GD3343@redhat.com> Hi, I would like to commit the patch posted for PR782 (after adding changelog): http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 Okay for commit? Cheers, Deepak From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 10:45:51 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Sep 2011 17:45:51 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #4 from Micha? G?rny 2011-09-13 17:45:51 --- I've made today a release tarball off NPAPI 0.26 if you want to check it [1]. [1]:https://github.com/downloads/mgorny/npapi-sdk/npapi-sdk-0.27.tar.bz2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Tue Sep 13 11:26:55 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 13 Sep 2011 14:26:55 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <20110913173449.GD3343@redhat.com> References: <20110913173449.GD3343@redhat.com> Message-ID: <4E6FA06F.3060104@redhat.com> On 09/13/2011 01:34 PM, Deepak Bhole wrote: > Hi, > > I would like to commit the patch posted for PR782 (after adding > changelog): > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 > > Okay for commit? Looks fine to me. Cheers, Omair From omajid at redhat.com Tue Sep 13 13:09:32 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 13 Sep 2011 16:09:32 -0400 Subject: [icedtea-web] RFC: PR618 - Can't install OpenDJ, JavaWebStart fails with Input stream is null error. In-Reply-To: <4DC495C4.7070803@redhat.com> References: <4D3F27BE.9060300@redhat.com> <20110126000318.GF18564@rivendell.middle-earth.co.uk> <4D4095C8.4020603@redhat.com> <4D7E2F47.2050807@redhat.com> <20110316204054.GH29289@rivendell.middle-earth.co.uk> <4D822201.7000906@redhat.com> <4DA878AE.8080301@redhat.com> <20110415205544.GI29287@rivendell.middle-earth.co.uk> <4DA8B3FD.1020002@redhat.com> <20110421215942.GJ29985@rivendell.middle-earth.co.uk> <4DC495C4.7070803@redhat.com> Message-ID: <4E6FB87C.6090003@redhat.com> On 05/06/2011 08:43 PM, Omair Majid wrote: > On 04/21/2011 05:59 PM, Dr Andrew John Hughes wrote: >> On 17:09 Fri 15 Apr , Omair Majid wrote: >>> > On 04/15/2011 04:55 PM, Dr Andrew John Hughes wrote: >>>> > > >>>> > > Can you start a clean thread with the current version of the patch? >>>> > > The previous e-mail was pretty unreadable for me. >>> > >>> > Here you go. Attached. >>> > >>> > As explained earlier, it fixes PR618, buy allowing lazy loading to >>> work >>> > when trying to find resources using getResource(s)/findResource(s). >>> > >>> > Any thoughts or comments? >>> > >>> > Cheers, >>> > Omair > > Updated patch attached. > >> >>> > diff -r 5454292b3fae >>> netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java >>> > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu >>> Mar 10 15:42:01 2011 -0500 >>> > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon >>> Mar 14 11:07:15 2011 -0400 >>> > @@ -40,7 +40,6 @@ >>> > import java.util.List; >>> > import java.util.Map; >>> > import java.util.TreeSet; >>> > -import java.util.Vector; >>> > import java.util.jar.JarEntry; >>> > import java.util.jar.JarFile; >>> > >>> > @@ -1123,31 +1122,54 @@ >>> > /** >>> > * Finds the resource in this, the parent, or the extension >>> > * class loaders. >>> > + * >>> > + * @return aURL for the resource, ornull >>> > + * if the resource could not be found. >>> > */ >>> > - public URL getResource(String name) { >>> > - URL result = super.getResource(name); >>> > + @Override >>> > + public URL findResource(String name) { >>> > + URL result = null; >>> > >>> > - for (int i = 1; i< loaders.length; i++) >>> > - if (result == null) >>> > - result = loaders[i].getResource(name); >>> > + try { >>> > + Enumeration e = findResources(name); >> Just a stylistic thing, but it's usually Enumeration without the >> space. >> > > Fixed. > >>> > + if (e.hasMoreElements()) { >>> > + result = e.nextElement(); >>> > + } >>> > + } catch (IOException e) { >>> > + // continue >> Should we not at least log this if debugging mode is on? > > Done. > >> >>> > + private Enumeration findResourcesBySearching(String name) >>> throws IOException { >>> > + List resources = new ArrayList(); >>> > Enumeration e; >>> > >>> > for (int i = 0; i< loaders.length; i++) { >>> > + // TODO check if this will blow up or not >>> > + // if loaders[1].getResource() is called, wont it call >>> getResource() on >>> > + // the original caller? infinite recursion? >>> > >>> > if (loaders[i] == this) >>> > e = super.findResources(name); >>> > @@ -1166,7 +1188,7 @@ >>> > resources.add(e.nextElement()); >>> > } >>> > >>> > - return resources.elements(); >>> > + return Collections.enumeration(resources); >>> > } >>> > >> Probably asked this last time, but remind why we return an Enumeration >> and not an Iterator when >> resources is a List? > > fineResources, which overrides a method with the same name in > ClassLoader and calls findResourcesBySearching, has to return an > Enumeration. To avoid conversions from an iterator to enumeration, I am > making findResourcesBySearching return an enumeration. I can change it > if you insist. > Ping. From dbhole at redhat.com Tue Sep 13 13:18:00 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 13 Sep 2011 16:18:00 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <4E6FA06F.3060104@redhat.com> References: <20110913173449.GD3343@redhat.com> <4E6FA06F.3060104@redhat.com> Message-ID: <20110913201800.GF3343@redhat.com> * Omair Majid [2011-09-13 14:26]: > On 09/13/2011 01:34 PM, Deepak Bhole wrote: > >Hi, > > > >I would like to commit the patch posted for PR782 (after adding > >changelog): > > > >http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 > > > >Okay for commit? > > Looks fine to me. > Just had a thought.. this might be nice for 1.1 too. It is fairly straightforward. Any objections? Cheers, Deepak From omajid at redhat.com Tue Sep 13 13:29:11 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 13 Sep 2011 16:29:11 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <20110913201800.GF3343@redhat.com> References: <20110913173449.GD3343@redhat.com> <4E6FA06F.3060104@redhat.com> <20110913201800.GF3343@redhat.com> Message-ID: <4E6FBD17.1000506@redhat.com> On 09/13/2011 04:18 PM, Deepak Bhole wrote: > * Omair Majid [2011-09-13 14:26]: >> On 09/13/2011 01:34 PM, Deepak Bhole wrote: >>> Hi, >>> >>> I would like to commit the patch posted for PR782 (after adding >>> changelog): >>> >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 >>> >>> Okay for commit? >> >> Looks fine to me. >> > > Just had a thought.. this might be nice for 1.1 too. It is fairly > straightforward. Any objections? > I think the change looks fine for 1.1. Cheers, Omair From dbhole at icedtea.classpath.org Tue Sep 13 13:50:58 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Tue, 13 Sep 2011 20:50:58 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 418a9e44fce7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=418a9e44fce7 author: Deepak Bhole date: Tue Sep 13 16:19:47 2011 -0400 Fixed formatting issues in previous entry. changeset d2434b3dc395 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d2434b3dc395 author: Deepak Bhole date: Tue Sep 13 16:23:04 2011 -0400 PR782: Support building against npapi-sdk as well Patch from Micha? G?rny < mgorny at gentoo dot org > diffstat: AUTHORS | 1 + ChangeLog | 30 ++++++++++++++++++++---------- NEWS | 1 + acinclude.m4 | 11 +++++++++-- 4 files changed, 31 insertions(+), 12 deletions(-) diffs (82 lines): diff -r 68a6e5d41dfc -r d2434b3dc395 AUTHORS --- a/AUTHORS Thu Sep 01 12:18:55 2011 +0200 +++ b/AUTHORS Tue Sep 13 16:23:04 2011 -0400 @@ -9,6 +9,7 @@ Mark Greenwood Andrew John Hughes Matthias Klose +Micha?? G??rny < mgorny at gentoo.org > Francis Kung Denis Lila DJ Lucas diff -r 68a6e5d41dfc -r d2434b3dc395 ChangeLog --- a/ChangeLog Thu Sep 01 12:18:55 2011 +0200 +++ b/ChangeLog Tue Sep 13 16:23:04 2011 -0400 @@ -1,15 +1,25 @@ +2011-09-13 Deepak Bhole + + PR782: Support building against npapi-sdk as well + Patch from Micha?? G??rny < mgorny at gentoo dot org > + * acinclude.m4: Build against npapi-sdk. + +2011-09-13 Deepak Bhole + + * ChangeLog: Fixed formatting issues in previous entry. + 2011-09-01 Jiri Vanek Added functionality to allow icedtea web to be buildable with - rhel5 libraries. - *configure.ac: added IT_CHECK_GLIB_VERSION check. - *acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test. - version of glib installed and add LEGACY_GLIB define macro into - variable DEFS if version is <2.16. - *plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible - functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB - is defined. Added define sections for use this function instead of glib ones. - Duplicated code moved into function getFirstInTableInstance(GHashTble* table). - *Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation + rhel5 libraries. + * configure.ac: added IT_CHECK_GLIB_VERSION check. + * acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test. + version of glib installed and add LEGACY_GLIB define macro into + variable DEFS if version is <2.16. + * plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible + functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB + is defined. Added define sections for use this function instead of glib ones. + Duplicated code moved into function getFirstInTableInstance(GHashTble* table). + * Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation 2011-08-29 Deepak Bhole diff -r 68a6e5d41dfc -r d2434b3dc395 NEWS --- a/NEWS Thu Sep 01 12:18:55 2011 +0200 +++ b/NEWS Tue Sep 13 16:23:04 2011 -0400 @@ -16,6 +16,7 @@ - PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application * Plugin - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow + - PR782: Support building against npapi-sdk as well - RH718693: MindTerm SSH Applet doesn't work Common - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up diff -r 68a6e5d41dfc -r d2434b3dc395 acinclude.m4 --- a/acinclude.m4 Thu Sep 01 12:18:55 2011 +0200 +++ b/acinclude.m4 Tue Sep 13 16:23:04 2011 -0400 @@ -372,8 +372,15 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) - + PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [ + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[ + # XXX: use NPAPI versions instead + xulrunner_cv_collapsed_version=20000000 + ]) + ], [ + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) + ]) + AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(MOZILLA_LIBS) fi From dbhole at redhat.com Tue Sep 13 13:51:31 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 13 Sep 2011 16:51:31 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <4E6FBD17.1000506@redhat.com> References: <20110913173449.GD3343@redhat.com> <4E6FA06F.3060104@redhat.com> <20110913201800.GF3343@redhat.com> <4E6FBD17.1000506@redhat.com> Message-ID: <20110913205131.GG3343@redhat.com> * Omair Majid [2011-09-13 16:29]: > On 09/13/2011 04:18 PM, Deepak Bhole wrote: > >* Omair Majid [2011-09-13 14:26]: > >>On 09/13/2011 01:34 PM, Deepak Bhole wrote: > >>>Hi, > >>> > >>>I would like to commit the patch posted for PR782 (after adding > >>>changelog): > >>> > >>>http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 > >>> > >>>Okay for commit? > >> > >>Looks fine to me. > >> > > > >Just had a thought.. this might be nice for 1.1 too. It is fairly > >straightforward. Any objections? > > > > I think the change looks fine for 1.1. > Thanks! Pushed to both. Cheers, Deepak From dbhole at icedtea.classpath.org Tue Sep 13 13:51:30 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Tue, 13 Sep 2011 20:51:30 +0000 Subject: /hg/release/icedtea-web-1.1: PR782: Support building against npa... Message-ID: changeset c7b22b085229 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=c7b22b085229 author: Deepak Bhole date: Tue Sep 13 16:23:04 2011 -0400 PR782: Support building against npapi-sdk as well Patch from Micha? G?rny < mgorny at gentoo dot org > diffstat: AUTHORS | 1 + ChangeLog | 6 ++++++ NEWS | 2 ++ acinclude.m4 | 11 +++++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diffs (57 lines): diff -r cea1007c04db -r c7b22b085229 AUTHORS --- a/AUTHORS Wed Aug 31 14:19:03 2011 -0400 +++ b/AUTHORS Tue Sep 13 16:23:04 2011 -0400 @@ -8,6 +8,7 @@ Mark Greenwood Andrew John Hughes Matthias Klose +Micha?? G??rny < mgorny at gentoo.org > Francis Kung DJ Lucas Omair Majid diff -r cea1007c04db -r c7b22b085229 ChangeLog --- a/ChangeLog Wed Aug 31 14:19:03 2011 -0400 +++ b/ChangeLog Tue Sep 13 16:23:04 2011 -0400 @@ -1,3 +1,9 @@ +2011-09-13 Deepak Bhole + + PR782: Support building against npapi-sdk as well + Patch from Micha?? G??rny < mgorny at gentoo dot org > + * acinclude.m4: Build against npapi-sdk. + 2011-08-31 Deepak Bhole * NEWS: Prepare for 1.1.3 diff -r cea1007c04db -r c7b22b085229 NEWS --- a/NEWS Wed Aug 31 14:19:03 2011 -0400 +++ b/NEWS Tue Sep 13 16:23:04 2011 -0400 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.1.3 (2011-XX-XX): +* Plugin + - PR782: Support building against npapi-sdk as well New in release 1.1.2 (2011-08-31): * Plugin diff -r cea1007c04db -r c7b22b085229 acinclude.m4 --- a/acinclude.m4 Wed Aug 31 14:19:03 2011 -0400 +++ b/acinclude.m4 Tue Sep 13 16:23:04 2011 -0400 @@ -372,8 +372,15 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) - + PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [ + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[ + # XXX: use NPAPI versions instead + xulrunner_cv_collapsed_version=20000000 + ]) + ], [ + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) + ]) + AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(MOZILLA_LIBS) fi From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 13:53:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Sep 2011 20:53:29 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #5 from Deepak Bhole 2011-09-13 20:53:29 --- Thanks for the patch. I tested it with mozilla-plugin.pc and with npapi-sdk. Everything seems to be fine. Committed to 1.1 and HEAD: http://icedtea.classpath.org/hg/icedtea-web/rev/d2434b3dc395 http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/c7b22b085229 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Tue Sep 13 19:06:25 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 14 Sep 2011 03:06:25 +0100 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <20110913173449.GD3343@redhat.com> References: <20110913173449.GD3343@redhat.com> Message-ID: <20110914020625.GD26666@rivendell.middle-earth.co.uk> On 13:34 Tue 13 Sep , Deepak Bhole wrote: > Hi, > > I would like to commit the patch posted for PR782 (after adding > changelog): > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 > > Okay for commit? > > Cheers, > Deepak In future, please attach the patch for review rather than relying on external resources. -- 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: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Tue Sep 13 23:59:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Sep 2011 06:59:29 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #6 from Micha? G?rny 2011-09-14 06:59:29 --- Should I try to simplify version handling as well? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Wed Sep 14 04:22:09 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 14 Sep 2011 11:22:09 +0000 Subject: /hg/gfx-test: New test suite containing (ATM) four test cases Message-ID: changeset 13ab5ae3881b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=13ab5ae3881b author: Pavel Tisnovsky date: Wed Sep 14 13:24:03 2011 +0200 New test suite containing (ATM) four test cases src/org/gfxtest/testsuites/Areas.java. Added new graphics primitive type to a src/org/gfxtest/framework/annotations/GraphicsPrimitives.java. Added annotation for graphics primitive used for rendering src/org/gfxtest/testsuites/CAGOperationsOnCircles.java. Added annotation for graphics primitive used for rendering src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java. diffstat: ChangeLog | 14 + Makefile | 2 + src/org/gfxtest/framework/annotations/GraphicsPrimitives.java | 5 + src/org/gfxtest/testsuites/Areas.java | 347 ++++++++++ src/org/gfxtest/testsuites/CAGOperationsOnCircles.java | 1 + src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java | 1 + 6 files changed, 370 insertions(+), 0 deletions(-) diffs (426 lines): diff -r 3e4f4c420eba -r 13ab5ae3881b ChangeLog --- a/ChangeLog Tue Sep 13 15:13:33 2011 +0200 +++ b/ChangeLog Wed Sep 14 13:24:03 2011 +0200 @@ -1,3 +1,17 @@ +2011-09-14 Pavel Tisnovsky + + * Makefile: added new class to compile + * src/org/gfxtest/testsuites/Areas.java: + New test suite containing (ATM) four test cases. + * src/org/gfxtest/framework/annotations/GraphicsPrimitives.java: + Added new graphics primitive type. + * src/org/gfxtest/testsuites/CAGOperationsOnCircles.java: + Added annotation for graphics primitive used for rendering + (@GraphicsPrimitive(GraphicsPrimitives.AREA). + * src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java: + Added annotation for graphics primitive used for rendering + (@GraphicsPrimitive(GraphicsPrimitives.AREA). + 2011-09-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java: diff -r 3e4f4c420eba -r 13ab5ae3881b Makefile --- a/Makefile Tue Sep 13 15:13:33 2011 +0200 +++ b/Makefile Wed Sep 14 13:24:03 2011 +0200 @@ -96,6 +96,7 @@ $(CLASSES)/$(HARNESS)/MainWindow.class TESTSUITE_CLASSES = \ + $(CLASSES)/$(TESTSUITE_DIR)/Areas.class \ $(CLASSES)/$(TESTSUITE_DIR)/AALines.class \ $(CLASSES)/$(TESTSUITE_DIR)/BlankImage.class \ $(CLASSES)/$(TESTSUITE_DIR)/ColorPaint.class \ @@ -138,6 +139,7 @@ $(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnRectangles.class COMPARE_RESULTS = \ + $(RESULTS)/Areas \ $(RESULTS)/AALines \ $(RESULTS)/BlankImage \ $(RESULTS)/ColorPaint \ diff -r 3e4f4c420eba -r 13ab5ae3881b src/org/gfxtest/framework/annotations/GraphicsPrimitives.java --- a/src/org/gfxtest/framework/annotations/GraphicsPrimitives.java Tue Sep 13 15:13:33 2011 +0200 +++ b/src/org/gfxtest/framework/annotations/GraphicsPrimitives.java Wed Sep 14 13:24:03 2011 +0200 @@ -115,4 +115,9 @@ * Generic path consisting of line segments, quadratic curves and cubic curves. */ PATH, + + /** + * Generic area, ie. closed shape. + */ + AREA, } diff -r 3e4f4c420eba -r 13ab5ae3881b src/org/gfxtest/testsuites/Areas.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/Areas.java Wed Sep 14 13:24:03 2011 +0200 @@ -0,0 +1,347 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + + + +import java.awt.Graphics2D; +import java.awt.geom.Area; +import java.awt.geom.CubicCurve2D; +import java.awt.geom.QuadCurve2D; + + + +import org.gfxtest.framework.*; +import org.gfxtest.framework.annotations.*; + + + +/** + * This test checks the process of creating and rendering new geometric shapes + * represented by an Area class. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.AREA) + at RenderStyle(RenderStyles.FILL) + at Transformation(Transformations.NONE) + at Zoom(1) +public class Areas extends GfxTest +{ + /** + * Default Y offset of curve end points. + */ + private static final int DEFAULT_Y_OFFSET = 40; + + /** + * Draw crosses at the both end points and control point of quadratic curve. + * + * @param image + * image to which line is to be drawn + * @param graphics + * graphics canvas + */ + private void drawCrossesAtQuadraticCurveControlPoints(TestImage image, Graphics2D graphics) + { + // calculate image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + + // get curve coordinates + int x1 = computeX1forQuadraticCurve(width); + int y1 = computeY1forQuadraticCurve(); + int x2 = computeX2forQuadraticCurve(width); + int y2 = computeY2forQuadraticCurve(height); + int x3 = computeX3forQuadraticCurve(width); + int y3 = computeY3forQuadraticCurve(); + + // draw all three crosses + drawCross(graphics, x1, y1); + drawCross(graphics, x2, y2); + drawCross(graphics, x3, y3); + } + + /** + * Draw crosses at the both end points and both control point of cubic + * curve. + * + * @param image + * image to which line is to be drawn + * @param graphics + * graphics canvas + */ + private void drawCrossesAtCubicCurveControlPoints(TestImage image, Graphics2D graphics) + { + // construct point set which consists of all four curve control points + CubicCurvePointSet pointSet = new CubicCurvePointSet(image); + + // fill in arrays containing coordinates for all cubic curve control points + int[] x = pointSet.getXPointArray(); + int[] y = pointSet.getYPointArray(); + + // draw all four crosses + for (int i = 0; i < 4; i++) + { + drawCross(graphics, x[i], y[i]); + } + } + + /** + * Create area from the open quadratic curve. + * + * @param image + * image to which area is to be drawn + * @return area created from open quadratic curve. + */ + private Area createAreaFromQuadraticCurve(TestImage image) + { + // calculate image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + + // get curve coordinates + int x1 = computeX1forQuadraticCurve(width); + int y1 = computeY1forQuadraticCurve(); + int x2 = computeX2forQuadraticCurve(width); + int y2 = computeY2forQuadraticCurve(height); + int x3 = computeX3forQuadraticCurve(width); + int y3 = computeY3forQuadraticCurve(); + + // create open quadratic curve + QuadCurve2D curve = new QuadCurve2D.Double(x1, y1, x2, y2, x3, y3); + return new Area(curve); + } + + /** + * Create area from the open cubic curve. + * + * @param image + * image to which area is to be drawn + * @return area created from open cubic curve. + */ + private Area createAreaFromCubicCurve(TestImage image) + { + // construct point set which consists of all four curve control points + CubicCurvePointSet pointSet = new CubicCurvePointSet(image); + + // fill in arrays containing coordinates for all cubic curve control points + int[] x = pointSet.getXPointArray(); + int[] y = pointSet.getYPointArray(); + + // create open cubic curve + CubicCurve2D curve = new CubicCurve2D.Double(); + curve.setCurve(x[0], y[0], x[1], y[1], x[2], y[2], x[3], y[3]); + return new Area(curve); + } + + /** + * Compute X coordinate of first curve end point. + * + * @param width + * canvas width + * @return X coordinate of first curve end point. + */ + private int computeX1forQuadraticCurve(int width) + { + return width >> 2; + } + + /** + * Compute X coordinate of curve control point. + * + * @param width + * canvas width + * @return X coordinate of curve control point. + */ + private int computeX2forQuadraticCurve(int width) + { + return width >> 1; + } + + /** + * Compute X coordinate of second curve end point. + * + * @param width + * canvas width + * @return X coordinate of second curve end point. + */ + private int computeX3forQuadraticCurve(int width) + { + return width * 3 / 4; + } + + /** + * Compute Y coordinate of first curve end point. + * + * @return Y coordinate of first curve end point. + */ + private int computeY1forQuadraticCurve() + { + return DEFAULT_Y_OFFSET; + } + + /** + * Compute Y coordinate of curve control point. + * + * @param height + * canvas height + * @return Y coordinate of curve control point. + */ + private int computeY2forQuadraticCurve(int height) + { + return height - DEFAULT_Y_OFFSET; + } + + /** + * Compute Y coordinate of second curve end point. + * + * @return Y coordinate of second curve end point. + */ + private int computeY3forQuadraticCurve() + { + return DEFAULT_Y_OFFSET; + } + + /** + * Test the result of creating area using an opened quadratic curve. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testQuadraticCurveStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area from open quadratic curve + Area area = createAreaFromQuadraticCurve(image); + // draw the area + graphics.draw(area); + // draw crosses at control points + drawCrossesAtQuadraticCurveControlPoints(image, graphics); + return TestResult.PASSED; + } + + /** + * Test the result of creating area using an opened quadratic curve. + * + * @param image + * image to which area is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testQuadraticCurveColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area from open quadratic curve + Area area = createAreaFromQuadraticCurve(image); + // draw the area + graphics.fill(area); + // draw crosses at control points + drawCrossesAtQuadraticCurveControlPoints(image, graphics); + return TestResult.PASSED; + } + + /** + * Test the result of creating area using an opened cubic curve. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCubicCurveStrokePaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // create area from open cubic curve + Area area = createAreaFromCubicCurve(image); + // draw the area + graphics.draw(area); + // draw crosses at control points + drawCrossesAtCubicCurveControlPoints(image, graphics); + return TestResult.PASSED; + } + + /** + * Test the result of creating area using an opened cubic curve. + * + * @param image + * image to which area is to be drawn + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCubicCurveColorPaint(TestImage image, Graphics2D graphics) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics); + // set fill color + CommonRenderingStyles.setFillColor(graphics); + // create area from open cubic curve + Area area = createAreaFromCubicCurve(image); + // draw the area + graphics.fill(area); + // draw crosses at control points + drawCrossesAtCubicCurveControlPoints(image, graphics); + return TestResult.PASSED; + } + + /** + * Entry point to the test suite. + * + * @param args + * not used in this case + */ + public static void main(String[] args) + { + new Areas().runTestSuite(args); + } + +} diff -r 3e4f4c420eba -r 13ab5ae3881b src/org/gfxtest/testsuites/CAGOperationsOnCircles.java --- a/src/org/gfxtest/testsuites/CAGOperationsOnCircles.java Tue Sep 13 15:13:33 2011 +0200 +++ b/src/org/gfxtest/testsuites/CAGOperationsOnCircles.java Wed Sep 14 13:24:03 2011 +0200 @@ -60,6 +60,7 @@ * @author Pavel Tisnovsky */ @TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.AREA) @RenderStyle(RenderStyles.FILL) @Transformation(Transformations.NONE) @Zoom(1) diff -r 3e4f4c420eba -r 13ab5ae3881b src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java --- a/src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java Tue Sep 13 15:13:33 2011 +0200 +++ b/src/org/gfxtest/testsuites/CAGOperationsOnRectangles.java Wed Sep 14 13:24:03 2011 +0200 @@ -62,6 +62,7 @@ * @author Pavel Tisnovsky */ @TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.AREA) @RenderStyle(RenderStyles.FILL) @Transformation(Transformations.NONE) @Zoom(1) From bugzilla-daemon at icedtea.classpath.org Wed Sep 14 10:50:01 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Sep 2011 17:50:01 +0000 Subject: [Bug 782] Please support building against npapi-sdk as well In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 --- Comment #7 from Deepak Bhole 2011-09-14 17:50:01 --- Sure! Any improvements are more than welcome :) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Wed Sep 14 11:06:16 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 14 Sep 2011 14:06:16 -0400 Subject: [icedtea-web] RFC: Commit of posted patch for PR782 In-Reply-To: <20110914020625.GD26666@rivendell.middle-earth.co.uk> References: <20110913173449.GD3343@redhat.com> <20110914020625.GD26666@rivendell.middle-earth.co.uk> Message-ID: <20110914180615.GI3343@redhat.com> * Dr Andrew John Hughes [2011-09-13 22:06]: > On 13:34 Tue 13 Sep , Deepak Bhole wrote: > > Hi, > > > > I would like to commit the patch posted for PR782 (after adding > > changelog): > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=782 > > > > Okay for commit? > > > > Cheers, > > Deepak > > In future, please attach the patch for review rather than relying on > external resources. Fair enough. Will do! Cheers, Deepak From dbhole at redhat.com Wed Sep 14 11:31:25 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 14 Sep 2011 14:31:25 -0400 Subject: [icedtea-web][rfc] make current reproducers more verbose In-Reply-To: <4E6E4FA7.2040408@redhat.com> References: <4E6E4878.7040409@redhat.com> <20110912180917.GE18298@redhat.com> <4E6E4FA7.2040408@redhat.com> Message-ID: <20110914183125.GJ3343@redhat.com> * Jiri Vanek [2011-09-12 14:28]: > On 09/12/2011 08:09 PM, Deepak Bhole wrote: > >* Jiri Vanek [2011-09-12 14:07]: > >>2011-09-12 Jiri Vanek > >> * tests/jnlp_tests/: all current reproducers (AccessClassInPackage > >> AddShutdownHook AllStackTraces CreateClassLoader deadlocktest > >> ReadEnvironment ReadProperties RedirectStreams ReplaceSecurityManager > >> SetContextClassLoader simpletest1 simpletest2) junit's asserts are enchanted > >> for reason, so junit assertion exception message is much clearer. > > > >Hi Jiri, > > > >What issue does this fix? How do I reproduce it? > > > >Cheers, > >Deepak > > > > It fixs "nothing". But when something goes wrong you will be informed instead of standart "assertion error". > You can reproduce behaviour when you will break some reproducer (but keep it compilable). > I got to troubles here when I wrote scripts for including icedtea-web into daily report and I simulated failures - it was quite digging to find what and why got wrong. Now it is much easier. > > Thanx for looking into it! Ah thanks. I can see the difference with and without the patch. Looks fine to me. One minor nitpick .. the ChangeLog entry needs a newline between the header and the next line. i.e.: ---- 2011-09-12 Jiri Vanek * tests/jnlp_tests/: all current reproducers ... ---- to ---- 2011-09-12 Jiri Vanek * tests/jnlp_tests/: all current reproducers ... ---- After above change, OK for HEAD. Cheers, Deepak From ptisnovs at icedtea.classpath.org Thu Sep 15 02:44:52 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 15 Sep 2011 09:44:52 +0000 Subject: /hg/gfx-test: Added 24 new tests for a total of 40 tests in the ... Message-ID: changeset eb9f92bf70f5 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=eb9f92bf70f5 author: Pavel Tisnovsky date: Thu Sep 15 11:46:42 2011 +0200 Added 24 new tests for a total of 40 tests in the test suite src/org/gfxtest/testsuites/CAGOperationsOnCircles.java diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/CAGOperationsOnCircles.java | 694 +++++++++++++++- 2 files changed, 640 insertions(+), 59 deletions(-) diffs (truncated from 912 to 500 lines): diff -r 13ab5ae3881b -r eb9f92bf70f5 ChangeLog --- a/ChangeLog Wed Sep 14 13:24:03 2011 +0200 +++ b/ChangeLog Thu Sep 15 11:46:42 2011 +0200 @@ -1,3 +1,8 @@ +2011-09-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/CAGOperationsOnCircles.java: + Added 24 new tests for a total of 40 tests in this test suite. + 2011-09-14 Pavel Tisnovsky