From jvanek at redhat.com Wed May 1 05:06:18 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 01 May 2013 14:06:18 +0200 Subject: [rfc][icedtea-web] AWTHelper small modification In-Reply-To: <1367337872.6039.22.camel@jana-2-174.nrt.redhat.com> References: <1367337872.6039.22.camel@jana-2-174.nrt.redhat.com> Message-ID: <5181053A.6040702@redhat.com> On 04/30/2013 06:04 PM, Jana Fabrikova wrote: > Hello, I am sending only a small modification to the file AWTHelper, > part of AWTFramework, in dealing with an initialisation string (it can > be null or given), > thanks for any comments, > Jana > > > ChangeLog: > > 2013-04-30 Jana Fabrikova > > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > modifying the (charrReaded) method > > > modifying_AWTHelper_null_initStr.patch > Hmm this does not seems to be correct. a) This should allow awt helper to work with null "magic string" b) this should allow awt helper to run without need of magic string. The (a) looks nearly ok, but I'm confused by initStrGiven variable. It jus disappeared from condition. So it is not needed any more? Then please remove it. Or have it just slipped from condition accidentally? for (b) I'm not sure if it is enough - is it? > > diff -r 3fa3d0fdce30 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 11:31:28 2013 -0400 > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 18:00:55 2013 +0200 > @@ -60,7 +60,7 @@ > public abstract class AWTHelper extends RulesFolowingClosingListener implements Runnable{ > > //attributes possibly set by user > - private String initStr = ""; > + private String initStr = null; > private Color appletColor; > private BufferedImage marker; > private Point markerPosition; > @@ -171,6 +171,7 @@ > } catch (IOException e) { > throw new RuntimeException("AWTHelper could not read marker.png.",e); > } > + > > this.appletWidth = appletWidth; > this.appletHeight = appletHeight; > @@ -206,7 +207,7 @@ > public void charReaded(char ch) { > sb.append(ch); > //is applet ready to start clicking? > - if (initStrGiven&& !actionStarted&& appletIsReady(sb.toString())) { > + if ((initStr != null)&& !actionStarted&& appletIsReady(sb.toString())) { also pelase keep code according to rules - spaces on both sides of logical operators > try{ > actionStarted = true; > this.findAndActivateApplet(); Thank you for keeping teh awt helper classes more usable - it was not possible without second person to try it. Thank you J. From jvanek at redhat.com Wed May 1 05:19:38 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 01 May 2013 14:19:38 +0200 Subject: [rfc][icedtea-web] Remove wrongly 'undummied' JSObject->Java array code from MethodOverloadResolver In-Reply-To: <517EC6CA.3050701@redhat.com> References: <517EC6CA.3050701@redhat.com> Message-ID: <5181085A.3070106@redhat.com> On 04/29/2013 09:15 PM, Adam Domurad wrote: > So part of what motivated me to rewrite the old MethodOverloadResolver was the fact that I noticed it had a dummy JSObject defined at the bottom of the code, and it was mistakenly using that. It puzzled me why this wasn't observable. Well, it seems it is because the only code path that relied on JSObject itself was incorrect. > > Thanks to Jana for the thorough tests that caught this! > It looks like we do not support conversion of JSObject to a Java array in method signatures. This will bring the code back to its old functionality. > > There is a want for the real fix, but I think we should do a fix in a separate step. > Looks mostly corect. Will the tests need some fixes? > Happy hacking, > -Adam > > > remove-incorrect-method-overload-resolver-code.patch > > > diff --git a/ChangeLog b/ChangeLog > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,9 @@ > +2013-04-29 Adam Domurad > + > + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java > + (getCostAndCastedObject): Remove code that had no effect before refactoring. > + (getBestOverloadMatch): Move debug-only code to debug if-block. > + > 2013-04-29 Jiri Vanek > > More granular initialization of AwtHelper > diff --git a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java > --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java > +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java > @@ -44,8 +44,6 @@ import java.util.ArrayList; > import java.util.Arrays; > import java.util.List; > > -import netscape.javascript.JSObject; > - > /* > * This class resolved overloaded methods in Java objects using a cost > * based-approach described here: > @@ -65,7 +63,6 @@ public class MethodOverloadResolver { > static final int CLASS_SUPERCLASS_COST = 6; > > static final int CLASS_STRING_COST = 7; > - static final int JSOBJECT_TO_ARRAY_COST = CLASS_STRING_COST; > static final int ARRAY_CAST_COST = 8; > > /* A method signature with its casted parameters > @@ -198,10 +195,10 @@ public class MethodOverloadResolver { > > castedArgs[i] = castedObj; > > - Class castedObjClass = castedObj == null ? null : castedObj.getClass(); > - boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); > + if (PluginDebug.DEBUG) { /* avoid toString if not needed */ > + Class castedObjClass = castedObj == null ? null : castedObj.getClass(); > + boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); > > - if (PluginDebug.DEBUG) { /* avoid toString if not needed */ > PluginDebug.debug("Param " + i + " of method " + candidate > + " has cost " + weightedCast.getCost() > + " original param type " + suppliedParamClass > @@ -340,12 +337,6 @@ public class MethodOverloadResolver { > return new WeightedCast(CLASS_STRING_COST, suppliedParam.toString()); > } > > - // JSObject to Java array > - if (suppliedParam instanceof JSObject > -&& paramTypeClass.isArray()) { > - return new WeightedCast(JSOBJECT_TO_ARRAY_COST, suppliedParam); Just idea - what about throwing notyetImplementedException here? > - } > - > return null; > } > J. From jvanek at redhat.com Wed May 1 06:02:34 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 01 May 2013 15:02:34 +0200 Subject: [rfc][icedtea-web] Makefile.am modification for AWTFramework, defaultIcon In-Reply-To: <1367336589.6039.18.camel@jana-2-174.nrt.redhat.com> References: <1367336589.6039.18.camel@jana-2-174.nrt.redhat.com> Message-ID: <5181126A.3090702@redhat.com> On 04/30/2013 05:43 PM, Jana Fabrikova wrote: > Hi, > please see the attached patch with modifications to Makefile and several > files in AWTFramework with which the default icon file (marker.png also > attached) will be present in ...awt/imagesearch and test-extensions > srcdir will be on the classpath, > > cheers, > Jana > > ChangeLog: > > 2013-04-30 Jana Fabrikova dont forget to change the date;) The explanation why this patch is needed is necessary. Everyone who was not during our 1to1 discusiion maybe confused > > * Makefile.am: > test/test-extensions added on classpath for reproducers, unit > tests and code coverage tests maybe little bitmore of explanation and aspecially enumerate teh affected targets please. > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > modifying the constructor, the default icon is taken from > ComponentFinder instead of loading from file > * > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: > added a block of initialization code - the default icon > * > tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > unit test for the initialization code in ComponentFinder * > tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: > second copy of the default icon in a reproducer with resources only > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: > jnlp file for displaying the applet > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: > the applet > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: > adding 6 testcases testing clicking with different mouse > buttons on the applet > * > tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > unit test for the initialization code in ComponentFinder > * > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: > first copy of the default icon, will be on classpath > > > > marker.png > > > > modifying_makefile_defaultIcon.patch > > > diff -r e34db561b7b9 Makefile.am > --- a/Makefile.am Mon Apr 29 16:24:37 2013 +0200 > +++ b/Makefile.am Tue Apr 30 17:20:33 2013 +0200 > @@ -788,7 +788,7 @@ > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > -d $(TEST_EXTENSIONS_TESTS_DIR) \ > -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ > - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \ > + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ This line is irrelevant, is it? If so, please remove from chnageset. > done ; \ > done ; \ > mkdir -p stamps&& \ > @@ -843,7 +843,7 @@ > $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp > cd $(TEST_EXTENSIONS_DIR) ; \ > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ > $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > if WITH_XSLTPROC > @@ -1021,7 +1021,7 @@ > done ; \ > cd $(NETX_UNIT_TEST_DIR) ; \ > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ > $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > if WITH_XSLTPROC > -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html > @@ -1057,6 +1057,7 @@ > -cp $(BOOT_DIR)/jre/lib/resources.jar \ > -cp $(RHINO_RUNTIME) \ > -cp $(TEST_EXTENSIONS_DIR) \ > + -cp $(TEST_EXTENSIONS_SRCDIR) \ > -cp . \ > -ix "-org.junit.*" \ > -ix "-junit.*" \ > @@ -1101,7 +1102,7 @@ > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ > done ;\ > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):. \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ > for file in $(EMMA_MODIFIED_FILES) ; do \ > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ > @@ -1171,6 +1172,7 @@ > -cp $(BOOT_DIR)/jre/lib/resources.jar \ > -cp $(RHINO_RUNTIME) \ > -cp . \ > + -cp $(TEST_EXTENSIONS_SRCDIR) \ > -cp $(TEST_EXTENSIONS_TESTS_DIR) \ > -ix "-org.junit.*" \ > -ix "-junit.*" \ > @@ -1274,7 +1276,7 @@ > done ; \ > cd $(TEST_EXTENSIONS_DIR) ; \ > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR) \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \ > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ > if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \ Isn't there missing one case? should be six of them - run unittests, run reproducers, run unittest with emma, with jacoco, run reproducers with emma and with jacoco. > diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 > @@ -0,0 +1,56 @@ > +/* ComponentFinderTest.java > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.awt.imagesearch; > + > +import java.awt.image.BufferedImage; > +import org.junit.Assert; > +import org.junit.Test; > + > +/** > + * > + * This class is a part of AWTFramework, contains component finding > + * by searching for icons. > + * > + */ > +public class ComponentFinderTest { > + > + @Test > + public void initialiseDefaultIcon() { > + BufferedImage icon = ComponentFinder.defaultIcon; > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); > + } > +} > diff -r e34db561b7b9 tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png > Binary file tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png has changed > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp Tue Apr 30 17:20:33 2013 +0200 > @@ -0,0 +1,57 @@ > + > + > + > + > +AWTRobot usage sample > +IcedTea > + > +AWTRobot usage sample > + > + > + > + > + > + > + + name="AWTRobot usage sample" > + main-class="JavawsAWTRobotUsageSample" > + width="400" > + height="400"> > + > + > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java Tue Apr 30 17:20:33 2013 +0200 > @@ -0,0 +1,176 @@ > +/* JavawsAWTRobotUsageSample.java > +Copyright (C) 2012 Red Hat, Inc. > + > +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, version 2. > + > +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. > + */ > + > +import java.applet.Applet; > +import java.awt.Graphics; > +import java.awt.Color; > +import java.awt.Image; > +import java.awt.Panel; > +import java.awt.Button; > +import java.awt.Dimension; > +import java.awt.event.MouseEvent; > +import java.awt.event.MouseListener; > +import java.awt.event.MouseMotionListener; > + > +public class JavawsAWTRobotUsageSample extends Applet { > + > + private static final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; > + public static final String iconFile = "marker.png"; > + > + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > + > + public Image img; > + public Panel panel; > + > + public void init(){ > + img = getImage(getCodeBase(), iconFile); > + > + createGUI(); > + > + writeAppletInitialized(); > + } > + > + //this method should be called by the extending applet > + //when the whole gui is ready > + public void writeAppletInitialized(){ > + System.out.println(initStr); > + } > + > + //paint the icon in upper left corner > + @Override public void paint(Graphics g){ > + int width = 32; > + int height = 32; > + int x = 0; > + int y = 0; > + g.drawImage(img, x, y, width, height, this); > + super.paint(g); > + } > + > + private Button createButton(String label, Color color) { > + Button b = new Button(label); > + b.setBackground(color); > + b.setPreferredSize(new Dimension(100, 50)); > + return b; > + } > + > + // sets background of the applet and adds the panel with one button > + private void createGUI() { > + setBackground(APPLET_COLOR); > + > + panel = new Panel(); > + panel.setBounds(33,33,267,267); > + > + Button b = createButton("", BUTTON_COLOR1); > + > + b.addMouseMotionListener(new MouseMotionListener() { > + public void mouseDragged(MouseEvent e) { > + System.out.println("mouseDragged"); > + } > + > + public void mouseMoved(MouseEvent e) { > + System.out.println("mouseMoved"); > + } > + }); > + > + b.addMouseListener(new MouseListener() { > + > + public void mouseClicked(MouseEvent e) { > + // figure out which mouse button is pressed > + switch (e.getButton()) { > + case MouseEvent.BUTTON1: > + System.out.println("mouseClickedButton1"); > + break; > + case MouseEvent.BUTTON2: > + System.out.println("mouseClickedButton2"); > + break; > + case MouseEvent.BUTTON3: > + System.out.println("mouseClickedButton3"); > + break; > + default: > + break; > + } > + } > + > + public void mouseEntered(MouseEvent e) { > + System.out.println("mouseEntered"); > + } > + > + public void mouseExited(MouseEvent e) { > + System.out.println("mouseExited"); > + } > + > + public void mousePressed(MouseEvent e) { > + // figure out which mouse button is pressed > + switch (e.getButton()) { > + case MouseEvent.BUTTON1: > + System.out.println("mousePressedButton1"); > + break; > + case MouseEvent.BUTTON2: > + System.out.println("mousePressedButton2"); > + break; > + case MouseEvent.BUTTON3: > + System.out.println("mousePressedButton3"); > + break; > + default: > + break; > + } > + } > + > + public void mouseReleased(MouseEvent e) { > + // figure out which mouse button was pressed > + switch (e.getButton()) { > + case MouseEvent.BUTTON1: > + System.out.println("mouseReleasedButton1"); > + break; > + case MouseEvent.BUTTON2: > + System.out.println("mouseReleasedButton2"); > + break; > + case MouseEvent.BUTTON3: > + System.out.println("mouseReleasedButton3"); > + break; > + default: > + break; > + } > + } > + }); > + > + panel.add(b); > + > + this.add(panel); > + } > +} > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Tue Apr 30 17:20:33 2013 +0200 > @@ -0,0 +1,248 @@ > +/* JavawsAWTRobotUsageSampleTest.java > +Copyright (C) 2012 Red Hat, Inc. > + > +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, version 2. > + > +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. > + */ > + > +import java.awt.Color; > +import java.awt.event.InputEvent; > +import java.awt.image.BufferedImage; > +import java.io.File; > +import java.io.IOException; > + > +import javax.imageio.ImageIO; > + > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.awt.AWTFrameworkException; > +import net.sourceforge.jnlp.awt.AWTHelper; > +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.closinglisteners.Rule; > + > +import org.junit.Assert; > +import org.junit.Test; > + > +public class JavawsAWTRobotUsageSampleTest extends BrowserTest { > + > + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; > + > + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > + > + private abstract class AWTHelperImpl extends AWTHelper{ > + > + public AWTHelperImpl() { > + super(initStr, 400, 400); > + > + this.setAppletColor(APPLET_COLOR); > + } > + > + } > + > + private class AWTHelperImpl_EnterExit extends AWTHelperImpl { > + > + @Override > + public void run() { > + // move mouse into the button area and out > + try { > + moveToMiddleOfColoredRectangle(BUTTON_COLOR1); > + moveOutsideColoredRectangle(BUTTON_COLOR1); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{ > + > + @Override > + public void run() { > + // click in the middle of the button > + > + try { > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON1_MASK); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + private class AWTHelperImpl_MouseClick2 extends AWTHelperImpl{ > + @Override > + public void run() { > + // move mouse in the middle of the button and click 2nd > + // button > + try { > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON2_MASK); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + private class AWTHelperImpl_MouseClick3 extends AWTHelperImpl{ > + @Override > + public void run() { > + // move mouse in the middle of the button and click 3rd > + // button > + try { > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON3_MASK); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + private class AWTHelperImpl_MouseDrag extends AWTHelperImpl{ > + @Override > + public void run() { > + // move into the rectangle, press 1st button, drag out > + try { > + dragFromColoredRectangle(BUTTON_COLOR1); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + private class AWTHelperImpl_MouseMove extends AWTHelperImpl{ > + @Override > + public void run() { > + clickInTheMiddleOfApplet(); > + try { > + moveInsideColoredRectangle(BUTTON_COLOR1); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button not found: "+e.getMessage()); > + } catch (AWTFrameworkException e2){ > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > + } > + } > + } > + > + > + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { > + > + // Assert that the applet was initialized. > + Rule i = helper.getInitStrAsRule(); > + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); > + > + // Assert there are all the test messages from applet > + for (Rule r : helper.getRules() ) { > + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); > + } > + > + } > + > + > + private void appletAWTMouseTest(String url, AWTHelper helper) > + throws Exception { > + > + String strURL = "/" + url; > + > + try { > + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms > + ProcessResult pr = server.executeJavaws(strURL, helper, helper); > + evaluateStdoutContents(pr, helper); > + } finally { > + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms > + } > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_EnterAndExit_Test() throws Exception { > + // display the page, activate applet, move over the button > + AWTHelper helper = new AWTHelperImpl_EnterExit(); > + helper.addClosingRulesFromStringArray(new String[] { "mouseEntered", "mouseExited"}); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_ClickButton1_Test() throws Exception { > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_MouseClick1(); > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton1", "mouseReleasedButton1", "mouseClickedButton1" }); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_ClickButton2_Test() throws Exception { > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_MouseClick2(); > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton2", "mouseReleasedButton2", "mouseClickedButton2" }); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_ClickButton3_Test() throws Exception { > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_MouseClick3(); > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton3", "mouseReleasedButton3", "mouseClickedButton3" }); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_Drag_Test() throws Exception { > + > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_MouseDrag(); > + helper.addClosingRulesFromStringArray(new String[] { "mouseDragged" }); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > + > + @Test > + @NeedsDisplay > + public void AppletAWTMouse_Move_Test() throws Exception { > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_MouseMove(); > + helper.addClosingRulesFromStringArray(new String[] { "mouseMoved" }); > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > + } > +} > diff -r e34db561b7b9 tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 > @@ -0,0 +1,56 @@ > +/* ComponentFinderTest.java > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.awt.imagesearch; > + > +import java.awt.image.BufferedImage; > +import org.junit.Assert; > +import org.junit.Test; > + > +/** > + * > + * This class is a part of AWTFramework, contains component finding > + * by searching for icons. > + * > + */ > +public class ComponentFinderTest { > + > + @Test > + public void initialiseDefaultIcon() { > + BufferedImage icon = ComponentFinder.defaultIcon; > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); > + } > +} > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 16:24:37 2013 +0200 > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 17:20:33 2013 +0200 > @@ -164,13 +164,9 @@ > > String test_server_dir_path = System.getProperty("test.server.dir"); > > - try { > - this.marker = ImageIO.read(new File(test_server_dir_path + "/marker.png")); > - this.markerPosition = new Point(0,0); > - this.markerGiven = true; > - } catch (IOException e) { > - throw new RuntimeException("AWTHelper could not read marker.png.",e); > - } > + this.marker = ComponentFinder.defaultIcon; > + this.markerPosition = new Point(0,0); > + this.markerGiven = true; > > this.appletWidth = appletWidth; > this.appletHeight = appletHeight; > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 16:24:37 2013 +0200 > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Tue Apr 30 17:20:33 2013 +0200 > @@ -42,8 +42,18 @@ > import java.awt.Point; > import java.awt.Rectangle; > import java.awt.image.BufferedImage; > +import java.io.IOException; > +import javax.imageio.ImageIO; > > public class ComponentFinder { > + public static final BufferedImage defaultIcon; please add empty line here > + static{ > + try { > + defaultIcon = ImageIO.read(ComponentFinder.class.getClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png")); > + } catch (IOException e) { > + throw new RuntimeException("ComponentFinder - problem initializing defaultIcon",e); > + } > + } > > /** > * method findColoredRectangle determines coordinates of a rectangle colored > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png > Binary file tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png has changed Except the (maybe) missing target, looks more then ok to me. J. From adomurad at redhat.com Wed May 1 06:06:23 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 01 May 2013 09:06:23 -0400 Subject: [rfc][icedtea-web] Remove wrongly 'undummied' JSObject->Java array code from MethodOverloadResolver In-Reply-To: <5181085A.3070106@redhat.com> References: <517EC6CA.3050701@redhat.com> <5181085A.3070106@redhat.com> Message-ID: <5181134F.80607@redhat.com> On 05/01/2013 08:19 AM, Jiri Vanek wrote: > On 04/29/2013 09:15 PM, Adam Domurad wrote: >> So part of what motivated me to rewrite the old >> MethodOverloadResolver was the fact that I noticed it had a dummy >> JSObject defined at the bottom of the code, and it was mistakenly >> using that. It puzzled me why this wasn't observable. Well, it seems >> it is because the only code path that relied on JSObject itself was >> incorrect. >> >> Thanks to Jana for the thorough tests that caught this! >> It looks like we do not support conversion of JSObject to a Java >> array in method signatures. This will bring the code back to its old >> functionality. >> >> There is a want for the real fix, but I think we should do a fix in a >> separate step. >> > > Looks mostly corect. Will the tests need some fixes? No -- unfortunately the JSObject related tests are commented don't have the necessary privileges to create a JSObject. >> Happy hacking, >> -Adam >> >> >> remove-incorrect-method-overload-resolver-code.patch >> >> >> diff --git a/ChangeLog b/ChangeLog >> --- a/ChangeLog >> +++ b/ChangeLog >> @@ -1,3 +1,9 @@ >> +2013-04-29 Adam Domurad >> + >> + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >> + (getCostAndCastedObject): Remove code that had no effect before >> refactoring. >> + (getBestOverloadMatch): Move debug-only code to debug if-block. >> + >> 2013-04-29 Jiri Vanek >> >> More granular initialization of AwtHelper >> diff --git >> a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >> b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >> --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >> +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >> @@ -44,8 +44,6 @@ import java.util.ArrayList; >> import java.util.Arrays; >> import java.util.List; >> >> -import netscape.javascript.JSObject; >> - >> /* >> * This class resolved overloaded methods in Java objects using a cost >> * based-approach described here: >> @@ -65,7 +63,6 @@ public class MethodOverloadResolver { >> static final int CLASS_SUPERCLASS_COST = 6; >> >> static final int CLASS_STRING_COST = 7; >> - static final int JSOBJECT_TO_ARRAY_COST = CLASS_STRING_COST; >> static final int ARRAY_CAST_COST = 8; >> >> /* A method signature with its casted parameters >> @@ -198,10 +195,10 @@ public class MethodOverloadResolver { >> >> castedArgs[i] = castedObj; >> >> - Class castedObjClass = castedObj == null ? null >> : castedObj.getClass(); >> - boolean castedObjIsPrim = castedObj == null ? false >> : castedObj.getClass().isPrimitive(); >> + if (PluginDebug.DEBUG) { /* avoid toString if not >> needed */ >> + Class castedObjClass = castedObj == null ? >> null : castedObj.getClass(); >> + boolean castedObjIsPrim = castedObj == null ? >> false : castedObj.getClass().isPrimitive(); >> >> - if (PluginDebug.DEBUG) { /* avoid toString if not >> needed */ >> PluginDebug.debug("Param " + i + " of method " >> + candidate >> + " has cost " + weightedCast.getCost() >> + " original param type " + >> suppliedParamClass >> @@ -340,12 +337,6 @@ public class MethodOverloadResolver { >> return new WeightedCast(CLASS_STRING_COST, >> suppliedParam.toString()); >> } >> >> - // JSObject to Java array >> - if (suppliedParam instanceof JSObject >> -&& paramTypeClass.isArray()) { >> - return new WeightedCast(JSOBJECT_TO_ARRAY_COST, >> suppliedParam); > > Just idea - what about throwing notyetImplementedException here? This would cause the same regression we're seeing. 'null' is the correct value in this case. We don't want to error out if this is an option, we want to pick a different method. I plan to add KnownToFail cases for this, which I think suffices. >> - } >> - >> return null; >> } >> > > J. Thanks, -Adam From jvanek at redhat.com Wed May 1 06:38:59 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 01 May 2013 15:38:59 +0200 Subject: [rfc][icedtea-web] Remove wrongly 'undummied' JSObject->Java array code from MethodOverloadResolver In-Reply-To: <5181134F.80607@redhat.com> References: <517EC6CA.3050701@redhat.com> <5181085A.3070106@redhat.com> <5181134F.80607@redhat.com> Message-ID: <51811AF3.4060707@redhat.com> On 05/01/2013 03:06 PM, Adam Domurad wrote: > On 05/01/2013 08:19 AM, Jiri Vanek wrote: >> On 04/29/2013 09:15 PM, Adam Domurad wrote: >>> So part of what motivated me to rewrite the old MethodOverloadResolver was the fact that I noticed it had a dummy JSObject defined at the bottom of the code, and it was mistakenly using that. It puzzled me why this wasn't observable. Well, it seems it is because the only code path that relied on JSObject itself was incorrect. >>> >>> Thanks to Jana for the thorough tests that caught this! >>> It looks like we do not support conversion of JSObject to a Java array in method signatures. This will bring the code back to its old functionality. >>> >>> There is a want for the real fix, but I think we should do a fix in a separate step. >>> >> >> Looks mostly corect. Will the tests need some fixes? > > No -- unfortunately the JSObject related tests are commented don't have the necessary privileges to create a JSObject. Not even in jana's tests? > >>> Happy hacking, >>> -Adam >>> >>> >>> remove-incorrect-method-overload-resolver-code.patch >>> >>> >>> diff --git a/ChangeLog b/ChangeLog >>> --- a/ChangeLog >>> +++ b/ChangeLog >>> @@ -1,3 +1,9 @@ >>> +2013-04-29 Adam Domurad >>> + >>> + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >>> + (getCostAndCastedObject): Remove code that had no effect before refactoring. >>> + (getBestOverloadMatch): Move debug-only code to debug if-block. >>> + >>> 2013-04-29 Jiri Vanek >>> >>> More granular initialization of AwtHelper >>> diff --git a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >>> --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >>> +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java >>> @@ -44,8 +44,6 @@ import java.util.ArrayList; >>> import java.util.Arrays; >>> import java.util.List; >>> >>> -import netscape.javascript.JSObject; >>> - >>> /* >>> * This class resolved overloaded methods in Java objects using a cost >>> * based-approach described here: >>> @@ -65,7 +63,6 @@ public class MethodOverloadResolver { >>> static final int CLASS_SUPERCLASS_COST = 6; >>> >>> static final int CLASS_STRING_COST = 7; >>> - static final int JSOBJECT_TO_ARRAY_COST = CLASS_STRING_COST; >>> static final int ARRAY_CAST_COST = 8; >>> >>> /* A method signature with its casted parameters >>> @@ -198,10 +195,10 @@ public class MethodOverloadResolver { >>> >>> castedArgs[i] = castedObj; >>> >>> - Class castedObjClass = castedObj == null ? null : castedObj.getClass(); >>> - boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); >>> + if (PluginDebug.DEBUG) { /* avoid toString if not needed */ >>> + Class castedObjClass = castedObj == null ? null : castedObj.getClass(); >>> + boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); >>> >>> - if (PluginDebug.DEBUG) { /* avoid toString if not needed */ >>> PluginDebug.debug("Param " + i + " of method " + candidate >>> + " has cost " + weightedCast.getCost() >>> + " original param type " + suppliedParamClass >>> @@ -340,12 +337,6 @@ public class MethodOverloadResolver { >>> return new WeightedCast(CLASS_STRING_COST, suppliedParam.toString()); >>> } >>> >>> - // JSObject to Java array >>> - if (suppliedParam instanceof JSObject >>> -&& paramTypeClass.isArray()) { >>> - return new WeightedCast(JSOBJECT_TO_ARRAY_COST, suppliedParam); >> >> Just idea - what about throwing notyetImplementedException here? > > This would cause the same regression we're seeing. 'null' is the correct value in this case. We don't want to error out if this is an option, we want to pick a different method. > I plan to add KnownToFail cases for this, which I think suffices. > >>> - } >>> - >>> return null; >>> } >>> >> >> J. ok then. From adomurad at redhat.com Wed May 1 10:03:54 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 01 May 2013 13:03:54 -0400 Subject: [rfc][icedtea-web] Remove wrongly 'undummied' JSObject->Java array code from MethodOverloadResolver In-Reply-To: <51811AF3.4060707@redhat.com> References: <517EC6CA.3050701@redhat.com> <5181085A.3070106@redhat.com> <5181134F.80607@redhat.com> <51811AF3.4060707@redhat.com> Message-ID: <51814AFA.6090704@redhat.com> On 05/01/2013 09:38 AM, Jiri Vanek wrote: > On 05/01/2013 03:06 PM, Adam Domurad wrote: >> On 05/01/2013 08:19 AM, Jiri Vanek wrote: >>> On 04/29/2013 09:15 PM, Adam Domurad wrote: >>>> So part of what motivated me to rewrite the old >>>> MethodOverloadResolver was the fact that I noticed it had a dummy >>>> JSObject defined at the bottom of the code, and it was mistakenly >>>> using that. It puzzled me why this wasn't observable. Well, it >>>> seems it is because the only code path that relied on JSObject >>>> itself was incorrect. >>>> >>>> Thanks to Jana for the thorough tests that caught this! >>>> It looks like we do not support conversion of JSObject to a Java >>>> array in method signatures. This will bring the code back to its >>>> old functionality. >>>> >>>> There is a want for the real fix, but I think we should do a fix in >>>> a separate step. >>>> >>> >>> Looks mostly corect. Will the tests need some fixes? >> >> No -- unfortunately the JSObject related tests are commented don't >> have the necessary privileges to create a JSObject. > > Not even in jana's tests? Oi, I'm a dummy. Current tests are correct, but see below about a few more we could have. I just realized we're not missing this functionality. The C++ function 'createJavaObjectFromVariant' automatically converts JS arrays to Java arrays before passing them. I have attached some additional unit tests. (ChangeLog in patch) However unfortunately I see other fundamental brokenness. It seems we'd need to ask for thie conversion from the Java-side to be sure it is correct. For example: JSObject someField; from Java side applet.someField = [1,1] from Javascript side, You'd expect it to be able to do this (it is a JSObject, after all), but actually it is not possible. This is because it is converted to a String[] array before-hand. As well: Object[] someField; from Java side applet.someField = [{}, 1] Is not possible. You'd expected an array of [JSObject, Integer], but the whole thing is a JSObject. Ignorance is bliss ... These cases do not seem to be handled by the reproducers (but I could be mistaken), some KnownToFail reproducers cases might be nice. Still happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: MethodOverloadResolver-additional-tests.patch Type: text/x-patch Size: 7619 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130501/3a79070e/MethodOverloadResolver-additional-tests.patch From helpcrypto at gmail.com Thu May 2 00:32:34 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Thu, 2 May 2013 09:32:34 +0200 Subject: Upcoming releases of IcedTea-Web 1.2, 1.3, 1.4 In-Reply-To: <517AC48C.6060006@redhat.com> References: <515E921C.2030207@redhat.com> <51659134.8050509@redhat.com> <516E6419.5050409@redhat.com> <517AC48C.6060006@redhat.com> Message-ID: > * Plugin > - PR1198: JSObject is not passed to javascript correctly > This one has caused lot of work, isnt it? (and still causing it) :P People who helped with this release (If I forgot somebody, please let me > know!): > > > Deepak Bhole > Danesh Dadachanji > Adam Domurad > Jana Fabrikova > Peter Hatina > Andrew John Hughes > Matthias Klose > Alexandr Kolouch > Jan Kmetko > Omair Majid > Thomas Meyer > Saad Mohammad > Martin Olsson > Pavel Tisnovsky > Jiri Vanek > Jacob Wisor > > > Special thanks to: > > * Adam Domurad - for deep investigations and fixes in core, and in > numerous classloaders or otherwise complicated bugs > * Jan Kmetko - for initial design of splashscreen > * Deepak Bhole and Omair Majid - for ever keeping an watchful eye on > patches > * to community - namely: > - Jacob Wisor and Alexandr Kolouch - who voluntary offered and > delivered Pl and Cz translation > > REALLY: Thank you all a LOT for doing what you do. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/7b16dc21/attachment.html From jfabriko at redhat.com Thu May 2 00:49:17 2013 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 02 May 2013 09:49:17 +0200 Subject: [rfc][icedtea-web] Makefile.am modification for AWTFramework, defaultIcon In-Reply-To: <5181126A.3090702@redhat.com> References: <1367336589.6039.18.camel@jana-2-174.nrt.redhat.com> <5181126A.3090702@redhat.com> Message-ID: <1367480957.1898.19.camel@jana-2-174.nrt.redhat.com> Hello, thank you for the feedback, I am sending a slightly modified patch and more comments to this change. 1) reason for the modification of the Makefile.am: The AWTFramework may be used to find an application window that is marked by an icon. This icon can be either given as a parameter (BufferedImage) to the specific instance of AWTHelper class, or there is one default icon (marker.png) as a static final attribute of the class ComponentFinder. This icon is loaded from a file, which is placed in the /tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch directory. Therefore the classloader needs to have the directory /tests/test-extensions/ on classpath. 2) yes, there are all 6 needed changes. More descriptive ChangeLog: 2013-05-02 Jana Fabrikova * Makefile.am: the directory $(TEST_EXTENSIONS_SRCDIR) (i.e. test/test-extensions) added on classpath for running reproducers, unit tests, and test code coverage for reproducers and unittests using emma and jacoco, that is for the following 6 targets: (stamps/run-netx-dist-tests.stamp) (stamps/run-netx-unit-tests.stamp) (stamps/run-unit-test-code-coverage.stamp) with EMMA (stamps/run-unit-test-code-coverage-jacoco.stamp) (stamps/run-reproducers-test-code-coverage.stamp) with EMMA (stamps/run-reproducers-test-code-coverage-jacoco.stamp) * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: modifying the constructor, the default icon is taken from ComponentFinder instead of loading from file * tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: added a block of initialization code - the default icon * tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: unit test for the initialization code in ComponentFinder * tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: second copy of the default icon in a reproducer with resources only * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: jnlp file for displaying the applet * tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: the applet * tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: adding 6 testcases testing clicking with different mouse buttons on the applet * tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: unit test for the initialization code in ComponentFinder * tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: first copy of the default icon, will be on classpath On Wed, 2013-05-01 at 15:02 +0200, Jiri Vanek wrote: > On 04/30/2013 05:43 PM, Jana Fabrikova wrote: > > Hi, > > please see the attached patch with modifications to Makefile and several > > files in AWTFramework with which the default icon file (marker.png also > > attached) will be present in ...awt/imagesearch and test-extensions > > srcdir will be on the classpath, > > > > cheers, > > Jana > > > > ChangeLog: > > > > 2013-04-30 Jana Fabrikova > dont forget to change the date;) > > The explanation why this patch is needed is necessary. Everyone who was not during our 1to1 discusiion maybe confused > > > > * Makefile.am: > > test/test-extensions added on classpath for reproducers, unit > > tests and code coverage tests > maybe little bitmore of explanation and aspecially enumerate teh affected targets please. > > > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > > modifying the constructor, the default icon is taken from > > ComponentFinder instead of loading from file > > * > > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: > > added a block of initialization code - the default icon > > * > > tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > > unit test for the initialization code in ComponentFinder * > > tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: > > second copy of the default icon in a reproducer with resources only > > * > > tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: > > jnlp file for displaying the applet > > * > > tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: > > the applet > > * > > tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: > > adding 6 testcases testing clicking with different mouse > > buttons on the applet > > * > > tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > > unit test for the initialization code in ComponentFinder > > * > > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: > > first copy of the default icon, will be on classpath > > > > > > > > marker.png > > > > > > > > modifying_makefile_defaultIcon.patch > > > > > > diff -r e34db561b7b9 Makefile.am > > --- a/Makefile.am Mon Apr 29 16:24:37 2013 +0200 > > +++ b/Makefile.am Tue Apr 30 17:20:33 2013 +0200 > > @@ -788,7 +788,7 @@ > > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > > -d $(TEST_EXTENSIONS_TESTS_DIR) \ > > -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ > > - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \ > > + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ > > This line is irrelevant, is it? If so, please remove from chnageset. > > done ; \ > > done ; \ > > mkdir -p stamps&& \ > > @@ -843,7 +843,7 @@ > > $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp > > cd $(TEST_EXTENSIONS_DIR) ; \ > > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ > > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ > > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ > > $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ > > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > > if WITH_XSLTPROC > > @@ -1021,7 +1021,7 @@ > > done ; \ > > cd $(NETX_UNIT_TEST_DIR) ; \ > > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ > > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ > > $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > > if WITH_XSLTPROC > > -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html > > @@ -1057,6 +1057,7 @@ > > -cp $(BOOT_DIR)/jre/lib/resources.jar \ > > -cp $(RHINO_RUNTIME) \ > > -cp $(TEST_EXTENSIONS_DIR) \ > > + -cp $(TEST_EXTENSIONS_SRCDIR) \ > > -cp . \ > > -ix "-org.junit.*" \ > > -ix "-junit.*" \ > > @@ -1101,7 +1102,7 @@ > > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ > > done ;\ > > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):. \ > > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ > > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ > > for file in $(EMMA_MODIFIED_FILES) ; do \ > > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ > > @@ -1171,6 +1172,7 @@ > > -cp $(BOOT_DIR)/jre/lib/resources.jar \ > > -cp $(RHINO_RUNTIME) \ > > -cp . \ > > + -cp $(TEST_EXTENSIONS_SRCDIR) \ > > -cp $(TEST_EXTENSIONS_TESTS_DIR) \ > > -ix "-org.junit.*" \ > > -ix "-junit.*" \ > > @@ -1274,7 +1276,7 @@ > > done ; \ > > cd $(TEST_EXTENSIONS_DIR) ; \ > > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ > > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR) \ > > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ > > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \ > > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ > > if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \ > > Isn't there missing one case? > > should be six of them - run unittests, run reproducers, run unittest with emma, with jacoco, run reproducers with emma and with jacoco. > > > diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -0,0 +1,56 @@ > > +/* ComponentFinderTest.java > > +Copyright (C) 2013 Red Hat, Inc. > > + > > +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, version 2. > > + > > +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 net.sourceforge.jnlp.awt.imagesearch; > > + > > +import java.awt.image.BufferedImage; > > +import org.junit.Assert; > > +import org.junit.Test; > > + > > +/** > > + * > > + * This class is a part of AWTFramework, contains component finding > > + * by searching for icons. > > + * > > + */ > > +public class ComponentFinderTest { > > + > > + @Test > > + public void initialiseDefaultIcon() { > > + BufferedImage icon = ComponentFinder.defaultIcon; > > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); > > + } > > +} > > diff -r e34db561b7b9 tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png > > Binary file tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png has changed > > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp Tue Apr 30 17:20:33 2013 +0200 > > @@ -0,0 +1,57 @@ > > + > > + > > + > > + > > +AWTRobot usage sample > > +IcedTea > > + > > +AWTRobot usage sample > > + > > + > > + > > + > > + > > + > > + > + name="AWTRobot usage sample" > > + main-class="JavawsAWTRobotUsageSample" > > + width="400" > > + height="400"> > > + > > + > > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -0,0 +1,176 @@ > > +/* JavawsAWTRobotUsageSample.java > > +Copyright (C) 2012 Red Hat, Inc. > > + > > +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, version 2. > > + > > +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. > > + */ > > + > > +import java.applet.Applet; > > +import java.awt.Graphics; > > +import java.awt.Color; > > +import java.awt.Image; > > +import java.awt.Panel; > > +import java.awt.Button; > > +import java.awt.Dimension; > > +import java.awt.event.MouseEvent; > > +import java.awt.event.MouseListener; > > +import java.awt.event.MouseMotionListener; > > + > > +public class JavawsAWTRobotUsageSample extends Applet { > > + > > + private static final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; > > + public static final String iconFile = "marker.png"; > > + > > + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > > + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > > + > > + public Image img; > > + public Panel panel; > > + > > + public void init(){ > > + img = getImage(getCodeBase(), iconFile); > > + > > + createGUI(); > > + > > + writeAppletInitialized(); > > + } > > + > > + //this method should be called by the extending applet > > + //when the whole gui is ready > > + public void writeAppletInitialized(){ > > + System.out.println(initStr); > > + } > > + > > + //paint the icon in upper left corner > > + @Override public void paint(Graphics g){ > > + int width = 32; > > + int height = 32; > > + int x = 0; > > + int y = 0; > > + g.drawImage(img, x, y, width, height, this); > > + super.paint(g); > > + } > > + > > + private Button createButton(String label, Color color) { > > + Button b = new Button(label); > > + b.setBackground(color); > > + b.setPreferredSize(new Dimension(100, 50)); > > + return b; > > + } > > + > > + // sets background of the applet and adds the panel with one button > > + private void createGUI() { > > + setBackground(APPLET_COLOR); > > + > > + panel = new Panel(); > > + panel.setBounds(33,33,267,267); > > + > > + Button b = createButton("", BUTTON_COLOR1); > > + > > + b.addMouseMotionListener(new MouseMotionListener() { > > + public void mouseDragged(MouseEvent e) { > > + System.out.println("mouseDragged"); > > + } > > + > > + public void mouseMoved(MouseEvent e) { > > + System.out.println("mouseMoved"); > > + } > > + }); > > + > > + b.addMouseListener(new MouseListener() { > > + > > + public void mouseClicked(MouseEvent e) { > > + // figure out which mouse button is pressed > > + switch (e.getButton()) { > > + case MouseEvent.BUTTON1: > > + System.out.println("mouseClickedButton1"); > > + break; > > + case MouseEvent.BUTTON2: > > + System.out.println("mouseClickedButton2"); > > + break; > > + case MouseEvent.BUTTON3: > > + System.out.println("mouseClickedButton3"); > > + break; > > + default: > > + break; > > + } > > + } > > + > > + public void mouseEntered(MouseEvent e) { > > + System.out.println("mouseEntered"); > > + } > > + > > + public void mouseExited(MouseEvent e) { > > + System.out.println("mouseExited"); > > + } > > + > > + public void mousePressed(MouseEvent e) { > > + // figure out which mouse button is pressed > > + switch (e.getButton()) { > > + case MouseEvent.BUTTON1: > > + System.out.println("mousePressedButton1"); > > + break; > > + case MouseEvent.BUTTON2: > > + System.out.println("mousePressedButton2"); > > + break; > > + case MouseEvent.BUTTON3: > > + System.out.println("mousePressedButton3"); > > + break; > > + default: > > + break; > > + } > > + } > > + > > + public void mouseReleased(MouseEvent e) { > > + // figure out which mouse button was pressed > > + switch (e.getButton()) { > > + case MouseEvent.BUTTON1: > > + System.out.println("mouseReleasedButton1"); > > + break; > > + case MouseEvent.BUTTON2: > > + System.out.println("mouseReleasedButton2"); > > + break; > > + case MouseEvent.BUTTON3: > > + System.out.println("mouseReleasedButton3"); > > + break; > > + default: > > + break; > > + } > > + } > > + }); > > + > > + panel.add(b); > > + > > + this.add(panel); > > + } > > +} > > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -0,0 +1,248 @@ > > +/* JavawsAWTRobotUsageSampleTest.java > > +Copyright (C) 2012 Red Hat, Inc. > > + > > +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, version 2. > > + > > +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. > > + */ > > + > > +import java.awt.Color; > > +import java.awt.event.InputEvent; > > +import java.awt.image.BufferedImage; > > +import java.io.File; > > +import java.io.IOException; > > + > > +import javax.imageio.ImageIO; > > + > > +import net.sourceforge.jnlp.ProcessResult; > > +import net.sourceforge.jnlp.ServerAccess; > > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > > +import net.sourceforge.jnlp.awt.AWTFrameworkException; > > +import net.sourceforge.jnlp.awt.AWTHelper; > > +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; > > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > > +import net.sourceforge.jnlp.closinglisteners.Rule; > > + > > +import org.junit.Assert; > > +import org.junit.Test; > > + > > +public class JavawsAWTRobotUsageSampleTest extends BrowserTest { > > + > > + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; > > + > > + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > > + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > > + > > + private abstract class AWTHelperImpl extends AWTHelper{ > > + > > + public AWTHelperImpl() { > > + super(initStr, 400, 400); > > + > > + this.setAppletColor(APPLET_COLOR); > > + } > > + > > + } > > + > > + private class AWTHelperImpl_EnterExit extends AWTHelperImpl { > > + > > + @Override > > + public void run() { > > + // move mouse into the button area and out > > + try { > > + moveToMiddleOfColoredRectangle(BUTTON_COLOR1); > > + moveOutsideColoredRectangle(BUTTON_COLOR1); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{ > > + > > + @Override > > + public void run() { > > + // click in the middle of the button > > + > > + try { > > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON1_MASK); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + private class AWTHelperImpl_MouseClick2 extends AWTHelperImpl{ > > + @Override > > + public void run() { > > + // move mouse in the middle of the button and click 2nd > > + // button > > + try { > > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON2_MASK); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + private class AWTHelperImpl_MouseClick3 extends AWTHelperImpl{ > > + @Override > > + public void run() { > > + // move mouse in the middle of the button and click 3rd > > + // button > > + try { > > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON3_MASK); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + private class AWTHelperImpl_MouseDrag extends AWTHelperImpl{ > > + @Override > > + public void run() { > > + // move into the rectangle, press 1st button, drag out > > + try { > > + dragFromColoredRectangle(BUTTON_COLOR1); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + private class AWTHelperImpl_MouseMove extends AWTHelperImpl{ > > + @Override > > + public void run() { > > + clickInTheMiddleOfApplet(); > > + try { > > + moveInsideColoredRectangle(BUTTON_COLOR1); > > + } catch (ComponentNotFoundException e) { > > + Assert.fail("Button not found: "+e.getMessage()); > > + } catch (AWTFrameworkException e2){ > > + Assert.fail("AWTFrameworkException: "+e2.getMessage()); > > + } > > + } > > + } > > + > > + > > + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { > > + > > + // Assert that the applet was initialized. > > + Rule i = helper.getInitStrAsRule(); > > + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); > > + > > + // Assert there are all the test messages from applet > > + for (Rule r : helper.getRules() ) { > > + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); > > + } > > + > > + } > > + > > + > > + private void appletAWTMouseTest(String url, AWTHelper helper) > > + throws Exception { > > + > > + String strURL = "/" + url; > > + > > + try { > > + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms > > + ProcessResult pr = server.executeJavaws(strURL, helper, helper); > > + evaluateStdoutContents(pr, helper); > > + } finally { > > + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms > > + } > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_EnterAndExit_Test() throws Exception { > > + // display the page, activate applet, move over the button > > + AWTHelper helper = new AWTHelperImpl_EnterExit(); > > + helper.addClosingRulesFromStringArray(new String[] { "mouseEntered", "mouseExited"}); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_ClickButton1_Test() throws Exception { > > + // display the page, activate applet, click on button > > + AWTHelper helper = new AWTHelperImpl_MouseClick1(); > > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton1", "mouseReleasedButton1", "mouseClickedButton1" }); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_ClickButton2_Test() throws Exception { > > + // display the page, activate applet, click on button > > + AWTHelper helper = new AWTHelperImpl_MouseClick2(); > > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton2", "mouseReleasedButton2", "mouseClickedButton2" }); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_ClickButton3_Test() throws Exception { > > + // display the page, activate applet, click on button > > + AWTHelper helper = new AWTHelperImpl_MouseClick3(); > > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton3", "mouseReleasedButton3", "mouseClickedButton3" }); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_Drag_Test() throws Exception { > > + > > + // display the page, activate applet, click on button > > + AWTHelper helper = new AWTHelperImpl_MouseDrag(); > > + helper.addClosingRulesFromStringArray(new String[] { "mouseDragged" }); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > + > > + @Test > > + @NeedsDisplay > > + public void AppletAWTMouse_Move_Test() throws Exception { > > + // display the page, activate applet, click on button > > + AWTHelper helper = new AWTHelperImpl_MouseMove(); > > + helper.addClosingRulesFromStringArray(new String[] { "mouseMoved" }); > > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); > > + } > > +} > > diff -r e34db561b7b9 tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -0,0 +1,56 @@ > > +/* ComponentFinderTest.java > > +Copyright (C) 2013 Red Hat, Inc. > > + > > +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, version 2. > > + > > +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 net.sourceforge.jnlp.awt.imagesearch; > > + > > +import java.awt.image.BufferedImage; > > +import org.junit.Assert; > > +import org.junit.Test; > > + > > +/** > > + * > > + * This class is a part of AWTFramework, contains component finding > > + * by searching for icons. > > + * > > + */ > > +public class ComponentFinderTest { > > + > > + @Test > > + public void initialiseDefaultIcon() { > > + BufferedImage icon = ComponentFinder.defaultIcon; > > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); > > + } > > +} > > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java > > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 16:24:37 2013 +0200 > > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -164,13 +164,9 @@ > > > > String test_server_dir_path = System.getProperty("test.server.dir"); > > > > - try { > > - this.marker = ImageIO.read(new File(test_server_dir_path + "/marker.png")); > > - this.markerPosition = new Point(0,0); > > - this.markerGiven = true; > > - } catch (IOException e) { > > - throw new RuntimeException("AWTHelper could not read marker.png.",e); > > - } > > + this.marker = ComponentFinder.defaultIcon; > > + this.markerPosition = new Point(0,0); > > + this.markerGiven = true; > > > > this.appletWidth = appletWidth; > > this.appletHeight = appletHeight; > > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java > > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 16:24:37 2013 +0200 > > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Tue Apr 30 17:20:33 2013 +0200 > > @@ -42,8 +42,18 @@ > > import java.awt.Point; > > import java.awt.Rectangle; > > import java.awt.image.BufferedImage; > > +import java.io.IOException; > > +import javax.imageio.ImageIO; > > > > public class ComponentFinder { > > + public static final BufferedImage defaultIcon; > > please add empty line here > > > + static{ > > + try { > > + defaultIcon = ImageIO.read(ComponentFinder.class.getClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png")); > > + } catch (IOException e) { > > + throw new RuntimeException("ComponentFinder - problem initializing defaultIcon",e); > > + } > > + } > > > > /** > > * method findColoredRectangle determines coordinates of a rectangle colored > > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png > > Binary file tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png has changed > > Except the (maybe) missing target, looks more then ok to me. > > J. -------------- next part -------------- A non-text attachment was scrubbed... Name: modifying_makefile_awtframework_defaulticon.patch Type: text/x-patch Size: 30030 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/de59c075/modifying_makefile_awtframework_defaulticon.patch From jvanek at redhat.com Thu May 2 01:04:56 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 10:04:56 +0200 Subject: [rfc][icedtea-web] Makefile.am modification for AWTFramework, defaultIcon In-Reply-To: <1367480957.1898.19.camel@jana-2-174.nrt.redhat.com> References: <1367336589.6039.18.camel@jana-2-174.nrt.redhat.com> <5181126A.3090702@redhat.com> <1367480957.1898.19.camel@jana-2-174.nrt.redhat.com> Message-ID: <51821E28.8010909@redhat.com> On 05/02/2013 09:49 AM, Jana Fabrikova wrote: > Hello, thank you for the feedback, I am sending a slightly modified > patch and more comments to this change. > > 1) reason for the modification of the Makefile.am: > The AWTFramework may be used to find an application window that is > marked by an icon. This icon can be either given as a parameter > (BufferedImage) to the specific instance of AWTHelper class, or there is > one default icon (marker.png) as a static final attribute of the class > ComponentFinder. This icon is loaded from a file, which is placed in > the /tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch > directory. Therefore the classloader needs to have the > directory /tests/test-extensions/ on classpath. > > 2) yes, there are all 6 needed changes. More descriptive ChangeLog: > > 2013-05-02 Jana Fabrikova > > * Makefile.am: > the directory $(TEST_EXTENSIONS_SRCDIR) (i.e. test/test-extensions) > added on classpath for running reproducers, unit tests, and test code > coverage for reproducers and unittests using emma and jacoco, that is > for the following 6 targets: > (stamps/run-netx-dist-tests.stamp) > (stamps/run-netx-unit-tests.stamp) > (stamps/run-unit-test-code-coverage.stamp) with EMMA > (stamps/run-unit-test-code-coverage-jacoco.stamp) > (stamps/run-reproducers-test-code-coverage.stamp) with EMMA > (stamps/run-reproducers-test-code-coverage-jacoco.stamp) > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > modifying the constructor, the default icon is taken from > ComponentFinder instead of loading from file > * > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: > added a block of initialization code - the default icon > * > tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > unit test for the initialization code in ComponentFinder > * tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: > second copy of the default icon in a reproducer with resources only > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: > jnlp file for displaying the applet > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: > the applet > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: > adding 6 testcases testing clicking with different mouse > buttons on the applet > * > tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: > unit test for the initialization code in ComponentFinder > * > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: > first copy of the default icon, will be on classpath > > Looks good. ok to push; Thank you, > On Wed, 2013-05-01 at 15:02 +0200, Jiri Vanek wrote: >> On 04/30/2013 05:43 PM, Jana Fabrikova wrote: >>> Hi, >>> please see the attached patch with modifications to Makefile and several >>> files in AWTFramework with which the default icon file (marker.png also >>> attached) will be present in ...awt/imagesearch and test-extensions >>> srcdir will be on the classpath, >>> >>> cheers, >>> Jana >>> >>> ChangeLog: >>> >>> 2013-04-30 Jana Fabrikova >> dont forget to change the date;) >> >> The explanation why this patch is needed is necessary. Everyone who was not during our 1to1 discusiion maybe confused >>> >>> * Makefile.am: >>> test/test-extensions added on classpath for reproducers, unit >>> tests and code coverage tests >> maybe little bitmore of explanation and aspecially enumerate teh affected targets please. >> >>> * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: >>> modifying the constructor, the default icon is taken from >>> ComponentFinder instead of loading from file >>> * >>> tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: >>> added a block of initialization code - the default icon >>> * >>> tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: >>> unit test for the initialization code in ComponentFinder * >>> tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: >>> second copy of the default icon in a reproducer with resources only >>> * >>> tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: >>> jnlp file for displaying the applet >>> * >>> tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: >>> the applet >>> * >>> tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: >>> adding 6 testcases testing clicking with different mouse >>> buttons on the applet >>> * >>> tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: >>> unit test for the initialization code in ComponentFinder >>> * >>> tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: >>> first copy of the default icon, will be on classpath >>> >>> >>> >>> marker.png >>> >>> >>> >>> modifying_makefile_defaultIcon.patch >>> >>> >>> diff -r e34db561b7b9 Makefile.am >>> --- a/Makefile.am Mon Apr 29 16:24:37 2013 +0200 >>> +++ b/Makefile.am Tue Apr 30 17:20:33 2013 +0200 >>> @@ -788,7 +788,7 @@ >>> $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ >>> -d $(TEST_EXTENSIONS_TESTS_DIR) \ >>> -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ >>> - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \ >>> + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ >> >> This line is irrelevant, is it? If so, please remove from chnageset. >>> done ; \ >>> done ; \ >>> mkdir -p stamps&& \ >>> @@ -843,7 +843,7 @@ >>> $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp >>> cd $(TEST_EXTENSIONS_DIR) ; \ >>> class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ >>> - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ >>> + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ >>> $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ >>> -Xbootclasspath:$(RUNTIME) CommandLine $$class_names >>> if WITH_XSLTPROC >>> @@ -1021,7 +1021,7 @@ >>> done ; \ >>> cd $(NETX_UNIT_TEST_DIR) ; \ >>> class_names=`cat $(UNIT_CLASS_NAMES)` ; \ >>> - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ >>> + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ >>> $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names >>> if WITH_XSLTPROC >>> -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html >>> @@ -1057,6 +1057,7 @@ >>> -cp $(BOOT_DIR)/jre/lib/resources.jar \ >>> -cp $(RHINO_RUNTIME) \ >>> -cp $(TEST_EXTENSIONS_DIR) \ >>> + -cp $(TEST_EXTENSIONS_SRCDIR) \ >>> -cp . \ >>> -ix "-org.junit.*" \ >>> -ix "-junit.*" \ >>> @@ -1101,7 +1102,7 @@ >>> mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ >>> done ;\ >>> class_names=`cat $(UNIT_CLASS_NAMES)` ; \ >>> - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):. \ >>> + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ >>> $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ >>> for file in $(EMMA_MODIFIED_FILES) ; do \ >>> mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ >>> @@ -1171,6 +1172,7 @@ >>> -cp $(BOOT_DIR)/jre/lib/resources.jar \ >>> -cp $(RHINO_RUNTIME) \ >>> -cp . \ >>> + -cp $(TEST_EXTENSIONS_SRCDIR) \ >>> -cp $(TEST_EXTENSIONS_TESTS_DIR) \ >>> -ix "-org.junit.*" \ >>> -ix "-junit.*" \ >>> @@ -1274,7 +1276,7 @@ >>> done ; \ >>> cd $(TEST_EXTENSIONS_DIR) ; \ >>> class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ >>> - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR) \ >>> + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ >>> $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \ >>> -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ >>> if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \ >> >> Isn't there missing one case? >> >> should be six of them - run unittests, run reproducers, run unittest with emma, with jacoco, run reproducers with emma and with jacoco. >> >>> diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -0,0 +1,56 @@ >>> +/* ComponentFinderTest.java >>> +Copyright (C) 2013 Red Hat, Inc. >>> + >>> +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, version 2. >>> + >>> +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 net.sourceforge.jnlp.awt.imagesearch; >>> + >>> +import java.awt.image.BufferedImage; >>> +import org.junit.Assert; >>> +import org.junit.Test; >>> + >>> +/** >>> + * >>> + * This class is a part of AWTFramework, contains component finding >>> + * by searching for icons. >>> + * >>> + */ >>> +public class ComponentFinderTest { >>> + >>> + @Test >>> + public void initialiseDefaultIcon() { >>> + BufferedImage icon = ComponentFinder.defaultIcon; >>> + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); >>> + } >>> +} >>> diff -r e34db561b7b9 tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png >>> Binary file tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png has changed >>> diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp Tue Apr 30 17:20:33 2013 +0200 >>> @@ -0,0 +1,57 @@ >>> + >>> + >>> + >>> + >>> +AWTRobot usage sample >>> +IcedTea >>> + >>> +AWTRobot usage sample >>> + >>> + >>> + >>> + >>> + >>> + >>> +>> + name="AWTRobot usage sample" >>> + main-class="JavawsAWTRobotUsageSample" >>> + width="400" >>> + height="400"> >>> + >>> + >>> diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -0,0 +1,176 @@ >>> +/* JavawsAWTRobotUsageSample.java >>> +Copyright (C) 2012 Red Hat, Inc. >>> + >>> +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, version 2. >>> + >>> +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. >>> + */ >>> + >>> +import java.applet.Applet; >>> +import java.awt.Graphics; >>> +import java.awt.Color; >>> +import java.awt.Image; >>> +import java.awt.Panel; >>> +import java.awt.Button; >>> +import java.awt.Dimension; >>> +import java.awt.event.MouseEvent; >>> +import java.awt.event.MouseListener; >>> +import java.awt.event.MouseMotionListener; >>> + >>> +public class JavawsAWTRobotUsageSample extends Applet { >>> + >>> + private static final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; >>> + public static final String iconFile = "marker.png"; >>> + >>> + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender >>> + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green >>> + >>> + public Image img; >>> + public Panel panel; >>> + >>> + public void init(){ >>> + img = getImage(getCodeBase(), iconFile); >>> + >>> + createGUI(); >>> + >>> + writeAppletInitialized(); >>> + } >>> + >>> + //this method should be called by the extending applet >>> + //when the whole gui is ready >>> + public void writeAppletInitialized(){ >>> + System.out.println(initStr); >>> + } >>> + >>> + //paint the icon in upper left corner >>> + @Override public void paint(Graphics g){ >>> + int width = 32; >>> + int height = 32; >>> + int x = 0; >>> + int y = 0; >>> + g.drawImage(img, x, y, width, height, this); >>> + super.paint(g); >>> + } >>> + >>> + private Button createButton(String label, Color color) { >>> + Button b = new Button(label); >>> + b.setBackground(color); >>> + b.setPreferredSize(new Dimension(100, 50)); >>> + return b; >>> + } >>> + >>> + // sets background of the applet and adds the panel with one button >>> + private void createGUI() { >>> + setBackground(APPLET_COLOR); >>> + >>> + panel = new Panel(); >>> + panel.setBounds(33,33,267,267); >>> + >>> + Button b = createButton("", BUTTON_COLOR1); >>> + >>> + b.addMouseMotionListener(new MouseMotionListener() { >>> + public void mouseDragged(MouseEvent e) { >>> + System.out.println("mouseDragged"); >>> + } >>> + >>> + public void mouseMoved(MouseEvent e) { >>> + System.out.println("mouseMoved"); >>> + } >>> + }); >>> + >>> + b.addMouseListener(new MouseListener() { >>> + >>> + public void mouseClicked(MouseEvent e) { >>> + // figure out which mouse button is pressed >>> + switch (e.getButton()) { >>> + case MouseEvent.BUTTON1: >>> + System.out.println("mouseClickedButton1"); >>> + break; >>> + case MouseEvent.BUTTON2: >>> + System.out.println("mouseClickedButton2"); >>> + break; >>> + case MouseEvent.BUTTON3: >>> + System.out.println("mouseClickedButton3"); >>> + break; >>> + default: >>> + break; >>> + } >>> + } >>> + >>> + public void mouseEntered(MouseEvent e) { >>> + System.out.println("mouseEntered"); >>> + } >>> + >>> + public void mouseExited(MouseEvent e) { >>> + System.out.println("mouseExited"); >>> + } >>> + >>> + public void mousePressed(MouseEvent e) { >>> + // figure out which mouse button is pressed >>> + switch (e.getButton()) { >>> + case MouseEvent.BUTTON1: >>> + System.out.println("mousePressedButton1"); >>> + break; >>> + case MouseEvent.BUTTON2: >>> + System.out.println("mousePressedButton2"); >>> + break; >>> + case MouseEvent.BUTTON3: >>> + System.out.println("mousePressedButton3"); >>> + break; >>> + default: >>> + break; >>> + } >>> + } >>> + >>> + public void mouseReleased(MouseEvent e) { >>> + // figure out which mouse button was pressed >>> + switch (e.getButton()) { >>> + case MouseEvent.BUTTON1: >>> + System.out.println("mouseReleasedButton1"); >>> + break; >>> + case MouseEvent.BUTTON2: >>> + System.out.println("mouseReleasedButton2"); >>> + break; >>> + case MouseEvent.BUTTON3: >>> + System.out.println("mouseReleasedButton3"); >>> + break; >>> + default: >>> + break; >>> + } >>> + } >>> + }); >>> + >>> + panel.add(b); >>> + >>> + this.add(panel); >>> + } >>> +} >>> diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -0,0 +1,248 @@ >>> +/* JavawsAWTRobotUsageSampleTest.java >>> +Copyright (C) 2012 Red Hat, Inc. >>> + >>> +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, version 2. >>> + >>> +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. >>> + */ >>> + >>> +import java.awt.Color; >>> +import java.awt.event.InputEvent; >>> +import java.awt.image.BufferedImage; >>> +import java.io.File; >>> +import java.io.IOException; >>> + >>> +import javax.imageio.ImageIO; >>> + >>> +import net.sourceforge.jnlp.ProcessResult; >>> +import net.sourceforge.jnlp.ServerAccess; >>> +import net.sourceforge.jnlp.annotations.NeedsDisplay; >>> +import net.sourceforge.jnlp.awt.AWTFrameworkException; >>> +import net.sourceforge.jnlp.awt.AWTHelper; >>> +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; >>> +import net.sourceforge.jnlp.browsertesting.BrowserTest; >>> +import net.sourceforge.jnlp.closinglisteners.Rule; >>> + >>> +import org.junit.Assert; >>> +import org.junit.Test; >>> + >>> +public class JavawsAWTRobotUsageSampleTest extends BrowserTest { >>> + >>> + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; >>> + >>> + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender >>> + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green >>> + >>> + private abstract class AWTHelperImpl extends AWTHelper{ >>> + >>> + public AWTHelperImpl() { >>> + super(initStr, 400, 400); >>> + >>> + this.setAppletColor(APPLET_COLOR); >>> + } >>> + >>> + } >>> + >>> + private class AWTHelperImpl_EnterExit extends AWTHelperImpl { >>> + >>> + @Override >>> + public void run() { >>> + // move mouse into the button area and out >>> + try { >>> + moveToMiddleOfColoredRectangle(BUTTON_COLOR1); >>> + moveOutsideColoredRectangle(BUTTON_COLOR1); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{ >>> + >>> + @Override >>> + public void run() { >>> + // click in the middle of the button >>> + >>> + try { >>> + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON1_MASK); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + private class AWTHelperImpl_MouseClick2 extends AWTHelperImpl{ >>> + @Override >>> + public void run() { >>> + // move mouse in the middle of the button and click 2nd >>> + // button >>> + try { >>> + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON2_MASK); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + private class AWTHelperImpl_MouseClick3 extends AWTHelperImpl{ >>> + @Override >>> + public void run() { >>> + // move mouse in the middle of the button and click 3rd >>> + // button >>> + try { >>> + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON3_MASK); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + private class AWTHelperImpl_MouseDrag extends AWTHelperImpl{ >>> + @Override >>> + public void run() { >>> + // move into the rectangle, press 1st button, drag out >>> + try { >>> + dragFromColoredRectangle(BUTTON_COLOR1); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + private class AWTHelperImpl_MouseMove extends AWTHelperImpl{ >>> + @Override >>> + public void run() { >>> + clickInTheMiddleOfApplet(); >>> + try { >>> + moveInsideColoredRectangle(BUTTON_COLOR1); >>> + } catch (ComponentNotFoundException e) { >>> + Assert.fail("Button not found: "+e.getMessage()); >>> + } catch (AWTFrameworkException e2){ >>> + Assert.fail("AWTFrameworkException: "+e2.getMessage()); >>> + } >>> + } >>> + } >>> + >>> + >>> + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { >>> + >>> + // Assert that the applet was initialized. >>> + Rule i = helper.getInitStrAsRule(); >>> + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); >>> + >>> + // Assert there are all the test messages from applet >>> + for (Rule r : helper.getRules() ) { >>> + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); >>> + } >>> + >>> + } >>> + >>> + >>> + private void appletAWTMouseTest(String url, AWTHelper helper) >>> + throws Exception { >>> + >>> + String strURL = "/" + url; >>> + >>> + try { >>> + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms >>> + ProcessResult pr = server.executeJavaws(strURL, helper, helper); >>> + evaluateStdoutContents(pr, helper); >>> + } finally { >>> + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms >>> + } >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_EnterAndExit_Test() throws Exception { >>> + // display the page, activate applet, move over the button >>> + AWTHelper helper = new AWTHelperImpl_EnterExit(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mouseEntered", "mouseExited"}); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_ClickButton1_Test() throws Exception { >>> + // display the page, activate applet, click on button >>> + AWTHelper helper = new AWTHelperImpl_MouseClick1(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton1", "mouseReleasedButton1", "mouseClickedButton1" }); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_ClickButton2_Test() throws Exception { >>> + // display the page, activate applet, click on button >>> + AWTHelper helper = new AWTHelperImpl_MouseClick2(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton2", "mouseReleasedButton2", "mouseClickedButton2" }); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_ClickButton3_Test() throws Exception { >>> + // display the page, activate applet, click on button >>> + AWTHelper helper = new AWTHelperImpl_MouseClick3(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton3", "mouseReleasedButton3", "mouseClickedButton3" }); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_Drag_Test() throws Exception { >>> + >>> + // display the page, activate applet, click on button >>> + AWTHelper helper = new AWTHelperImpl_MouseDrag(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mouseDragged" }); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> + >>> + @Test >>> + @NeedsDisplay >>> + public void AppletAWTMouse_Move_Test() throws Exception { >>> + // display the page, activate applet, click on button >>> + AWTHelper helper = new AWTHelperImpl_MouseMove(); >>> + helper.addClosingRulesFromStringArray(new String[] { "mouseMoved" }); >>> + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper); >>> + } >>> +} >>> diff -r e34db561b7b9 tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -0,0 +1,56 @@ >>> +/* ComponentFinderTest.java >>> +Copyright (C) 2013 Red Hat, Inc. >>> + >>> +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, version 2. >>> + >>> +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 net.sourceforge.jnlp.awt.imagesearch; >>> + >>> +import java.awt.image.BufferedImage; >>> +import org.junit.Assert; >>> +import org.junit.Test; >>> + >>> +/** >>> + * >>> + * This class is a part of AWTFramework, contains component finding >>> + * by searching for icons. >>> + * >>> + */ >>> +public class ComponentFinderTest { >>> + >>> + @Test >>> + public void initialiseDefaultIcon() { >>> + BufferedImage icon = ComponentFinder.defaultIcon; >>> + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); >>> + } >>> +} >>> diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java >>> --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 16:24:37 2013 +0200 >>> +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -164,13 +164,9 @@ >>> >>> String test_server_dir_path = System.getProperty("test.server.dir"); >>> >>> - try { >>> - this.marker = ImageIO.read(new File(test_server_dir_path + "/marker.png")); >>> - this.markerPosition = new Point(0,0); >>> - this.markerGiven = true; >>> - } catch (IOException e) { >>> - throw new RuntimeException("AWTHelper could not read marker.png.",e); >>> - } >>> + this.marker = ComponentFinder.defaultIcon; >>> + this.markerPosition = new Point(0,0); >>> + this.markerGiven = true; >>> >>> this.appletWidth = appletWidth; >>> this.appletHeight = appletHeight; >>> diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java >>> --- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 16:24:37 2013 +0200 >>> +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Tue Apr 30 17:20:33 2013 +0200 >>> @@ -42,8 +42,18 @@ >>> import java.awt.Point; >>> import java.awt.Rectangle; >>> import java.awt.image.BufferedImage; >>> +import java.io.IOException; >>> +import javax.imageio.ImageIO; >>> >>> public class ComponentFinder { >>> + public static final BufferedImage defaultIcon; >> >> please add empty line here >> >>> + static{ >>> + try { >>> + defaultIcon = ImageIO.read(ComponentFinder.class.getClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png")); >>> + } catch (IOException e) { >>> + throw new RuntimeException("ComponentFinder - problem initializing defaultIcon",e); >>> + } >>> + } >>> >>> /** >>> * method findColoredRectangle determines coordinates of a rectangle colored >>> diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png >>> Binary file tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png has changed >> >> Except the (maybe) missing target, looks more then ok to me. >> >> J. > From ptisnovs at icedtea.classpath.org Thu May 2 01:05:02 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 02 May 2013 08:05:02 +0000 Subject: /hg/rhino-tests: Updated four tests in CompilableClassTest for (... Message-ID: changeset b4e6c7746fe3 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=b4e6c7746fe3 author: Pavel Tisnovsky date: Thu May 02 10:08:03 2013 +0200 Updated four tests in CompilableClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/CompilableClassTest.java | 62 +++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diffs (113 lines): diff -r e74a55b0a132 -r b4e6c7746fe3 ChangeLog --- a/ChangeLog Tue Apr 30 10:01:10 2013 +0200 +++ b/ChangeLog Thu May 02 10:08:03 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-02 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Updated four tests in CompilableClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-04-30 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r e74a55b0a132 -r b4e6c7746fe3 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Tue Apr 30 10:01:10 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Thu May 02 10:08:03 2013 +0200 @@ -440,9 +440,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.compilableClass.getFields(); @@ -467,10 +480,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.compilableClass.getDeclaredFields(); @@ -495,8 +521,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -522,8 +561,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From jvanek at redhat.com Thu May 2 01:15:45 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 10:15:45 +0200 Subject: [rfc][icedtea-web] Remove wrongly 'undummied' JSObject->Java array code from MethodOverloadResolver In-Reply-To: <51814AFA.6090704@redhat.com> References: <517EC6CA.3050701@redhat.com> <5181085A.3070106@redhat.com> <5181134F.80607@redhat.com> <51811AF3.4060707@redhat.com> <51814AFA.6090704@redhat.com> Message-ID: <518220B1.6070907@redhat.com> On 05/01/2013 07:03 PM, Adam Domurad wrote: > On 05/01/2013 09:38 AM, Jiri Vanek wrote: >> On 05/01/2013 03:06 PM, Adam Domurad wrote: >>> On 05/01/2013 08:19 AM, Jiri Vanek wrote: >>>> On 04/29/2013 09:15 PM, Adam Domurad wrote: >>>>> So part of what motivated me to rewrite the old MethodOverloadResolver was the fact that I >>>>> noticed it had a dummy JSObject defined at the bottom of the code, and it was mistakenly using >>>>> that. It puzzled me why this wasn't observable. Well, it seems it is because the only code path >>>>> that relied on JSObject itself was incorrect. >>>>> >>>>> Thanks to Jana for the thorough tests that caught this! >>>>> It looks like we do not support conversion of JSObject to a Java array in method signatures. >>>>> This will bring the code back to its old functionality. >>>>> >>>>> There is a want for the real fix, but I think we should do a fix in a separate step. >>>>> >>>> >>>> Looks mostly corect. Will the tests need some fixes? >>> >>> No -- unfortunately the JSObject related tests are commented don't have the necessary privileges >>> to create a JSObject. >> >> Not even in jana's tests? > > Oi, I'm a dummy. Current tests are correct, but see below about a few more we could have. > > I just realized we're not missing this functionality. The C++ function 'createJavaObjectFromVariant' > automatically converts JS arrays to Java arrays before passing them. I have attached some additional > unit tests. (ChangeLog in patch) > > However unfortunately I see other fundamental brokenness. It seems we'd need to ask for thie > conversion from the Java-side to be sure it is correct. > > For example: > > JSObject someField; from Java side > applet.someField = [1,1] from Javascript side, > > You'd expect it to be able to do this (it is a JSObject, after all), but actually it is not > possible. This is because it is converted to a String[] array before-hand. > > As well: > Object[] someField; from Java side > applet.someField = [{}, 1] > Is not possible. You'd expected an array of [JSObject, Integer], but the whole thing is a JSObject. > > Ignorance is bliss ... These cases do not seem to be handled by the reproducers (but I could be > mistaken), some KnownToFail reproducers cases might be nice. > > Still happy hacking, > -Adam Looks ok from my side (code-verifiere) But I must admit this toppic is becoming slipping out of my hands. I would like also Jana's vote here. Thank you for checks. J. From ptisnovs at icedtea.classpath.org Thu May 2 01:20:57 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 02 May 2013 08:20:57 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltConvolveOp. Message-ID: changeset d07e7656ca0b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d07e7656ca0b author: Pavel Tisnovsky date: Thu May 02 10:24:15 2013 +0200 Ten new tests added into BitBltConvolveOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltConvolveOp.java | 144 ++++++++++++++++++++++- 2 files changed, 147 insertions(+), 2 deletions(-) diffs (208 lines): diff -r b1ac76ce1c1a -r d07e7656ca0b ChangeLog --- a/ChangeLog Tue Apr 30 10:37:55 2013 +0200 +++ b/ChangeLog Thu May 02 10:24:15 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-02 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + Ten new tests added into BitBltConvolveOp. + 2013-04-30 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r b1ac76ce1c1a -r d07e7656ca0b src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Tue Apr 30 10:37:55 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Thu May 02 10:24:15 2013 +0200 @@ -229,6 +229,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) { return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel2x2ROP); @@ -243,7 +271,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSmoothing3x3ROP(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSmoothingKernel2x23x3ROP(TestImage image, Graphics2D graphics2d) { return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel3x3ROP); } @@ -257,7 +285,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSmoothing5x5ROP(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSmoothingKernel2x25x5ROP(TestImage image, Graphics2D graphics2d) { return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel5x5ROP); } @@ -285,6 +313,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) { return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel2x2ROP); @@ -341,6 +397,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) { return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel2x2ROP); @@ -397,6 +481,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) { return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel2x2ROP); @@ -453,6 +565,34 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) { return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, smoothingKernel2x2ROP); From jfabriko at icedtea.classpath.org Thu May 2 02:13:40 2013 From: jfabriko at icedtea.classpath.org (jfabriko at icedtea.classpath.org) Date: Thu, 02 May 2013 09:13:40 +0000 Subject: /hg/icedtea-web: modifying makefile for awtframework default icon Message-ID: changeset 0e4641f585bf in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0e4641f585bf author: Jana Fabrikova date: Thu May 02 11:16:36 2013 +0200 modifying makefile for awtframework default icon diffstat: ChangeLog | 34 + Makefile.am | 10 +- tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java | 56 ++ tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png | Bin tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp | 57 ++ tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java | 176 +++++++ tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java | 248 ++++++++++ tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java | 56 ++ tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 10 +- tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java | 11 + tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png | Bin 11 files changed, 647 insertions(+), 11 deletions(-) diffs (truncated from 756 to 500 lines): diff -r 3fa3d0fdce30 -r 0e4641f585bf ChangeLog --- a/ChangeLog Tue Apr 30 11:31:28 2013 -0400 +++ b/ChangeLog Thu May 02 11:16:36 2013 +0200 @@ -1,3 +1,37 @@ +2013-05-02 Jana Fabrikova + + * Makefile.am: + the directory $(TEST_EXTENSIONS_SRCDIR) (i.e. test/test-extensions) + added on classpath for running reproducers, unit tests, and test code + coverage for reproducers and unittests using emma and jacoco, that is + for the following 6 targets: + (stamps/run-netx-dist-tests.stamp) + (stamps/run-netx-unit-tests.stamp) + (stamps/run-unit-test-code-coverage.stamp) with EMMA + (stamps/run-unit-test-code-coverage-jacoco.stamp) + (stamps/run-reproducers-test-code-coverage.stamp) with EMMA + (stamps/run-reproducers-test-code-coverage-jacoco.stamp) + * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: + modifying the constructor, the default icon is taken from + ComponentFinder instead of loading from file + * tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java: + added a block of initialization code - the default icon + * tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: + unit test for the initialization code in ComponentFinder + * tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png: + second copy of the default icon in a reproducer with resources only + * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp: + jnlp file for displaying the applet + * tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java: + the applet + * tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java: + adding 6 testcases testing clicking with different mouse + buttons on the applet + * tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java: + unit test for the initialization code in ComponentFinder + * tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png: + first copy of the default icon, will be on classpath + 2013-04-30 Adam Domurad * tests/netx/unit/sun/applet/MethodOverloadResolverTest.java: Add missing diff -r 3fa3d0fdce30 -r 0e4641f585bf Makefile.am --- a/Makefile.am Tue Apr 30 11:31:28 2013 -0400 +++ b/Makefile.am Thu May 02 11:16:36 2013 +0200 @@ -843,7 +843,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp cd $(TEST_EXTENSIONS_DIR) ; \ class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath:$(RUNTIME) CommandLine $$class_names if WITH_XSLTPROC @@ -1021,7 +1021,7 @@ done ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names if WITH_XSLTPROC -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html @@ -1057,6 +1057,7 @@ -cp $(BOOT_DIR)/jre/lib/resources.jar \ -cp $(RHINO_RUNTIME) \ -cp $(TEST_EXTENSIONS_DIR) \ + -cp $(TEST_EXTENSIONS_SRCDIR) \ -cp . \ -ix "-org.junit.*" \ -ix "-junit.*" \ @@ -1101,7 +1102,7 @@ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ done ;\ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):. \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ for file in $(EMMA_MODIFIED_FILES) ; do \ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ @@ -1171,6 +1172,7 @@ -cp $(BOOT_DIR)/jre/lib/resources.jar \ -cp $(RHINO_RUNTIME) \ -cp . \ + -cp $(TEST_EXTENSIONS_SRCDIR) \ -cp $(TEST_EXTENSIONS_TESTS_DIR) \ -ix "-org.junit.*" \ -ix "-junit.*" \ @@ -1274,7 +1276,7 @@ done ; \ cd $(TEST_EXTENSIONS_DIR) ; \ class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR) \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \ diff -r 3fa3d0fdce30 -r 0e4641f585bf tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Thu May 02 11:16:36 2013 +0200 @@ -0,0 +1,56 @@ +/* ComponentFinderTest.java +Copyright (C) 2013 Red Hat, Inc. + +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, version 2. + +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 net.sourceforge.jnlp.awt.imagesearch; + +import java.awt.image.BufferedImage; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * This class is a part of AWTFramework, contains component finding + * by searching for icons. + * + */ +public class ComponentFinderTest { + + @Test + public void initialiseDefaultIcon() { + BufferedImage icon = ComponentFinder.defaultIcon; + Assert.assertNotNull("The default icon marker.png was not initialized.", icon); + } +} diff -r 3fa3d0fdce30 -r 0e4641f585bf tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png Binary file tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png has changed diff -r 3fa3d0fdce30 -r 0e4641f585bf tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp Thu May 02 11:16:36 2013 +0200 @@ -0,0 +1,57 @@ + + + + + AWTRobot usage sample + IcedTea + + AWTRobot usage sample + + + + + + + + + diff -r 3fa3d0fdce30 -r 0e4641f585bf tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java Thu May 02 11:16:36 2013 +0200 @@ -0,0 +1,176 @@ +/* JavawsAWTRobotUsageSample.java +Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + */ + +import java.applet.Applet; +import java.awt.Graphics; +import java.awt.Color; +import java.awt.Image; +import java.awt.Panel; +import java.awt.Button; +import java.awt.Dimension; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; + +public class JavawsAWTRobotUsageSample extends Applet { + + private static final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; + public static final String iconFile = "marker.png"; + + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green + + public Image img; + public Panel panel; + + public void init(){ + img = getImage(getCodeBase(), iconFile); + + createGUI(); + + writeAppletInitialized(); + } + + //this method should be called by the extending applet + //when the whole gui is ready + public void writeAppletInitialized(){ + System.out.println(initStr); + } + + //paint the icon in upper left corner + @Override public void paint(Graphics g){ + int width = 32; + int height = 32; + int x = 0; + int y = 0; + g.drawImage(img, x, y, width, height, this); + super.paint(g); + } + + private Button createButton(String label, Color color) { + Button b = new Button(label); + b.setBackground(color); + b.setPreferredSize(new Dimension(100, 50)); + return b; + } + + // sets background of the applet and adds the panel with one button + private void createGUI() { + setBackground(APPLET_COLOR); + + panel = new Panel(); + panel.setBounds(33,33,267,267); + + Button b = createButton("", BUTTON_COLOR1); + + b.addMouseMotionListener(new MouseMotionListener() { + public void mouseDragged(MouseEvent e) { + System.out.println("mouseDragged"); + } + + public void mouseMoved(MouseEvent e) { + System.out.println("mouseMoved"); + } + }); + + b.addMouseListener(new MouseListener() { + + public void mouseClicked(MouseEvent e) { + // figure out which mouse button is pressed + switch (e.getButton()) { + case MouseEvent.BUTTON1: + System.out.println("mouseClickedButton1"); + break; + case MouseEvent.BUTTON2: + System.out.println("mouseClickedButton2"); + break; + case MouseEvent.BUTTON3: + System.out.println("mouseClickedButton3"); + break; + default: + break; + } + } + + public void mouseEntered(MouseEvent e) { + System.out.println("mouseEntered"); + } + + public void mouseExited(MouseEvent e) { + System.out.println("mouseExited"); + } + + public void mousePressed(MouseEvent e) { + // figure out which mouse button is pressed + switch (e.getButton()) { + case MouseEvent.BUTTON1: + System.out.println("mousePressedButton1"); + break; + case MouseEvent.BUTTON2: + System.out.println("mousePressedButton2"); + break; + case MouseEvent.BUTTON3: + System.out.println("mousePressedButton3"); + break; + default: + break; + } + } + + public void mouseReleased(MouseEvent e) { + // figure out which mouse button was pressed + switch (e.getButton()) { + case MouseEvent.BUTTON1: + System.out.println("mouseReleasedButton1"); + break; + case MouseEvent.BUTTON2: + System.out.println("mouseReleasedButton2"); + break; + case MouseEvent.BUTTON3: + System.out.println("mouseReleasedButton3"); + break; + default: + break; + } + } + }); + + panel.add(b); + + this.add(panel); + } +} diff -r 3fa3d0fdce30 -r 0e4641f585bf tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Thu May 02 11:16:36 2013 +0200 @@ -0,0 +1,248 @@ +/* JavawsAWTRobotUsageSampleTest.java +Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + */ + +import java.awt.Color; +import java.awt.event.InputEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.awt.AWTFrameworkException; +import net.sourceforge.jnlp.awt.AWTHelper; +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.closinglisteners.Rule; + +import org.junit.Assert; +import org.junit.Test; + +public class JavawsAWTRobotUsageSampleTest extends BrowserTest { + + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; + + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green + + private abstract class AWTHelperImpl extends AWTHelper{ + + public AWTHelperImpl() { + super(initStr, 400, 400); + + this.setAppletColor(APPLET_COLOR); + } + + } + + private class AWTHelperImpl_EnterExit extends AWTHelperImpl { + + @Override + public void run() { + // move mouse into the button area and out + try { + moveToMiddleOfColoredRectangle(BUTTON_COLOR1); + moveOutsideColoredRectangle(BUTTON_COLOR1); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{ + + @Override + public void run() { + // click in the middle of the button + + try { From jfabriko at redhat.com Thu May 2 02:46:05 2013 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 02 May 2013 11:46:05 +0200 Subject: [rfc][icedtea-web] AWTHelper small modification In-Reply-To: <5181053A.6040702@redhat.com> References: <1367337872.6039.22.camel@jana-2-174.nrt.redhat.com> <5181053A.6040702@redhat.com> Message-ID: <1367487965.2541.6.camel@jana-2-174.nrt.redhat.com> Hi, thank you for the comments, I have refactored the AWTHelper class more, completely getting rid of the unnecessary variable initStrGiven and the new patch is in the attachment. ChangeLog: 2013-05-02 Jana Fabrikova * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: refactoring - removing initStrGiven variable - now it only matters if the initStr is null or not. Modifying the following two methods: (charReaded) - if initStr is null the run method can not be started from charReaded and the presence of initStr is not checked in stdout. Method (getInitStrAsRule) returns rule that is always true if initStr is null. cheers, Jana On Wed, 2013-05-01 at 14:06 +0200, Jiri Vanek wrote: > On 04/30/2013 06:04 PM, Jana Fabrikova wrote: > > Hello, I am sending only a small modification to the file AWTHelper, > > part of AWTFramework, in dealing with an initialisation string (it can > > be null or given), > > thanks for any comments, > > Jana > > > > > > ChangeLog: > > > > 2013-04-30 Jana Fabrikova > > > > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > > modifying the (charrReaded) method > > > > > > modifying_AWTHelper_null_initStr.patch > > > Hmm this does not seems to be correct. > a) This should allow awt helper to work with null "magic string" > b) this should allow awt helper to run without need of magic string. > > The (a) looks nearly ok, but I'm confused by initStrGiven variable. It jus disappeared from condition. So it is not needed any more? Then please remove it. > Or have it just slipped from condition accidentally? > > for (b) I'm not sure if it is enough - is it? > > > > diff -r 3fa3d0fdce30 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java > > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 11:31:28 2013 -0400 > > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 18:00:55 2013 +0200 > > @@ -60,7 +60,7 @@ > > public abstract class AWTHelper extends RulesFolowingClosingListener implements Runnable{ > > > > //attributes possibly set by user > > - private String initStr = ""; > > + private String initStr = null; > > private Color appletColor; > > private BufferedImage marker; > > private Point markerPosition; > > @@ -171,6 +171,7 @@ > > } catch (IOException e) { > > throw new RuntimeException("AWTHelper could not read marker.png.",e); > > } > > + > > > > this.appletWidth = appletWidth; > > this.appletHeight = appletHeight; > > @@ -206,7 +207,7 @@ > > public void charReaded(char ch) { > > sb.append(ch); > > //is applet ready to start clicking? > > - if (initStrGiven&& !actionStarted&& appletIsReady(sb.toString())) { > > + if ((initStr != null)&& !actionStarted&& appletIsReady(sb.toString())) { > also pelase keep code according to rules - spaces on both sides of logical operators > > > try{ > > actionStarted = true; > > this.findAndActivateApplet(); > > Thank you for keeping teh awt helper classes more usable - it was not possible without second person to try it. > > Thank you > J. -------------- next part -------------- A non-text attachment was scrubbed... Name: modifying_AWTHelper_initStrnull.patch Type: text/x-patch Size: 3790 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/72f95574/modifying_AWTHelper_initStrnull.patch From jvanek at redhat.com Thu May 2 02:44:50 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 11:44:50 +0200 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <51801B78.20603@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <51801B78.20603@redhat.com> Message-ID: <51823592.9030706@redhat.com> ...snip >> return responseCode; >> } >> @@ -891,7 +887,7 @@ >> * @param resource the resource >> * @return the best URL, or null if all failed to resolve >> */ >> - private URL findBestUrl(Resource resource) { >> + URL findBestUrl(Resource resource) { >> DownloadOptions options = downloadOptions.get(resource); >> if (options == null) { >> options = new DownloadOptions(false, false); >> @@ -910,8 +906,9 @@ >> >> int responseCode = getUrlResponseCode(url, requestProperties, "HEAD"); >> >> - if (responseCode == HttpURLConnection.HTTP_NOT_IMPLEMENTED ) { >> - System.err.println("NOTE: The server does not appear to support HEAD >> requests, falling back to GET requests."); >> + if (responseCode < 200 || responseCode >= 300) { >> + System.err.println("NOTE: The server has returned " + responseCode + " code >> for HEAD request for " + url.toExternalForm() + ". IcedTea-Web will fail back to GET."); >> + System.err.println("NOTE: it is possible that server is just not supporting >> HEAD request, but more likely the file is really invalid or missing"); > > This is a poor error message, please remove it. > Or if you wish, you may keep the old message in the case that 'responseCode == > HttpURLConnection.HTTP_NOT_IMPLEMENTED'. In that case the server is telling us they do not support > HEAD requests. > Actually, this method would be a bit better (and not require 2 connections per failure) if the outer > loop was: > > /* Use GET request as a fallback in the rare case the server does not support HEAD requests */ > final String requestMethods = {"HEAD", "GET"}; > for (String requestMethod : requestMethods) { > for (URL url : urls) { > ....snip... > int responseCode = getUrlResponseCode(url, requestProperties, requestMethod); > ....snip... > > Then we need not fall-back inside the loop at all. The logic would remain pretty much the same. > In this case we can still explicitly check for ==NOT_IMPLEMENTED in which case we will report > '"Server does not support " + requestMethod'. (Not supporting GET would really be something special > though :-) > > I am in favour of this variation (Omair seemed to prefer it too :-). It guarantees the largest > benefit from HEAD requests in the case of trial-and-error jar name guesses, for just a little bit of > restructuring. > Much better indeed. Done >> /* Fallback: use GET request in the rare case the server does not support >> HEAD requests */ >> responseCode = getUrlResponseCode(url, requestProperties, "GET"); >> } >> @@ -922,6 +919,10 @@ >> System.err.println("best url for " + resource.toString() + " is " + >> url.toString()); >> } >> return url; /* This is the best URL */ >> + } else { >> + if (JNLPRuntime.isDebug()) { >> + System.err.println(resource.toString() + "'s url " + url.toString()+" >> returned "+responseCode); >> + } > > OK. > >> } >> } catch (IOException e) { >> // continue to next candidate >> diff -r e34db561b7b9 netx/net/sourceforge/jnlp/util/HttpUtils.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/netx/net/sourceforge/jnlp/util/HttpUtils.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -0,0 +1,71 @@ >> +/* >> + Copyright (C) 2011 Red Hat, Inc. >> + >> + 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, version 2. >> + >> + 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 net.sourceforge.jnlp.util; >> + >> +import java.io.IOException; >> +import java.io.InputStream; >> +import java.net.HttpURLConnection; >> + >> +public class HttpUtils { >> + >> + /** >> + * Ensure a HttpURLConnection is fully read, required for correct behaviour >> + * in some APIs, namely HttpURLConnection. >> + */ > > This message is confusing. Please drop the last part ('in some APIs, namely HttpURLConnection'). > Please duplicate this comment for 'consumeAndCloseConnection', and additionally indicate for > 'consumeAndCloseConnection' that IOException's are caught and printed. Done. > >> + public static void consumeAndCloseConnectionSilently(HttpURLConnection c) { >> + try { >> + consumeAndCloseConnection(c); >> + } catch (IOException ex) { >> + ex.printStackTrace(System.err); >> + } >> + } >> + >> + public static void consumeAndCloseConnection(HttpURLConnection c) throws IOException { >> + InputStream in = null; >> + try { >> + in = c.getInputStream(); >> + byte[] throwAwayBuffer = new byte[256]; >> + while (in.read(throwAwayBuffer) > 0) { >> + /* ignore contents */ >> + } >> + } finally { >> + if (in!=null){ >> + in.close(); >> + } >> + } >> + } >> +} >> diff -r e34db561b7b9 netx/net/sourceforge/jnlp/util/StreamUtils.java >> --- a/netx/net/sourceforge/jnlp/util/StreamUtils.java Mon Apr 29 16:24:37 2013 +0200 >> +++ b/netx/net/sourceforge/jnlp/util/StreamUtils.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -42,22 +42,10 @@ >> import java.io.IOException; >> import java.io.InputStream; >> import java.io.InputStreamReader; >> +import java.net.HttpURLConnection; >> >> public class StreamUtils { >> >> - /** >> - * Ensure a stream is fully read, required for correct behaviour in some >> - * APIs, namely HttpURLConnection. >> - * @throws IOException >> - */ >> - public static void consumeAndCloseInputStream(InputStream in) throws IOException { >> - byte[] throwAwayBuffer = new byte[256]; >> - while (in.read(throwAwayBuffer) > 0) { >> - /* ignore contents */ >> - } >> - in.close(); >> - } >> - >> /*** >> * Closes a stream, without throwing IOException. >> * In case of IOException, prints the stack trace to System.err. > > Will review tests separately. > > Thanks, > -Adam Thanx for cehck. I hope Omair will be happy too:) -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedPortalBank-fix.diff Type: text/x-patch Size: 9732 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/6947677f/fixedPortalBank-fix.diff From jvanek at redhat.com Thu May 2 02:49:37 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 11:49:37 +0200 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <5180288C.3090204@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <5180288C.3090204@redhat.com> Message-ID: <518236B1.8070700@redhat.com> ... > > s/comparsion/comparison/ > >> + //this may affect testsuites > > [nit] 'test-suites' > > Why don't you fix it ? Isn't it a simple matter of uncommenting CacheUtil line 89 ? > > (Although I think the true way to compare URL's is URL.toURI().equals... And to that extent, I think > we should use URI wherever possible. agree > Out of scope but worth considering if you do end up touching > the caching code a lot in the future.) I'm aware of the part making this happening. But it is out of scope of this patch. I will refactor a lo from this for 1.5 So no op now. Also the port confusion is really mostly related to tests... However, thanx for hint and this will be remembered > >> int index = resources.indexOf(resource); >> if (index >= 0) { // return existing object >> Resource result = resources.get(index); >> diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/VersionTest.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/netx/unit/net/sourceforge/jnlp/VersionTest.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -0,0 +1,99 @@ >> +/* >> + Copyright (C) 2011 Red Hat, Inc. >> + >> + 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, version 2. >> + >> + 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 net.sourceforge.jnlp; >> + >> +import org.junit.Assert; >> +import org.junit.Test; >> + >> +public class VersionTest { >> + >> + private static boolean[] results = {true, >> + true, >> + false, >> + true, >> + false, >> + true, >> + false, >> + true, >> + false, >> + false, >> + false, >> + false, >> + true, >> + true, >> + true, >> + true, >> + true, >> + true, >> + false, >> + true}; > > No :-) yes... I'm not going to lost more time on this. For now imho the test extraction is enough. More work can come in close future. > >> + private static Version jvms[] = { >> + new Version("1.1* 1.3*"), >> + new Version("1.2+"),}; > > Please instead format this into a positive (ie, should pass) & negative (ie, shouldFail) list for > both version strings. > >> + private static Version versions[] = { >> + new Version("1.1"), >> + new Version("1.1.8"), >> + new Version("1.2"), >> + new Version("1.3"), >> + new Version("2.0"), >> + new Version("1.3.1"), >> + new Version("1.2.1"), >> + new Version("1.3.1-beta"), >> + new Version("1.1 1.2"), >> + new Version("1.2 1.3"),}; >> + >> + @Test >> + public void iterateVersions() { > > Please name this testMatches. From now down.. many nits and typos.. I hope I have fixed them alll > >> + >> + int i = 0; >> + for (int j = 0; j < jvms.length; j++) { >> + for (int v = 0; v < versions.length; v++) { >> + i++; >> + String s = i + " " + jvms[j].toString() + " "; > > Please name this variable. > >> + if (!jvms[j].matches(versions[v])) { >> + s += "!"; >> + } >> + s += "matches " + versions[v].toString(); >> + //System.out.println(s); > > Please remove the commented out println. > >> + ServerAccess.logOutputReprint(s); >> + Assert.assertEquals(results[i - 1], jvms[j].matches(versions[v])); >> + } >> + } >> + >> + >> + } >> +} >> diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java >> --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Mon Apr 29 16:24:37 >> 2013 +0200 >> +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Tue Apr 30 16:12:59 >> 2013 +0200 >> @@ -1,54 +1,74 @@ >> /* ResourceTrackerTest.java >> -Copyright (C) 2012 Red Hat, Inc. >> + Copyright (C) 2012 Red Hat, Inc. >> >> -This file is part of IcedTea. >> + 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, version 2. >> + 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, version 2. >> >> -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. >> + 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. >> + 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. >> + 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. >> + 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 net.sourceforge.jnlp.cache; >> >> +import java.io.ByteArrayOutputStream; >> +import java.io.File; >> +import java.io.IOException; >> +import java.io.PrintStream; >> import java.io.UnsupportedEncodingException; >> +import java.net.HttpURLConnection; >> import java.net.MalformedURLException; >> import java.net.URISyntaxException; >> import java.net.URL; >> - >> +import java.util.HashMap; >> +import net.sourceforge.jnlp.LoggingBottleneck; >> +import net.sourceforge.jnlp.ServerAccess; >> +import net.sourceforge.jnlp.ServerLauncher; >> +import net.sourceforge.jnlp.Version; >> +import net.sourceforge.jnlp.runtime.JNLPRuntime; >> import net.sourceforge.jnlp.util.UrlUtils; >> - >> +import org.junit.AfterClass; >> import org.junit.Assert; >> +import org.junit.BeforeClass; >> import org.junit.Test; >> >> -/** Test various corner cases of the parser */ >> +/** >> + * Test various corner cases of the parser >> + */ > > Reformatting is nice, but this comment needs to go :-). (It seems copied from ParserCornerCases, at > any rate it doesn't belong here.) > >> public class ResourceTrackerTest { >> >> + public static ServerLauncher s; >> + public static ServerLauncher s2; > > Please name these variables. Why not serverLauncher1 & serverLauncher2 ? > >> + private static PrintStream backupedStream; > > 'backedUpStream' > > >> + private static ByteArrayOutputStream nwErrorStream; > > I'm not sure what 'nw' refers to. Consider renaming. > >> + private static final String nameStub1 = "itw-server"; >> + private static final String nameStub2 = "test-file"; >> + >> @Test >> public void testNormalizeUrl() throws Exception { >> URL[] u = getUrls(); >> @@ -64,7 +84,6 @@ >> Assert.assertFalse("url " + i + " must be normalized (and so not equals) too >> normlaized url " + i, u[i].equals(n[i])); > > normlaized -> normalized. > >> } >> } >> - >> public static final int CHANGE_BORDER = 6; >> >> public static URL[] getUrls() throws MalformedURLException { >> @@ -97,4 +116,230 @@ >> return n; >> >> } >> + >> + @BeforeClass >> + public static void redirectErr() { >> + if (backupedStream == null) { >> + backupedStream = System.err; >> + } >> + nwErrorStream = new ByteArrayOutputStream(); >> + System.setErr(new PrintStream(nwErrorStream)); >> + >> + } >> + >> + @AfterClass >> + public static void redirectErrBack() throws UnsupportedEncodingException { >> + ServerAccess.logErrorReprint(nwErrorStream.toString("utf-8")); >> + //System.err.println(nwErrorStream.toString("utf-8")); > > Please remove this comment. > >> + System.setErr(backupedStream); >> + >> + } >> + >> + @BeforeClass >> + public static void onDebug() { >> + JNLPRuntime.setDebug(true); >> + } >> + >> + @AfterClass >> + public static void offDebug() { >> + JNLPRuntime.setDebug(false); >> + } >> + >> + @BeforeClass >> + public static void startServer() throws IOException { >> + s = ServerAccess.getIndependentInstance(System.getProperty("java.io.tmpdir"), >> ServerAccess.findFreePort()); >> + } >> + >> + @BeforeClass >> + public static void startServer2() throws IOException { >> + s2 = ServerAccess.getIndependentInstance(System.getProperty("java.io.tmpdir"), >> ServerAccess.findFreePort()); >> + s2.setSupportsHead(false); >> + } >> + >> + @AfterClass >> + public static void stopServer() { >> + s.stop(); >> + } >> + >> + @AfterClass >> + public static void stopServer2() { >> + s2.stop(); >> + } >> + >> + @Test >> + public void getUrlResponseCodeTestWorkingHeadRequest() throws IOException { >> + redirectErr(); >> + try { >> + File f = File.createTempFile(nameStub1, nameStub2); >> + int i = ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap> String>(), "HEAD"); >> + Assert.assertEquals(HttpURLConnection.HTTP_OK, i); >> + f.delete(); >> + i = ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap> String>(), "HEAD"); >> + Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, i); >> + } finally { >> + redirectErrBack(); >> + } >> + } >> + >> + @Test >> + public void getUrlResponseCodeTestNotWorkingHeadRequest() throws IOException { >> + redirectErr(); >> + try { >> + File f = File.createTempFile(nameStub1, nameStub2); >> + int i = ResourceTracker.getUrlResponseCode(s2.getUrl(f.getName()), new >> HashMap(), "HEAD"); >> + Assert.assertEquals(HttpURLConnection.HTTP_NOT_IMPLEMENTED, i); >> + f.delete(); >> + i = ResourceTracker.getUrlResponseCode(s2.getUrl(f.getName()), new HashMap> String>(), "HEAD"); >> + Assert.assertEquals(HttpURLConnection.HTTP_NOT_IMPLEMENTED, i); >> + } finally { >> + redirectErrBack(); >> + } >> + } >> + >> + @Test >> + public void getUrlResponseCodeTestGetReequestOnNotWorkingHeadRequest() throws IOException { > > Reequest -> Request > >> + redirectErr(); >> + try { >> + File f = File.createTempFile(nameStub1, nameStub2); >> + int i = ResourceTracker.getUrlResponseCode(s2.getUrl(f.getName()), new >> HashMap(), "GET"); >> + Assert.assertEquals(HttpURLConnection.HTTP_OK, i); >> + f.delete(); >> + i = ResourceTracker.getUrlResponseCode(s2.getUrl(f.getName()), new HashMap> String>(), "GET"); >> + Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, i); >> + } finally { >> + redirectErrBack(); >> + } >> + } >> + >> + @Test >> + public void getUrlResponseCodeTestGetRequest() throws IOException { >> + redirectErr(); >> + try { >> + File f = File.createTempFile(nameStub1, nameStub2); >> + int i = ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap> String>(), "GET"); >> + Assert.assertEquals(HttpURLConnection.HTTP_OK, i); >> + f.delete(); >> + i = ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap> String>(), "GET"); >> + Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, i); >> + } finally { >> + redirectErrBack(); >> + } >> + } >> + >> + @Test >> + public void getUrlResponseCodeTestWrongRequest() throws IOException { >> + redirectErr(); >> + try { >> + File f = File.createTempFile(nameStub1, nameStub2); >> + Exception exception = null; >> + try { >> + ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap(), >> "SomethingWrong"); >> + } catch (Exception ex) { >> + exception = ex; >> + } >> + Assert.assertNotNull(exception); >> + exception = null; >> + f.delete(); >> + try { >> + ResourceTracker.getUrlResponseCode(s.getUrl(f.getName()), new HashMap(), >> "SomethingWrong"); >> + } catch (Exception ex) { >> + exception = ex; >> + } >> + Assert.assertNotNull(exception);; >> + } finally { >> + redirectErrBack(); >> + } >> + >> + } >> + >> + @Test >> + public void findBestUrltest() throws IOException { >> + redirectErr(); >> + try { >> + File fs = File.createTempFile(nameStub1, nameStub2); > > Please use 'file1' and 'file2' at the very least. 'fs' doesn't imply a file to me. > >> + File versiondFs = new File(fs.getParentFile(), fs.getName() + "-2.0"); >> + versiondFs.createNewFile(); >> + >> + File fs2 = File.createTempFile(nameStub1, nameStub2); >> + File versiondFs2 = new File(fs2.getParentFile(), fs2.getName() + "-2.0"); >> + versiondFs2.createNewFile(); >> + >> + ResourceTracker rt = new ResourceTracker(); >> + Resource r1 = Resource.getResource(s.getUrl(fs.getName()), null, UpdatePolicy.NEVER); >> + Resource r2 = Resource.getResource(s2.getUrl(fs2.getName()), null, UpdatePolicy.NEVER); >> + Resource r3 = Resource.getResource(s.getUrl(versiondFs.getName()), new >> Version("1.0"), UpdatePolicy.NEVER); >> + Resource r4 = Resource.getResource(s2.getUrl(versiondFs2.getName()), new >> Version("1.0"), UpdatePolicy.NEVER); >> + asserrS1(rt.findBestUrl(r1)); >> + asserrS1V1(rt.findBestUrl(r3)); >> + asserrS2(rt.findBestUrl(r2)); >> + asertS2V1(rt.findBestUrl(r4)); >> + >> + fs.delete(); >> + Assert.assertNull(rt.findBestUrl(r1)); >> + asserrS1V1(rt.findBestUrl(r3)); >> + asserrS2(rt.findBestUrl(r2)); >> + asertS2V1(rt.findBestUrl(r4)); >> + >> + versiondFs.delete(); >> + Assert.assertNull(rt.findBestUrl(r1)); >> + Assert.assertNull(rt.findBestUrl(r3)); >> + asserrS2(rt.findBestUrl(r2)); >> + asertS2V1(rt.findBestUrl(r4)); >> + >> + versiondFs2.delete(); >> + Assert.assertNull(rt.findBestUrl(r1)); >> + Assert.assertNull(rt.findBestUrl(r3)); >> + asserrS2(rt.findBestUrl(r2)); >> + Assert.assertNull(rt.findBestUrl(r4)); >> + >> + >> + fs2.delete(); >> + Assert.assertNull(rt.findBestUrl(r1)); >> + Assert.assertNull(rt.findBestUrl(r3)); >> + Assert.assertNull(rt.findBestUrl(r2)); >> + Assert.assertNull(rt.findBestUrl(r4)); > > [nit] Consider breaking this up into helper methods. > >> + } finally { >> + redirectErrBack(); >> + } >> + >> + } >> + >> + private void asserrS1(URL u) { > > 'asserr' -> 'assert'. This isn't understandable at first sight. 'assertOnServer1' or something? Same > goes for below. > >> + assertCommon(u); >> + assertPort(u, s.getPort()); >> + } >> + >> + private void asserrS1V1(URL u) { >> + assertCommon(u); >> + assertPort(u, s.getPort()); >> + assertVersion(u); >> + } >> + >> + private void asserrS2(URL u) { >> + assertCommon(u); >> + assertPort(u, s2.getPort()); >> + } >> + >> + private void asertS2V1(URL u) { >> + assertCommon(u); >> + assertPort(u, s2.getPort()); >> + assertVersion(u); >> + } >> + >> + private void assertCommon(URL u) { > > [nit] Maybe 'assertCommonComponents'. > >> + Assert.assertTrue(u.getProtocol().equals("http")); >> + Assert.assertTrue(u.getHost().equals("localhost")); >> + Assert.assertTrue(u.getPath().contains(nameStub1)); >> + Assert.assertTrue(u.getPath().contains(nameStub2)); >> + ServerAccess.logOutputReprint(u.toExternalForm()); >> + } >> + >> + private void assertPort(URL u, int port) { >> + Assert.assertTrue(u.getPort() == port); >> + } >> + >> + private void assertVersion(URL u) { >> + Assert.assertTrue(u.getPath().contains("-2.0")); >> + Assert.assertTrue(u.getQuery().contains("version-id=1.0")); >> + } >> } >> diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -0,0 +1,251 @@ >> +/* >> + Copyright (C) 2012 Red Hat, Inc. >> + >> + 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 net.sourceforge.jnlp.util; >> + >> +import java.io.ByteArrayOutputStream; >> +import java.io.IOException; >> +import java.io.PrintStream; >> +import java.io.UnsupportedEncodingException; >> +import java.net.HttpURLConnection; >> +import java.net.URL; >> +import net.sourceforge.jnlp.ServerAccess; >> +import net.sourceforge.jnlp.ServerLauncher; >> +import org.junit.AfterClass; >> +import org.junit.Assert; >> +import org.junit.BeforeClass; >> +import org.junit.Test; >> + >> +public class HttpUtilsTest { >> + >> + private static PrintStream backupedStream; > > 'backedUpStream' > >> + private static ByteArrayOutputStream nwErrorStream; >> + >> + public static void redirectErr() { >> + if (backupedStream == null) { >> + backupedStream = System.err; >> + } >> + nwErrorStream = new ByteArrayOutputStream(); >> + System.setErr(new PrintStream(nwErrorStream)); >> + >> + } >> + >> + >> + public static void redirectErrBack() throws UnsupportedEncodingException { >> + ServerAccess.logErrorReprint(nwErrorStream.toString("utf-8")); >> + //System.err.println(nwErrorStream.toString("utf-8")); > > Please remove this comment. > >> + System.setErr(backupedStream); >> + >> + } >> + >> + @Test >> + public void consumeAndCloseConnectionSilentlyTest() throws IOException { >> + redirectErr(); >> + try{ >> + Exception exception = null; >> + try { >> + HttpUtils.consumeAndCloseConnectionSilently(new HttpURLConnection(null) { >> + @Override >> + public void disconnect() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + }); >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNull("no exception expected - was" + exception, exception); >> + >> + >> + >> + try { >> + HttpUtils.consumeAndCloseConnectionSilently(new HttpURLConnection(new >> URL("http://localhost/blahblah")) { >> + @Override >> + public void disconnect() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + }); >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNull("no exception expected - was" + exception, exception); >> + >> + ServerLauncher s =ServerAccess.getIndependentInstance(System.getProperty("user.dir"), >> ServerAccess.findFreePort()); > > Please name this 'serverLauncher'. > >> + try{ >> + try { >> + HttpUtils.consumeAndCloseConnectionSilently(new >> HttpURLConnection(s.getUrl("blahblahblah")) { >> + @Override >> + public void disconnect() { >> + >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + return false; >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + >> + } >> + }); >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNull("no exception expected - was" + exception, exception); >> + }finally{ >> + try{ >> + s.stop(); >> + }catch(Exception ex){ >> + ServerAccess.logException(ex); >> + } >> + } >> + }finally{ >> + redirectErrBack(); >> + } >> + } >> + >> + @Test >> + public void consumeAndCloseConnectionTest() throws IOException { >> + redirectErr(); >> + try{ >> + Exception exception = null; >> + try { >> + HttpUtils.consumeAndCloseConnection(new HttpURLConnection(null) { >> + @Override >> + public void disconnect() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + }); >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNotNull("exception expected - wasnt" + exception, exception); >> + >> + >> + >> + try { >> + HttpUtils.consumeAndCloseConnection(new HttpURLConnection(new >> URL("http://localhost/blahblah")) { > > [nit] 'blahblah' isn't as clear as 'test' or 'testfolder' > >> + @Override >> + public void disconnect() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + throw new UnsupportedOperationException("Not supported yet."); >> + } > > Do you expect these 'Unsupported' exceptions to be the ones thrown ? I'd prefer a custom > RuntimeException in that case, with the appropriate assert. > >> + }); >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNotNull("exception expected - wasnt" + exception, exception); >> + >> + ServerLauncher s =ServerAccess.getIndependentInstance(System.getProperty("user.dir"), >> ServerAccess.findFreePort()); > > Please name this 'serverLauncher'. > >> + try{ >> + try { >> + HttpUtils.consumeAndCloseConnection(new HttpURLConnection(s.getUrl("blahblahblah")) { > > [nit] 'blahblahblah' isn't as clear as something like 'testlocation'. > > >> + @Override >> + public void disconnect() { >> + >> + } >> + >> + @Override >> + public boolean usingProxy() { >> + return false; >> + } >> + >> + @Override >> + public void connect() throws IOException { >> + >> + } >> + }); > > [nit] You use the dummy HttpURLConnection more than once, consider extracting it to a dummy helper > class (still in same file is fine of course). > >> + } catch (Exception ex) { >> + ServerAccess.logException(ex); >> + exception = ex; >> + } >> + Assert.assertNotNull(" exception expected - wasnt" + exception, exception); >> + }finally{ > [nit] formatting > >> + try{ >> + s.stop(); >> + }catch(Exception ex){ >> + ServerAccess.logException(ex); >> + } >> + } >> + }finally{ >> + redirectErrBack(); >> + } >> + } >> +} >> diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java >> --- a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Mon Apr 29 16:24:37 2013 +0200 >> +++ b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -1,3 +1,40 @@ >> +/* >> + Copyright (C) 2012 Red Hat, Inc. >> + >> +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 net.sourceforge.jnlp.util; >> >> import static org.junit.Assert.assertEquals; >> diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java >> --- a/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java Mon Apr 29 16:24:37 2013 +0200 >> +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -57,7 +57,18 @@ >> private final Integer port; >> private final File dir; >> private ServerSocket serverSocket; >> + private boolean supportsHead = true; >> >> + public void setSupportsHead(boolean supportsHead) { >> + this.supportsHead = supportsHead; >> + } >> + >> + public boolean isSupportsHead() { >> + return supportsHead; >> + } >> + >> + >> + >> public String getServerName() { >> return serverName; >> } >> @@ -102,10 +113,12 @@ >> try { >> serverSocket = new ServerSocket(port); >> while (running) { >> - new TinyHttpdImpl(serverSocket.accept(), dir, port); >> + TinyHttpdImpl serverItself = new TinyHttpdImpl(serverSocket.accept(), dir, >> port,false); > > [nit] I'm in favour of simply 'server' or 'serverImpl'. > >> + serverItself.setSupportsHead(supportsHead); >> + serverItself.start(); >> } >> } catch (Exception e) { >> - e.printStackTrace(); >> + ServerAccess.logException(e); >> } finally { >> running = false; >> } >> diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >> --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Mon Apr 29 16:24:37 2013 +0200 >> +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Tue Apr 30 16:12:59 2013 +0200 >> @@ -42,6 +42,7 @@ >> import java.io.File; >> import java.io.FileInputStream; >> import java.io.InputStreamReader; >> +import java.net.HttpURLConnection; >> import java.net.Socket; >> import java.net.SocketException; >> import java.net.URLDecoder; >> @@ -55,25 +56,41 @@ >> * When resource starts with XslowX prefix, then resouce (without XslowX) >> * is returned, but its delivery is delayed >> */ >> -class TinyHttpdImpl extends Thread { >> +public class TinyHttpdImpl extends Thread { >> >> Socket c; >> private final File dir; >> private final int port; >> private boolean canRun = true; >> private static final String XSX = "/XslowX"; >> - >> + private boolean supportsHead = true; >> + >> public TinyHttpdImpl(Socket s, File f, int port) { >> + this(s, f, port, true); >> + } > > I think it's cleaner to set head-support in the constructor, and not have a setter. This way you > won't need a way to avoid the 'start()' method. > >> + public TinyHttpdImpl(Socket s, File f, int port, boolean start) { >> c = s; >> this.dir = f; >> this.port = port; >> - start(); >> + if (start){ >> + start(); >> + } >> } >> >> public void setCanRun(boolean canRun) { >> this.canRun = canRun; >> } >> >> + public void setSupportsHead(boolean supportsHead) { >> + this.supportsHead = supportsHead; >> + } >> + >> + public boolean isSupportsHead() { > > 'supportsHead' or 'doesSupportHead' are proper English. Or perhaps 'hasHeadSupport'. > >> + return supportsHead; >> + } >> + >> + >> + >> public int getPort() { >> return port; >> } >> @@ -92,6 +109,11 @@ >> >> boolean isGetRequest = s.startsWith("GET"); >> boolean isHeadRequest = s.startsWith("HEAD"); >> + >> + if (isHeadRequest && !isSupportsHead()){ >> + o.writeBytes("HTTP/1.0 "+HttpURLConnection.HTTP_NOT_IMPLEMENTED+" Not >> Implemented\n"); >> + continue; >> + } > > Ok. > >> >> if (isGetRequest || isHeadRequest ) { >> StringTokenizer t = new StringTokenizer(s, " "); >> @@ -120,7 +142,7 @@ >> } else if (p.toLowerCase().endsWith(".jar")) { >> content = ct + "application/x-jar\n"; >> } >> - o.writeBytes("HTTP/1.0 200 OK\nContent-Length:" + l + "\n" + content + >> "\n"); >> + o.writeBytes("HTTP/1.0 "+HttpURLConnection.HTTP_OK+" OK\nContent-Length:" >> + l + "\n" + content + "\n"); > > Ok. > >> >> if (isHeadRequest) { >> continue; // Skip sending body > > Thanks for testing! Sorry for so many style-related comments, but at least for me one letter > variable names (with scope more than a few lines, and especially for static variables) require a > _lot_ more time to understand. Please consider it when writing code 8-). I won't insist too much. I > like the patch a lot from a technical standpoint. > > Interesting study: http://arxiv.org/pdf/1304.5257v1.pdf taking this personally :DD > > Thanks for the patch! I don't think the fix needs to wait on the tests, although see my > recommendations there. > -Adam > -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedPortalBank-tests.diff Type: text/x-patch Size: 35944 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/0c695fbc/fixedPortalBank-tests.diff From ptisnovs at redhat.com Thu May 2 03:05:23 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 2 May 2013 06:05:23 -0400 (EDT) Subject: [rfc] [icedtea-web] renaming Messages_cs_CZ to Messages_cs (was Re: ITW tranlsation) In-Reply-To: <517A614D.7050609@redhat.com> References: <201304261057.r3QAvE2N009493@mail-web01.excite.co.jp> <517A614D.7050609@redhat.com> Message-ID: <1054981214.5892480.1367489123307.JavaMail.root@redhat.com> ----- Jiri Vanek wrote: > On 04/26/2013 12:57 PM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> Forwarding Alexander's "new" cz_CS transaltion. > >> I will do review, merge and push. No new code is epxected. > >> > >> J. > >> > >> -------- Original Message -------- > >> Subject: Re: ITW tranlsation > >> Date: Fri, 26 Apr 2013 09:12:15 +0200 > >> From: skolnag at gmail.com > >> To: Jiri Vanek > >> > >> > >> > >> Ahoj, > >> > >> OK, tak tady to máš. Není přeloženo to povídání. To dodělám jindy, teď na to nebylčas. > >> > >> Čau > >> Saša > > > > I have just one minor note on the cs_CZ localization. Would you consider renaming Messages_cs_CZ.properties to Messages_cs.properties, as long there are no specifics to the Czech Republic in it? This would solve the problem for minorities using the Czech language outside of the Czech Republic or users who's computers are configured for a country other than the Czech Republic but use Czech language. As far as I can tell, with cs_CZ one is going to get Czech messages only if the location or country of the computer is the Czech Republic as well (although I am not entirely sure about that). > > I'm not sure if this is even possible. > Czech language is used only In Czech republic. But the same could one say about pl... > Damn I have no idea :) I think that Jacob's idea is meaningful and we can use only Messages_cs.properties. But at the same moment it would be nice to write some tests for check if selected combinations of language+country works correctly. Cheers, Pavel > > Imho there does not exists any enhacning locale for cs (aas do for de eg) > there is just cs_CZ, nothing else. > Eg for de there is: > de > de_CH > de_AT > .... > > For Poland i think there is also *only* pl_PL. Nothing else > > Some googling suggest that cs only and pl only should be supported and valaid... > > Thanx, > J. From adomurad at redhat.com Thu May 2 06:16:13 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 02 May 2013 09:16:13 -0400 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <51823592.9030706@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <51801B78.20603@redhat.com> <51823592.9030706@redhat.com> Message-ID: <5182671D.9000603@redhat.com> >> >> I am in favour of this variation (Omair seemed to prefer it too :-). >> It guarantees the largest >> benefit from HEAD requests in the case of trial-and-error jar name >> guesses, for just a little bit of >> restructuring. >> > > Much better indeed. Done > > Thanx for cehck. I hope Omair will be happy too:) > Looks good to me. OK to push from me. ( Waiting for everyone who made a comment to follow through is good (and our policy, I think?), however it may make it harder for someone to just drop some feedback for a patch. Just a thought, because I know Omair is busy. ) Happy hacking, -Adam From jvanek at icedtea.classpath.org Thu May 2 06:32:52 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 13:32:52 +0000 Subject: /hg/icedtea-web: Renamed cz locales to be more general Message-ID: changeset 55c943c320fd in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=55c943c320fd author: Jiri Vanek date: Thu May 02 15:31:55 2013 +0200 Renamed cz locales to be more general netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties renamed to netx/net/sourceforge/jnlp/resources/Messages_cs.properties tests/netx/unit/net/sourceforge/jnlp/resources/MessagesPropertiesTest.java and tests/reproducers/simple/LocalesTest/testcases/LocalesTestTest.java adapted to new cz locales filename. diffstat: ChangeLog | 9 + netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 574 ++++++++++ netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties | 574 ---------- tests/netx/unit/net/sourceforge/jnlp/resources/MessagesPropertiesTest.java | 5 +- tests/reproducers/simple/LocalesTest/testcases/LocalesTestTest.java | 2 +- 5 files changed, 587 insertions(+), 577 deletions(-) diffs (truncated from 1208 to 500 lines): diff -r 0e4641f585bf -r 55c943c320fd ChangeLog --- a/ChangeLog Thu May 02 11:16:36 2013 +0200 +++ b/ChangeLog Thu May 02 15:31:55 2013 +0200 @@ -1,3 +1,12 @@ +2013-05-02 Jiri Vanek + + Renamed cz locales to be more general + * netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties: renamed to + * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: new file + * tests/netx/unit/net/sourceforge/jnlp/resources/MessagesPropertiesTest.java: + * tests/reproducers/simple/LocalesTest/testcases/LocalesTestTest.java + Adapted to new cz locales filename. + 2013-05-02 Jana Fabrikova * Makefile.am: diff -r 0e4641f585bf -r 55c943c320fd netx/net/sourceforge/jnlp/resources/Messages_cs.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Thu May 02 15:31:55 2013 +0200 @@ -0,0 +1,574 @@ +# Czech UI messages for netx +# L=Launcher, B=Boot, P=Parser, C=cache S=security +# +# General +NullParameter=Pr\u00e1zdn\u00fd parametr +ButAllow=Povolit +ButBrowse=Proch\u00e1zet... +ButCancel=\ Zru\u0161it +ButClose=Zav\u0159\u00edt +ButCopy=Kop\u00edrovat do schr\u00e1nky +ButMoreInformation=Dal\u0161\u00ed informace... +ButOk=OK +ButProceed=Pokra\u010dovat +ButRun=Spustit +ButApply=Pou\u017e\u00edt +ButDone=Hotovo +ButShowDetails=Zobrazit podrobnosti +ButHideDetails=Skr\u00fdt podrobnosti + +AFileOnTheMachine=soubor v po\u010d\u00edta\u010di +AlwaysAllowAction=V\u017edy povolit tuto akci +Usage=Pou\u017eit\u00ed: +Error=Chyba + +Continue=Chcete pokra\u010dovat? +Field=Pole +From=Od +Name=Jm\u00e9no +Password=Heslo: +Publisher=Vydavatel +Unknown= +Username=U\u017eivatelsk\u00e9 jm\u00e9no: +Value=Hodnota +Version=Verze + +# LS - Severity +LSMinor=Mal\u00e1 +LSFatal=Z\u00e1va\u017en\u00e1 + +# LC - Category +LCSystem=Syst\u00e9mov\u00e1 chyba +LCExternalLaunch=Chyba extern\u00edho spu\u0161t\u011bn\u00ed +LCFileFormat=Chybn\u00fd form\u00e1t souboru +LCReadError=Chyba p\u0159i \u010dten\u00ed +LCClient=Chyba aplikace +LCLaunching=Chyba p\u0159i spou\u0161t\u011bn\u00ed +LCNotSupported=Nepodporovan\u00e1 funkce +LCInit=Chyba inicializace + +LAllThreadGroup=V\u0161echny aplikace JNLP +LNullUpdatePolicy=Pravidla pro aktualizaci nesm\u00ed b\u00fdt pr\u00e1zdn\u00e1. + +LThreadInterrupted=Vl\u00e1kno bylo p\u0159eru\u0161eno p\u0159i \u010dek\u00e1n\u00ed na spu\u0161t\u011bn\u00ed souboru. +LThreadInterruptedInfo=To m\u016f\u017ee v\u00e9st k zablokov\u00e1n\u00ed nebo v\u00e9st k jin\u00e9mu po\u0161kozen\u00ed p\u0159i spou\u0161t\u011bn\u00ed. Restartujte aplikaci/prohl\u00ed\u017ee\u010d. +LCouldNotLaunch=Nelze spustit soubor JNLP. +LCouldNotLaunchInfo=Aplikace nebyla inicializov\u00e1na. V\u00edce informac\u00ed z\u00edsk\u00e1te spu\u0161t\u011bn\u00edm p\u0159\u00edkazu javaws/prohl\u00ed\u017ee\u010de z p\u0159\u00edkazov\u00e9 \u0159\u00e1dky. +LCantRead=Nelze \u010d\u00edst nebo analyzovat soubor JNLP. +LCantReadInfo=M\u016f\u017eete se pokusit st\u00e1hnout tento soubor ru\u010dn\u011b a poslat ho jako hl\u00e1\u0161en\u00ed o chyb\u011b t\u00fdmu IcedTea-Web. +LNullLocation=Nelze ur\u010dit um\u00edst\u011bn\u00ed souboru JNLP. +LNullLocationInfo=Byl u\u010din\u011bn pokus o spu\u0161t\u011bn\u00ed souboru JNLP v jin\u00e9m prost\u0159ed\u00ed JVM, av\u0161ak soubor nebyl nalezen. Chcete-li spustit extern\u00ed prost\u0159ed\u00ed JVM, modul runtime mus\u00ed b\u00fdt schopen nal\u00e9zt soubor .jnlp v lok\u00e1ln\u00edm souborov\u00e9m syst\u00e9mu nebo na serveru. +LNetxJarMissing=Nelze ur\u010dit um\u00edst\u011bn\u00ed souboru netx.jar. +LNetxJarMissingInfo=Byl u\u010din\u011bn pokus o spu\u0161t\u011bn\u00ed souboru JNLP v jin\u00e9m prost\u0159ed\u00ed JVM, av\u0161ak nebyl nalezen soubor netx.jar. Chcete-li spustit extern\u00ed prost\u0159ed\u00ed JVM, modul runtime mus\u00ed b\u00fdt schopen nal\u00e9zt soubor netx.jar. +LNotToSpec=Soubor JNLP p\u0159esn\u011b neodpov\u00edd\u00e1 specifikaci. +LNotToSpecInfo=Soubor JNLP obsahuje data, kter\u00e1 jsou zak\u00e1z\u00e1na v r\u00e1mci specifikace JNLP. Modul runtime se m\u016f\u017ee pokusit ignorovat neplatn\u00e9 informace a pokra\u010dovat ve spou\u0161t\u011bn\u00ed souboru. +LNotApplication=Nejedn\u00e1 se o soubor aplikace. +LNotApplicationInfo=Byl u\u010din\u011bn pokus o na\u010dten\u00ed souboru, kter\u00fd nen\u00ed aplikac\u00ed, jako soubor aplikace. +LNotApplet=Nejedn\u00e1 se o soubor appletu. +LNotAppletInfo=Byl u\u010din\u011bn pokus o na\u010dten\u00ed souboru, kter\u00fd nen\u00ed appletem, jako soubor appletu. +LNoInstallers=Instal\u00e1tory nejsou podporov\u00e1ny. +LNoInstallersInfo=Instal\u00e1tory JNLP je\u0161t\u011b nejsou podporov\u00e1ny. +LInitApplet=Nelze inicializovat applet. +LInitAppletInfo=Chcete-li v\u00edce informac\u00ed, klikn\u011bte na tla\u010d\u00edtko Dal\u0161\u00ed informace... +LInitApplication=Nelze inicializovat aplikaci. +LInitApplicationInfo=Aplikace nebyla inicializov\u00e1na. V\u00edce informac\u00ed z\u00edsk\u00e1te spu\u0161t\u011bn\u00edm p\u0159\u00edkazu javaws z p\u0159\u00edkazov\u00e9 \u0159\u00e1dky. +LNotLaunchable=Nejedn\u00e1 se o spustiteln\u00fd soubor JNLP. +LNotLaunchableInfo=Soubor mus\u00ed b\u00fdt aplikac\u00ed, appletem nebo instal\u00e1torem JNLP. +LCantDetermineMainClass=Nezn\u00e1m\u00e1 t\u0159\u00edda Main-Class. +LCantDetermineMainClassInfo=Nelze ur\u010dit t\u0159\u00eddu main class pro tuto aplikaci. +LUnsignedJarWithSecurity=Nelze ud\u011blit opr\u00e1vn\u011bn\u00ed nepodepsan\u00fdm soubor\u016fm JAR. +LUnsignedJarWithSecurityInfo=Aplikace po\u017e\u00e1dala o bezpe\u010dnostn\u00ed opr\u00e1vn\u011bn\u00ed, av\u0161ak soubory JAR nejsou podeps\u00e1ny. +LSignedJNLPAppDifferentCerts=Aplikace JNLP nen\u00ed kompletn\u011b podepsan\u00e1 jednou certifika\u010dn\u00ed autoritou. +LSignedJNLPAppDifferentCertsInfo=Jednotliv\u00e9 komponenty aplikace JNLP jsou individu\u00e1ln\u011b podeps\u00e1ny, nicm\u00e9n\u011b pro v\u0161echny polo\u017eky mus\u00ed b\u00fdt jeden spole\u010dn\u00fd podepisovatel. +LUnsignedApplet=Applet nebyl podepsan\u00fd. +LUnsignedAppletPolicyDenied=Applet nebyl podepsan\u00fd a bezpe\u010dnostn\u00ed pravidla zabr\u00e1nila jeho spu\u0161t\u011bn\u00ed. +LUnsignedAppletUserDenied=Applet nebyl podepsan\u00fd a byl vyhodnocen jako ned\u016fv\u011bryhodn\u00fd. +LSignedAppJarUsingUnsignedJar=Podepsan\u00e1 aplikace pou\u017e\u00edvaj\u00edc\u00ed nepodepsan\u00e9 soubory JAR. +LSignedAppJarUsingUnsignedJarInfo=Hlavn\u00ed soubor JAR aplikace je podepsan\u00fd, av\u0161ak n\u011bkter\u00e9 z dal\u0161\u00edch pou\u017e\u00edvan\u00fdch soubor\u016f JAR nejsou podeps\u00e1ny. +LSignedJNLPFileDidNotMatch=Podepsan\u00fd soubor JNLP se neshoduje se spou\u0161t\u011bn\u00fdm souborem JNLP. +LNoSecInstance=Chyba: Neexistuje bezpe\u010dnostn\u00ed instance pro aplikaci {0}. Aplikace m\u016f\u017ee m\u00edt pot\u00ed\u017ee pokra\u010dovat. +LCertFoundIn=Certifik\u00e1t {0} byl nalezen v arch\u00edvu cacerts ({1}). +LSingleInstanceExists=Ji\u017e existuje jin\u00e1 instance tohoto appletu. Nelze provozovat v\u00edce instanc\u00ed appletu z\u00e1rove\u0148. + +JNotApplet=Soubor nen\u00ed applet. +JNotApplication=Soubor nen\u00ed aplikace. +JNotComponent=Soubor nen\u00ed komponenta. +JNotInstaller=Soubor nen\u00ed instal\u00e1tor. +JInvalidExtensionDescriptor=P\u0159\u00edpona souboru neodkazuje na komponentu nebo instal\u00e1tor (n\u00e1zev={1}, um\u00edst\u011bn\u00ed={2}). + +LNotVerified=Soubory JAR nebyly ov\u011b\u0159eny. +LCancelOnUserRequest=Zru\u0161eno u\u017eivatelem. +LFatalVerification=P\u0159i ov\u011b\u0159ov\u00e1n\u00ed soubor\u016f JAR do\u0161lo k z\u00e1va\u017en\u00e9 chyb\u011b. +LFatalVerificationInfo=Do\u0161lo k v\u00fdjimce ve t\u0159\u00edd\u011b JarCertVerifier. P\u0159\u00ed\u010dinou t\u00e9to v\u00fdjimky m\u016f\u017ee b\u00fdt neschopnost \u010d\u00edst soubory cacerts nebo trusted.certs. + +LNotVerifiedDialog=Nemohly b\u00fdt ov\u011b\u0159eny v\u0161echny soubory JAR. +LAskToContinue=Chcete p\u0159esto pokra\u010dovat ve spou\u0161t\u011bn\u00ed t\u00e9to aplikace? + +# Parser +PInvalidRoot=Element \u201eroot\u201c nen\u00ed elementem jnlp. +PNoResources=Nen\u00ed definov\u00e1n element \u201eresources\u201c. +PUntrustedNative=Nelze deklarovat element \u201enativelib\u201c, ani\u017e by bylo po\u017e\u00e1d\u00e1no o p\u0159\u00edslu\u0161n\u00e1 opr\u00e1vn\u011bn\u00ed. +PExtensionHasJ2SE=V souboru roz\u0161\u00ed\u0159en\u00ed nelze deklarovat element \u201ej2se\u201c. +PInnerJ2SE=Uvnit\u0159 elementu \u201ej2se\u201c nelze deklarovat dal\u0161\u00ed element \u201ej2se\u201c. +PTwoMains=V elementu \u201eresources\u201c je duplicitn\u011b definov\u00e1n atribut \u201emain\u201c (lze definovat pouze jeden). +PNativeHasMain=V r\u00e1mci elementu \u201enativelib\u201c nelze deklarovat atribut \u201emain\u201c. +PNoInfoElement=Nen\u00ed definov\u00e1n element \u201einformation\u201c. +PMissingTitle=N\u00e1zev +PMissingVendor=Dodavatel +PMissingElement=Pro va\u0161e n\u00e1rodn\u00ed prost\u0159ed\u00ed nebyla zad\u00e1na sekce {0}, ani neexistuje v\u00fdchoz\u00ed hodnota v souboru JNLP. +PTwoDescriptions=Duplicitn\u00ed elementy \u201edescription\u201c typu {0} jsou neplatn\u00e9. +PSharing=Element \u201esharing-allowed\u201c je neplatn\u00fd ve standardn\u00edm souboru JNLP. +PTwoSecurity=V ka\u017ed\u00e9m souboru JNLP m\u016f\u017ee b\u00fdt pouze jeden element \u201esecurity\u201c. +PEmptySecurity=Element \u201esecurity\u201c je definov\u00e1n, av\u0161ak neobsahuje element \u201epermissions\u201c. +PTwoDescriptors=V ka\u017ed\u00e9m souboru JNLP m\u016f\u017ee b\u00fdt pouze jeden element \u201eapplication-desc\u201c. +PTwoDesktops=Je povolen pouze jeden element \u201edesktop\u201c. +PTwoMenus=Je povolen pouze jeden element \u201emenu\u201c. +PTwoTitles=Je povolen pouze jeden element \u201etitle\u201c. +PTwoIcons=Je povolen pouze jeden element \u201eicon\u201c. +PTwoUpdates=Je povolen pouze jeden element \u201eupdate\u201c. +PUnknownApplet=Nezn\u00e1m\u00fd applet +PBadWidth=Neplatn\u00e1 \u0161\u00ed\u0159ka appletu +PBadHeight=Neplatn\u00e1 v\u00fd\u0161ka appletu +PUrlNotInCodebase=Relativn\u00ed adresa URL neuv\u00e1d\u00ed podadres\u00e1\u0159 se z\u00e1kladnou k\u00f3du (codebase). (uzel (node)={0}, odkaz (href)={1}, z\u00e1kladna k\u00f3du (codebase)={2}) +PBadRelativeUrl=Neplatn\u00e1 relativn\u00ed adresa URL (uzel (node)={0}, odkaz (href)={1}, z\u00e1kladna k\u00f3du (codebase)={2}) +PBadNonrelativeUrl=Neplatn\u00e1 absolutn\u00ed adresa URL (uzel (node)={0}, odkaz (href)={1}) +PNeedsAttribute=Element {0} mus\u00ed deklarovat atribut {1}. +PBadXML=Neplatn\u00e1 syntax dokumentu XML +PBadHeapSize=Neplatn\u00e1 hodnota pro velikost haldy (heap size) ({0}) + +# Runtime +BLaunchAbout=Prob\u00edh\u00e1 spou\u0161t\u011bn\u00ed okna O aplikaci IcedTea-Web... +BNeedsFile=Je nutn\u00e9 zadat soubor JNLP. +RNoAboutJnlp=Nelze nal\u00e9zt soubor about.jnlp. +BFileLoc=Um\u00edst\u011bn\u00ed souboru JNLP +BBadProp=Neplatn\u00fd form\u00e1t vlastnosti {0} (platn\u00fd form\u00e1t: kl\u00ed\u010d=hodnota) +BBadParam=Neplatn\u00fd form\u00e1t parametru {0} (platn\u00fd form\u00e1t: n\u00e1zev=hodnota) +BNoDir=Adres\u00e1\u0159 {0} neexistuje. +BNoCodeOrObjectApplet=Zna\u010dka appletu mus\u00ed deklarovat atribut \u201ecode\u201c nebo \u201eobject\u201c. +RNoResource=Chyb\u011bj\u00edc\u00ed zdroj: {0} +RShutdown=Tato v\u00fdjimka zabra\u0148uje ukon\u010den\u00ed prost\u0159ed\u00ed JVM, av\u0161ak proces byl ukon\u010den. +RExitTaken=T\u0159\u00edda exit class m\u016f\u017ee b\u00fdt nastavena pouze jednou a pouze ta pak m\u016f\u017ee ukon\u010dit prost\u0159ed\u00ed JVM. +RCantReplaceSM=Nen\u00ed dovoleno vym\u011bnit t\u0159\u00eddu SecurityManager. +RCantCreateFile=Nelze vytvo\u0159it soubor {0}. +RCantDeleteFile=Nelze smazat soubor {0}. +RRemoveRPermFailed=Selhalo odstra\u0148ov\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed ke \u010dten\u00ed u souboru {0}. +RRemoveWPermFailed=Selhalo odstra\u0148ov\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed k z\u00e1pisu u souboru {0}. +RRemoveXPermFailed=Selhalo odstra\u0148ov\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed ke spou\u0161t\u011bn\u00ed u souboru {0}. +RGetRPermFailed=Selhalo z\u00edsk\u00e1v\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed ke \u010dten\u00ed u souboru {0}. +RGetWPermFailed=Selhalo z\u00edsk\u00e1v\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed k z\u00e1pisu u souboru {0}. +RGetXPermFailed=Selhalo z\u00edsk\u00e1v\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed ke spou\u0161t\u011bn\u00ed u souboru {0}. +RCantCreateDir=Nelze vytvo\u0159it adres\u00e1\u0159 {0}. +RCantRename=Nelze prov\u00e9st p\u0159ejmenov\u00e1n\u00ed z {0} na {1}. +RDenyStopped=Pozastaven\u00e1 aplikace nem\u00e1 pat\u0159i\u010dn\u00e1 opr\u00e1vn\u011bn\u00ed. +RExitNoApp=Nelze ukon\u010dit prost\u0159ed\u00ed JVM, proto\u017ee sou\u010dasn\u00e1 aplikace neodpov\u00edd\u00e1. +RNoLockDir=Nelze vytvo\u0159it uzamykac\u00ed adres\u00e1\u0159 ({0}). +RNestedJarExtration=Nelze extrahovat vno\u0159en\u00fd soubor JAR. +RUnexpected=Neo\u010dek\u00e1van\u00e1 v\u00fdjimka {0} v n\u00e1sleduj\u00edc\u00ed \u010d\u00e1sti v\u00fdpisu trasov\u00e1n\u00ed: {1} +RConfigurationError=P\u0159i \u010dten\u00ed konfigurace do\u0161lo k z\u00e1va\u017en\u00e9 chyb\u011b. +RConfigurationFatal=CHYBA: P\u0159i na\u010d\u00edt\u00e1n\u00ed konfigurace do\u0161lo k z\u00e1va\u017en\u00e9 chyb\u011b. Mo\u017en\u00e1 je nutn\u00e9 pou\u017e\u00edt glob\u00e1ln\u00ed konfiguraci, kter\u00e1 v\u0161ak nebyla nalezena. +RPRoxyPacNotSupported=Pou\u017eit\u00ed soubor\u016f PAC (Proxy Auto Config) nen\u00ed podporov\u00e1no. +RProxyFirefoxNotFound=Nelze pou\u017e\u00edt nastaven\u00ed proxy server\u016f prohl\u00ed\u017ee\u010de Firefox. Je pou\u017eito nastaven\u00ed bez proxy serveru (DIRECT). +RProxyFirefoxOptionNotImplemented=Mo\u017enost nastaven\u00ed proxy serveru prohl\u00ed\u017ee\u010de {0} ({1}) je\u0161t\u011b nen\u00ed podporov\u00e1na. +RBrowserLocationPromptTitle=Um\u00edst\u011bn\u00ed prohl\u00ed\u017ee\u010de +RBrowserLocationPromptMessage=Zadejte um\u00edst\u011bn\u00ed prohl\u00ed\u017ee\u010de. +RBrowserLocationPromptMessageWithReason=Zadejte um\u00edst\u011bn\u00ed prohl\u00ed\u017ee\u010de (p\u0159\u00edkaz prohl\u00ed\u017ee\u010de {0} je neplatn\u00fd). + +# Boot options, message should be shorter than this ----------------> +BOUsage=javaws [-volby-spu\u0161t\u011bn\u00ed] +BOUsage2=javaws [-volby-ovl\u00e1d\u00e1n\u00ed] +BOJnlp= Um\u00edst\u011bn\u00ed souboru JNLP ke spu\u0161t\u011bn\u00ed (URL nebo soubor) +BOArg= P\u0159id\u00e1 p\u0159ed spu\u0161t\u011bn\u00edm parametr aplikace. +BOParam= P\u0159id\u00e1 p\u0159ed spu\u0161t\u011bn\u00edm parametr appletu. +BOProperty= P\u0159ed spu\u0161t\u011bn\u00edm nastav\u00ed syst\u00e9movou vlastnost. +BOUpdate= Zkontroluje aktualizace. +BOLicense= Zobraz\u00ed licenci GPL a ukon\u010d\u00ed aplikaci. +BOVerbose= Zapne podrobn\u00fd v\u00fdstup. +BOAbout= Uk\u00e1\u017ee vzorovou aplikaci. +BONosecurity= Vypne zabezpe\u010den\u00e9 b\u011bhov\u00e9 prost\u0159ed\u00ed. +BONoupdate= Vypne kontrolu aktualizac\u00ed. +BOHeadless= Vypne ve\u0161ker\u00e9 grafick\u00e9 prvky u\u017eiv. rozhran\u00ed IcedTea-Web. +BOStrict= Zapne striktn\u00ed kontrolu souborov\u00e9ho form\u00e1tu JNLP. +BOViewer= Zobraz\u00ed prohl\u00ed\u017ee\u010d d\u016fv\u011bryhodn\u00fdch certifik\u00e1t\u016f. +BXnofork= Zak\u00e1\u017ee vytv\u00e1\u0159en\u00ed jin\u00fdch prost\u0159ed\u00ed JVM. +BXclearcache= Vy\u010dist\u00ed vyrovn\u00e1vac\u00ed pam\u011b\u0165 aplikace JNLP. +BXignoreheaders= Vynech\u00e1 ov\u011b\u0159ov\u00e1n\u00ed hlavi\u010dky souboru JAR. +BOHelp= Vyp\u00ed\u0161e zadanou zpr\u00e1vu do konzole a ukon\u010d\u00ed aplikaci. + +# Cache +CAutoGen=vygenerov\u00e1no automaticky \u2013 nem\u011bnit +CNotCacheable={0} nen\u00ed zdroj, kter\u00fd lze zapsat do vyrovn\u00e1vac\u00ed pam\u011bti. +CDownloading=Prob\u00edh\u00e1 stahov\u00e1n\u00ed. +CComplete=Dokon\u010deno +CChooseCache=Zvolit adres\u00e1\u0159 pro vyrovn\u00e1vac\u00ed pam\u011b\u0165... +CChooseCacheInfo=Netx pot\u0159ebuje um\u00edst\u011bn\u00ed pro uchov\u00e1v\u00e1n\u00ed soubor\u016f vyrovn\u00e1vac\u00ed pam\u011bti. +CChooseCacheDir=Adres\u00e1\u0159 vyrovn\u00e1vac\u00ed pam\u011bti +CCannotClearCache=Moment\u00e1ln\u011b nelze vy\u010distit vyrovn\u00e1vac\u00ed pam\u011b\u0165. +CFakeCache=Vyrovn\u00e1vac\u00ed pam\u011b\u0165 je po\u0161kozena. Prob\u00edh\u00e1 oprava. +CFakedCache=Po\u0161kozen\u00e1 vyrovn\u00e1vac\u00ed pam\u011b\u0165 byla opravena. D\u016frazn\u011b doporu\u010dujeme co nejd\u0159\u00edve spustit p\u0159\u00edkaz \u201ejavaws -Xclearcache\u201c a pak znovu spustit aplikaci. + +# Security +SFileReadAccess=Aplikace vy\u017eaduje p\u0159\u00edstup ke \u010dten\u00ed souboru {0}. Chcete tuto akci povolit? +SFileWriteAccess=Aplikace vy\u017eaduje p\u0159\u00edstup k zapisov\u00e1n\u00ed do souboru {0}. Chcete tuto akci povolit? +SDesktopShortcut=Aplikace vy\u017eaduje opr\u00e1vn\u011bn\u00ed k vytvo\u0159en\u00ed spou\u0161t\u011bc\u00edho souboru na plo\u0161e. Chcete tuto akci povolit? +SSigUnverified=Digit\u00e1ln\u00ed podpis aplikace nelze ov\u011b\u0159it. Chcete aplikaci spustit? +SSigVerified=Digit\u00e1ln\u00ed podpis aplikace byl ov\u011b\u0159en. Chcete aplikaci spustit? +SSignatureError=Digit\u00e1ln\u00ed podpis aplikace obsahuje chybu. Chcete aplikaci spustit? +SUntrustedSource=Digit\u00e1ln\u00ed podpis nelze ov\u011b\u0159it pomoc\u00ed d\u016fv\u011bryhodn\u00e9ho zdroje. Aplikaci spus\u0165te, pouze pokud v\u011b\u0159\u00edte p\u016fvodu aplikace. +SWarnFullPermissionsIgnorePolicy=Spou\u0161t\u011bn\u00e9mu k\u00f3du budou ud\u011blena pln\u00e1 opr\u00e1vn\u011bn\u00ed bez ohledu na p\u0159\u00edpadn\u00e1 va\u0161e vlastn\u00ed pravidla chov\u00e1n\u00ed prost\u0159ed\u00ed Java. +STrustedSource=Digit\u00e1ln\u00ed podpis byl ov\u011b\u0159en pomoc\u00ed d\u016fv\u011bryhodn\u00e9ho zdroje. +SClipboardReadAccess=Aplikace po\u017eaduje p\u0159\u00edstup ke \u010dten\u00ed syst\u00e9mov\u00e9 schr\u00e1nky. Chcete tuto akci povolit? +SClipboardWriteAccess=Aplikace vy\u017eaduje p\u0159\u00edstup k zapisov\u00e1n\u00ed do syst\u00e9mov\u00e9 schr\u00e1nky. Chcete tuto akci povolit? +SPrinterAccess=Aplikace vy\u017eaduje p\u0159\u00edstup k tisk\u00e1rn\u011b. Chcete tuto akci povolit? +SNetworkAccess=Aplikace vy\u017eaduje povolen\u00ed k vytvo\u0159en\u00ed spojen\u00ed s {0}. Chcete tuto akci povolit? +SNoAssociatedCertificate=<\u017e\u00e1dn\u00fd p\u0159idru\u017een\u00fd certifik\u00e1t> +SUnverified=(neov\u011b\u0159eno) +SAlwaysTrustPublisher=V\u017edy d\u016fv\u011b\u0159ovat obsahu od tohoto vydavatele +SHttpsUnverified=Certifik\u00e1t HTTPS webu nelze ov\u011b\u0159it. +SRememberOption=Zapamatovat si tuto volbu? +SRememberAppletOnly=Pro applet +SRememberCodebase=Pro web {0} +SUnsignedSummary=Do\u0161lo k pokusu o spu\u0161t\u011bn\u00ed nepodepsan\u00e9 aplikace Java. +SUnsignedDetail=Do\u0161lo k pokusu o spu\u0161t\u011bn\u00ed nepodepsan\u00e9 aplikace z n\u00e1sleduj\u00edc\u00edho um\u00edst\u011bn\u00ed:
\u00a0\u00a0{0}
Str\u00e1nka, kter\u00e1 p\u0159edala tento po\u017eadavek:
\u00a0\u00a0{1}

Doporu\u010dujeme, abyste spou\u0161t\u011bli aplikace pouze z web\u016f, kter\u00fdm d\u016fv\u011b\u0159ujete. +SUnsignedAllowedBefore=Tento applet jste ji\u017e d\u0159\u00edve povolili. +SUnsignedRejectedBefore=Tento applet jste ji\u017e d\u0159\u00edve odm\u00edtli. +SUnsignedQuestion=Povolit spu\u0161t\u011bn\u00ed appletu? +SNotAllSignedSummary=Podeps\u00e1ny jsou jen \u010d\u00e1sti k\u00f3du t\u00e9to aplikace. +SNotAllSignedDetail=Tato aplikace obsahuje podepsan\u00fd i nepodepsan\u00fd k\u00f3d. Podepsan\u00fd k\u00f3d je bezpe\u010dn\u00fd, pokud d\u016fv\u011b\u0159ujete poskytovateli tohoto k\u00f3du. Nepodepsan\u00e9 \u010d\u00e1sti mohou obsahovat k\u00f3d, kter\u00fd nen\u00ed pod kontrolou d\u016fv\u011bryhodn\u00e9ho poskytovatele. +SNotAllSignedQuestion=Chcete p\u0159esto pokra\u010dovat a spustit aplikaci? +SAuthenticationPrompt=Server {0} na adrese {1} vy\u017eaduje ov\u011b\u0159en\u00ed. Zpr\u00e1va: \u201e{2}\u201c +SJNLPFileIsNotSigned=Tato aplikace obsahuje digit\u00e1ln\u00ed podpis, v r\u00e1mci kter\u00e9ho v\u0161ak nen\u00ed podeps\u00e1n spou\u0161t\u011bn\u00fd soubor JNLP. + +# Security - used for the More Information dialog +SBadKeyUsage=Zdroj obsahuje polo\u017eky, u nich\u017e roz\u0161\u00ed\u0159en\u00ed pou\u017eit\u00ed kl\u00ed\u010de KeyUsage certifik\u00e1tu podepisovatele nedovoluje podeps\u00e1n\u00ed k\u00f3du. +SBadExtendedKeyUsage=Zdroj obsahuje polo\u017eky, u nich\u017e roz\u0161\u00ed\u0159en\u00ed pou\u017eit\u00ed kl\u00ed\u010de ExtendedKeyUsage certifik\u00e1tu podepisovatele nedovoluje podeps\u00e1n\u00ed k\u00f3du. +SBadNetscapeCertType=Zdroj obsahuje polo\u017eky, u nich\u017e roz\u0161\u00ed\u0159en\u00ed pou\u017eit\u00ed kl\u00ed\u010de NetscapeCertType certifik\u00e1tu podepisovatele nedovoluje podeps\u00e1n\u00ed k\u00f3du. +SHasExpiredCert=Platnost digit\u00e1ln\u00edho podpisu vypr\u0161ela. +SHasExpiringCert=Zdroje obsahuj\u00ed polo\u017eky, u nich\u017e vypr\u0161\u00ed platnost certifik\u00e1tu jejich podepisovatele do \u0161esti m\u011bs\u00edc\u016f. +SNotYetValidCert=Zdroje obsahuj\u00ed polo\u017eky, u nich\u017e je\u0161t\u011b nen\u00ed platn\u00fd certifik\u00e1t podepisovatele. +SUntrustedCertificate=Digit\u00e1ln\u00ed podpis byl vytvo\u0159en pomoc\u00ed ned\u016fv\u011bryhodn\u00e9ho certifik\u00e1tu. +STrustedCertificate=Digit\u00e1ln\u00ed podpis byl vytvo\u0159en pomoc\u00ed d\u016fv\u011bryhodn\u00e9ho certifik\u00e1tu. +SCNMisMatch=O\u010dek\u00e1van\u00fd n\u00e1zev hostitele pro tento certifik\u00e1t je: {0}.
Adresa, ke kter\u00e9 se navazuje p\u0159ipojen\u00ed: {1}. +SRunWithoutRestrictions=Tato aplikace bude spu\u0161t\u011bna bez obvykl\u00fdch bezpe\u010dnostn\u00edch omezen\u00ed aplikovan\u00fdch platformou Java. +SCertificateDetails=Podrobnosti certifik\u00e1tu + +# Security - certificate information +SIssuer=Vydavatel +SSerial=S\u00e9riov\u00e9 \u010d\u00edslo +SMD5Fingerprint=Otisk MD5 +SSHA1Fingerprint=Otisk SHA1 +SSignature=Podpis +SSignatureAlgorithm=Algoritmus podpisu +SSubject=Subjekt +SValidity=Platnost + +# Certificate Viewer +CVCertificateViewer=Certifik\u00e1ty +CVCertificateType=Typ certifik\u00e1tu +CVDetails=Podrobnosti +CVExport=Exportovat +CVExportPasswordMessage=Zadejte heslo pro ochranu souboru s kl\u00ed\u010di: +CVImport=Importovat +CVImportPasswordMessage=Zadejte heslo pro p\u0159\u00edstup k souboru: +CVIssuedBy=Vydavatel: +CVIssuedTo=P\u0159\u00edjemce: +CVPasswordTitle=Vy\u017eadov\u00e1no ov\u011b\u0159en\u00ed +CVRemove=Odstranit +CVRemoveConfirmMessage=Skute\u010dn\u011b chcete odstranit vybran\u00fd certifik\u00e1t? +CVRemoveConfirmTitle=Potvrzen\u00ed odstran\u011bn\u00ed certifik\u00e1tu +CVUser=U\u017eivatel +CVSystem=Syst\u00e9m + +#KeyStores: see KeyStores.java +KS=\u00dalo\u017ei\u0161t\u011b kl\u00ed\u010d\u016f +KSCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty +KSJsseCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty JSSE +KSCaCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty Root CA +KSJsseCaCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty JSSE Root CA +KSClientCerts=Certifik\u00e1ty pro ov\u011b\u0159en\u00ed klienta + +# Deployment Configuration messages +DCIncorrectValue=Vlastnost {0} m\u00e1 nespr\u00e1vnou hodnotu {1}. Mo\u017en\u00e9 hodnoty {2}. +DCInternal=Vnit\u0159n\u00ed chyba: {0} +DCSourceInternal= +DCUnknownSettingWithName=Vlastnost {0} je nezn\u00e1m\u00e1. + +# Value Validator messages. Messages should follow "Possible values ..." +VVPossibleValues=Mo\u017en\u00e9 hodnoty {0} +VVPossibleBooleanValues=jsou {0} nebo {1}. +VVPossibleFileValues=obsahuj\u00ed absolutn\u00ed um\u00edst\u011bn\u00ed souboru. +VVPossibleRangedIntegerValues=jsou v rozmez\u00ed {0} a\u017e {1} (v\u010detn\u011b). +VVPossibleUrlValues=obsahuj\u00ed jakoukoliv platnou adresu URL (nap\u0159. http://icedtea.classpath.org/hg/). + +# Control Panel - Main +CPMainDescriptionShort=Nastaven\u00ed aplikace IcedTea-Web +CPMainDescriptionLong=Nastaven\u00ed fungov\u00e1n\u00ed z\u00e1suvn\u00e9ho modulu prohl\u00ed\u017ee\u010de (IcedTeaNPPlugin) a rozhran\u00ed javaws (NetX) + +# Control Panel - Tab Descriptions +CPAboutDescription=Zobrazen\u00ed informace o verzi ovl\u00e1dac\u00edho panelu IcedTea +CPNetworkSettingsDescription=Nastaven\u00ed s\u00edt\u011b v\u010detn\u011b zp\u016fsobu p\u0159ipojen\u00ed aplikace IcedTea-Web k Internetu a p\u0159\u00edpadn\u00e9ho pou\u017eit\u00ed proxy server\u016f +CPTempInternetFilesDescription=Ukl\u00e1d\u00e1n\u00ed dat aplikac\u00ed prost\u0159ed\u00edm Java, aby bylo p\u0159i p\u0159\u00ed\u0161t\u00edm spu\u0161t\u011bn\u00ed umo\u017en\u011bno rychlej\u0161\u00ed na\u010dten\u00ed +CPJRESettingsDescription=Zobrazen\u00ed a spravov\u00e1n\u00ed verze a nastaven\u00ed prost\u0159ed\u00ed Java Runtime Environment pro aplikace a applety Java +CPCertificatesDescription=Pou\u017eit\u00ed certifik\u00e1t\u016f k pozitivn\u00ed identifikaci v\u00e1s, certifikac\u00ed, certifika\u010dn\u00edch autorit a vydavatel\u016f +CPSecurityDescription=Konfigurace nastaven\u00ed zabezpe\u010den\u00ed +CPDebuggingDescription=Zapnut\u00ed mo\u017enost\u00ed pom\u00e1haj\u00edc\u00edch p\u0159i lad\u011bn\u00ed +CPDesktopIntegrationDescription=Nastaven\u00ed, zda m\u00e1 b\u00fdt povoleno vytvo\u0159en\u00ed z\u00e1stupce na plo\u0161e +CPJVMPluginArguments=Nastaven\u00ed parametr\u016f prost\u0159ed\u00ed JVM pro z\u00e1suvn\u00fd modul. +CPJVMitwExec=Nastaven\u00ed prost\u0159ed\u00ed JVM pro aplikaci IcedTea-Web (pracuje nejl\u00e9pe s prost\u0159ed\u00edm OpenJDK) +CPJVMitwExecValidation=Ov\u011b\u0159en\u00ed prost\u0159ed\u00ed JVM pro aplikaci IcedTea-Web +CPJVMPluginSelectExec=Volba prost\u0159ed\u00ed JVM pro aplikaci IcedTea-Web +CPJVMnone=\u017d\u00e1dn\u00e9 v\u00fdsledky ov\u011b\u0159en\u00ed pro cestu +CPJVMvalidated=V\u00fdsledky ov\u011b\u0159en\u00ed pro cestu +CPJVMvalueNotSet=Hodnota nen\u00ed nastavena. Bude pou\u017eito p\u0159edvolen\u00e9 prost\u0159ed\u00ed JVM. +CPJVMnotLaunched=Chyba: proces nebyl spu\u0161t\u011bn. V\u00edce informac\u00ed naleznete ve v\u00fdstupu konzole. +CPJVMnoSuccess=Chyba: proces nebyl \u00fasp\u011b\u0161n\u011b ukon\u010den. Podrobnosti naleznete ve v\u00fdstupu konzole, av\u0161ak va\u0161e prost\u0159ed\u00ed Java nen\u00ed spr\u00e1vn\u011b nastaveno. +CPJVMopenJdkFound=Excelentn\u00ed! Bylo detekov\u00e1no prost\u0159ed\u00ed OpenJDK. +CPJVMoracleFound=V\u00fdborn\u011b! Bylo detekov\u00e1no prost\u0159ed\u00ed Oracle Java. +CPJVMibmFound=Dob\u0159e! Bylo detekov\u00e1no prost\u0159ed\u00ed IBM Java. +CPJVMgijFound=Varov\u00e1n\u00ed! Bylo detekov\u00e1no prost\u0159ed\u00ed gij. +CPJVMstrangeProcess=Zadan\u00e1 cesta je spustiteln\u00fd proces, ov\u0161em nebyl rozpozn\u00e1n jako aplikace Java. Ve v\u00fdstupu konzole ov\u011b\u0159te verzi prost\u0159ed\u00ed Java. +CPJVMnotDir=Chyba: cesta, kterou jste vybrali, nen\u00ed adres\u00e1\u0159. +CPJVMisDir=OK, cesta, kterou jste vybrali, je adres\u00e1\u0159. +CPJVMnoJava=Chyba: adres\u00e1\u0159, kter\u00fd jste vybrali, neobsahuje podadres\u00e1\u0159 a soubor \u201ebin/java\u201c. +CPJVMjava=OK, adres\u00e1\u0159, kter\u00fd jste vybrali, obsahuje podadres\u00e1\u0159 a soubor \u201ebin/java\u201c. +CPJVMnoRtJar=Chyba: adres\u00e1\u0159, kter\u00fd jste vybrali, neobsahuje podadres\u00e1\u0159 a soubor \u201elib/rt.jar\u201c. +CPJVMrtJar=OK, adres\u00e1\u0159, kter\u00fd jste vybrali, obsahuje podadres\u00e1\u0159 a soubor \u201elib/rt.jar\u201c. +CPJVMPluginAllowTTValidation=Povolit ov\u011b\u0159ov\u00e1n\u00ed v pr\u016fb\u011bhu psan\u00ed +CPJVMNotokMessage1=Zadali jste neplatnou hodnotu ({0}) prost\u0159ed\u00ed JDK. Chybov\u00e1 zpr\u00e1va: +CPJVMNotokMessage2=Tuto zpr\u00e1vu vid\u00edte pravd\u011bpodobn\u011b proto\u017ee:
* V\u00e1\u0161 syst\u00e9m nepro\u0161el n\u011bkter\u00fdm z ov\u011b\u0159ovac\u00edch test\u016f
* Bylo detekov\u00e1no jin\u00e9 prost\u0159ed\u00ed ne\u017e OpenJDK
S neplatn\u00fdm prost\u0159ed\u00edm JDK nebude se pravd\u011bpodobn\u011b nebude aplikace IcedTea-Web schopna spustit.
Budete muset upravit nebo odstranit vlastnost {0} ve va\u0161em konfigura\u010dn\u00edm souboru {1}.
M\u011bli byste ve sv\u00e9m syst\u00e9mu nal\u00e9zt prost\u0159ed\u00ed OpenJDK, nebo byste m\u011bli dob\u0159e v\u011bd\u011bt, co d\u011bl\u00e1te. +CPJVMconfirmInvalidJdkTitle=Potvrzen\u00ed neplatn\u00e9ho prost\u0159ed\u00ed JDK +CPJVMconfirmReset=Obnovit v\u00fdchoz\u00ed nastaven\u00ed? + +# Control Panel - Buttons +CPButAbout=O aplikaci IcedTea-Web +CPButNetworkSettings=Nastaven\u00ed s\u00edt\u011b... +CPButSettings=Nastaven\u00ed... +CPButView=Zobrazit... +CPButCertificates=Certifik\u00e1ty... + +# Control Panel - Headers +CPHead=Ovl\u00e1dac\u00ed panel IcedTea-Web +CPHeadAbout=\u00a0O aplikaci IcedTea-Web\u00a0 +CPHeadNetworkSettings=\u00a0Nastaven\u00ed proxy server\u016f s\u00edt\u011b\u00a0 +CPHeadTempInternetFiles=\u00a0Do\u010dasn\u00e9 soubory Internetu\u00a0 +CPHeadJRESettings=\u00a0Nastaven\u00ed prost\u0159ed\u00ed Java Runtime Environment\u00a0 +CPHeadCertificates=\u00a0Certifik\u00e1ty\u00a0 +CPHeadDebugging=\u00a0Nastaven\u00ed lad\u011bn\u00ed\u00a0 +CPHeadDesktopIntegration=\u00a0Integrace s pracovn\u00ed plochou\u00a0 +CPHeadSecurity=\u00a0Nastaven\u00ed zabezpe\u010den\u00ed\u00a0 +CPHeadJVMSettings=\u00a0Nastaven\u00ed JVM\u00a0 + +# Control Panel - Tabs +CPTabAbout=O aplikaci IcedTea-Web +CPTabCache=Vyrovn\u00e1vac\u00ed pam\u011b\u0165 +CPTabCertificate=Certifik\u00e1ty +CPTabClassLoader=Zavad\u011b\u010de t\u0159\u00edd +CPTabDebugging=Lad\u011bn\u00ed +CPTabDesktopIntegration=Integrace s pracovn\u00ed plochou +CPTabNetwork=S\u00ed\u0165 +CPTabRuntimes=Moduly runtime +CPTabSecurity=Zabezpe\u010den\u00ed +CPTabJVMSettings=Nastaven\u00ed JVM + +# Control Panel - AboutPanel +CPAboutInfo=Toto je ovl\u00e1dac\u00ed panel umo\u017e\u0148uj\u00edc\u00ed nastavit deployment.properties.
Dokud nebudou implementov\u00e1ny v\u0161echny funkce, n\u011bkter\u00e9 z nich nebudou \u00fa\u010dinn\u00e9.
V sou\u010dasnosti nen\u00ed podporov\u00e1no pou\u017e\u00edv\u00e1n\u00ed v\u00edce prost\u0159ed\u00ed JRE.
+ +# Control Panel - AdvancedProxySettings +APSDialogTitle=Nastaven\u00ed s\u00edt\u011b +APSServersPanel=Servery +APSProxyTypeLabel=Typ +APSProxyAddressLabel=Adresa proxy serveru +APSProxyPortLabel=Port proxy serveru +APSLabelHTTP=HTTP +APSLabelSecure=Zabezpe\u010den\u00fd +APSLabelFTP=FTP +APSLabelSocks=Socks +APSSameProxyForAllProtocols=Pou\u017e\u00edt stejn\u00fd proxy server pro v\u0161echny protokoly +APSExceptionsLabel=V\u00fdjimky +APSExceptionsDescription=Nepou\u017e\u00edvat proxy server pro adresy za\u010d\u00ednaj\u00edc\u00ed na +APSExceptionInstruction=Odd\u011blte ka\u017edou polo\u017eku st\u0159edn\u00edkem. + +# Control Panel - DebugginPanel +DPEnableTracing=Zapnout trasov\u00e1n\u00ed +DPEnableLogging=Zapnout protokolov\u00e1n\u00ed +DPDisable=Vypnout +DPHide=Skr\u00fdt p\u0159i spou\u0161t\u011bn\u00ed +DPShow=Zobrazit p\u0159i spou\u0161t\u011bn\u00ed +DPJavaConsole=Konzola Java + +# Control Panel - DesktopShortcutPanel +DSPNeverCreate=Nikdy nevytv\u00e1\u0159et +DSPAlwaysAllow=V\u017edy povolit +DSPAskUser=Dot\u00e1zat se u\u017eivatele +DSPAskIfHinted=Dot\u00e1zat se v p\u0159\u00edpad\u011b pot\u0159eby +DSPAlwaysIfHinted=V\u017edy v p\u0159\u00edpad\u011b pot\u0159eby + +# Control Panel - NetworkSettingsPanel +NSDescription-1=Nezn\u00e1m\u00e9 nastaven\u00ed +NSDescription0=Pou\u017eit\u00ed p\u0159\u00edm\u00e9ho spojen\u00ed +NSDescription1=Potla\u010den\u00ed nastaven\u00ed proxy server\u016f v prohl\u00ed\u017ee\u010di +NSDescription2=Pou\u017eit\u00ed skriptu pro automatickou konfiguraci proxy serveru v zadan\u00e9m um\u00edst\u011bn\u00ed +NSDescription3=Pou\u017eit\u00ed nastaven\u00ed proxy server\u016f ve v\u00fdchoz\u00edm prohl\u00ed\u017ee\u010di k p\u0159ipojen\u00ed k Internetu +NSAddress=Adresa +NSPort=Port +NSAdvanced=Pokro\u010dil\u00e9 +NSBypassLocal=Obej\u00edt proxy server pro m\u00edstn\u00ed adresy +NSDirectConnection=P\u0159\u00edm\u00e9 spojen\u00ed +NSManualProxy=Ru\u010dn\u00ed nastaven\u00ed proxy serveru +NSAutoProxy=Skript pro automatickou konfiguraci proxy serveru +NSBrowserProxy=Pou\u017e\u00edt nastaven\u00ed v prohl\u00ed\u017ee\u010di +NSScriptLocation=Um\u00edst\u011bn\u00ed skriptu + +# Control Panel - SecurityGeneralPanel +SGPAllowUserGrantSigned=Povolit u\u017eivatel\u016fm ud\u011blovat opr\u00e1vn\u011bn\u00ed podepsan\u00e9mu obsahu +SGPAllowUserGrantUntrust=Povolit u\u017eivatel\u016fm ud\u011blovat opr\u00e1vn\u011bn\u00ed obsahu z ned\u016fv\u011bryhodn\u00e9ho zdroje +SGPUseBrowserKeystore=Pou\u017e\u00edt certifik\u00e1ty a kl\u00ed\u010de v \u00falo\u017ei\u0161ti kl\u00ed\u010d\u016f prohl\u00ed\u017ee\u010de (nen\u00ed podporov\u00e1no) +SGPUsePersonalCertOneMatch=Pou\u017e\u00edt osobn\u00ed certifik\u00e1t automaticky, pokud dotazu serveru odpov\u00edd\u00e1 pouze jeden certifik\u00e1t (nen\u00ed podporov\u00e1no) +SGPWarnCertHostMismatch=Zobrazit varov\u00e1n\u00ed, pokud certifik\u00e1t webu neodpov\u00edd\u00e1 n\u00e1zvu hostitele +SGPShowValid=Zobrazit certifik\u00e1t webu, i kdy\u017e je certifik\u00e1t platn\u00fd (nen\u00ed podporov\u00e1no) +SGPShowSandboxWarning=Zobrazit varovn\u00fd prou\u017eek izolovan\u00e9ho prostoru (sandbox) +SGPAllowUserAcceptJNLPSecurityRequests=Povolit u\u017eivatel\u016fm p\u0159ij\u00edmat bezpe\u010dnostn\u00ed po\u017eadavky JNLP +SGPCheckCertRevocationList=Zkontrolovat zneplatn\u011bn\u00ed certifik\u00e1t\u016f pomoc\u00ed seznamu zneplatn\u011bn\u00ed certifik\u00e1t\u016f (CRL) (nen\u00ed podporov\u00e1no) +SGPEnableOnlineCertValidate=Zapnout online ov\u011b\u0159en\u00ed certifik\u00e1tu (nen\u00ed podporov\u00e1no) +SGPEnableTrustedPublisherList=Zapnout seznam d\u016fv\u011bryhodn\u00fdch vydavatel\u016f (nen\u00ed podporov\u00e1no) +SGPEnableBlacklistRevocation=Zapnout kontrolu zneplatn\u011bn\u00ed oproti \u010dern\u00e9 listin\u011b (nen\u00ed podporov\u00e1no) +SGPEnableCachingPassword=Zapnout ukl\u00e1d\u00e1n\u00ed ov\u011b\u0159ovac\u00edch hesel do vyrovn\u00e1vac\u00ed pam\u011bti (nen\u00ed podporov\u00e1no) +SGPUseSSL2=Pou\u017e\u00edt form\u00e1t ClientHello kompatibiln\u00ed se \u0161ifrov\u00e1n\u00edm SSL 2.0 (nen\u00ed podporov\u00e1no) +SGPUseSSL3=Pou\u017e\u00edt \u0161ifrov\u00e1n\u00ed SSL 3.0 (nen\u00ed podporov\u00e1no) +SGPUseTLS1=Pou\u017e\u00edt \u0161ifrov\u00e1n\u00ed TLS 1.0 (nen\u00ed podporov\u00e1no) + +# Control Panel - TemporaryInternetFilesPanel +TIFPEnableCache=Uchov\u00e1vat do\u010dasn\u00e9 soubory v po\u010d\u00edta\u010di +TIFPLocation=\u00a0Um\u00edst\u011bn\u00ed\u00a0 +TIFPLocationLabel=Vyberte um\u00edst\u011bn\u00ed, kde maj\u00ed b\u00fdt do\u010dasn\u00e9 soubory uchov\u00e1v\u00e1ny. +TIFPChange=Zm\u011bnit +TIFPDiskSpace=\u00a0M\u00edsto na disku\u00a0 +TIFPCompressionLevel=Vyberte \u00farove\u0148 komprese pro soubory JAR +TIFPNone=\u017d\u00e1dn\u00e1 +TIFPMax=Maxim\u00e1ln\u00ed +TIFPCacheSize=Nastavte velikost m\u00edsta na disku ur\u010den\u00e9ho pro do\u010dasn\u00e9 soubory. +TIFPDeleteFiles=Smazat soubory +TIFPViewFiles=Zobrazit soubory... + +# Control Panel - Cache Viewer +CVCPDialogTitle=Prohl\u00ed\u017ee\u010d vyrovn\u00e1vac\u00ed pam\u011bti +CVCPButRefresh=Obnovit +CVCPButDelete=Vymazat +CVCPColLastModified=Posledn\u00ed zm\u011bna +CVCPColSize=Velikost (v bajtech) +CVCPColDomain=Dom\u00e9na +CVCPColType=Typ +CVCPColPath=Cesta +CVCPColName=N\u00e1zev + +# Control Panel - Misc. +CPJRESupport=Aplikace IcedTea-Web v sou\u010dasnosti nepodporuje pou\u017eit\u00ed v\u00edce prost\u0159ed\u00ed JRE. +CPInvalidPort=Zad\u00e1no neplatn\u00e9 \u010d\u00edslo portu\n[Platn\u00e1 \u010d\u00edsla port\u016f: 1 \u2013 65535] +CPInvalidPortTitle=Chyba na vstupu + +# command line control panel +CLNoInfo=Nejsou dostupn\u00e9 \u017e\u00e1dn\u00e9 informace (je pou\u017eit\u00e1 volba platn\u00e1?). +CLValue=Hodnota: {0} +CLValueSource=Zdroj: {0} +CLDescription=Popis: {0} +CLUnknownCommand=Nezn\u00e1m\u00fd p\u0159\u00edkaz {0} +CLUnknownProperty=Nezn\u00e1m\u00fd n\u00e1zev vlastnosti {0} +CLWarningUnknownProperty=VAROV\u00c1N\u00cd: Nezn\u00e1m\u00fd n\u00e1zev vlastnosti {0}. Prob\u00edh\u00e1 vytv\u00e1\u0159en\u00ed nov\u00e9 vlastnosti. +CLNoIssuesFound=Nebyly zaznamen\u00e1ny \u017e\u00e1dn\u00e9 pot\u00ed\u017ee. +CLIncorrectValue=Vlastnost {0} m\u00e1 nespr\u00e1vnou hodnotu {1}. Mo\u017en\u00e9 hodnoty {2}. +CLListDescription=Zobraz\u00ed seznam v\u0161ech n\u00e1zv\u016f vlastnost\u00ed a hodnot, kter\u00e9 jsou vyu\u017e\u00edv\u00e1ny aplikac\u00ed IcedTea-Web. +CLGetDescription=Zobraz\u00ed hodnoty pro n\u00e1zev vlastnosti. +CLSetDescription=P\u0159i\u0159ad\u00ed hodnotu k n\u00e1zvu vlastnosti (pokud je to mo\u017en\u00e9). Kontrola platnosti hodnoty - pokud spr\u00e1vce vlastnost uzamkl, tato funkce nebude m\u00edt \u017e\u00e1dn\u00fd efekt. From adomurad at redhat.com Thu May 2 06:31:46 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 02 May 2013 09:31:46 -0400 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <518236B1.8070700@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <5180288C.3090204@redhat.com> <518236B1.8070700@redhat.com> Message-ID: <51826AC2.1090207@redhat.com> > [..snip..] > +package net.sourceforge.jnlp; > + > +import org.junit.Assert; > +import org.junit.Test; > + > +public class VersionTest { > + > + private static boolean[] results = {true, > + true, > + false, > + true, > + false, > + true, > + false, > + true, > + false, > + false, > + false, > + false, > + true, > + true, > + true, > + true, > + true, > + true, > + false, > + true}; Please remove this (it is hard to understand) in favour of: - A list of Version's that match Version("1.1* 1.3*") - A list of Version's that do not match Version("1.1* 1.3*") - A list of Version's that match Version("1.2+") - A list of Version's that do not match Version("1.2+") Unless you have a different idea, of course. > + private static Version jvms[] = { > + new Version("1.1* 1.3*"), > + new Version("1.2+"),}; > + private static Version versions[] = { > + new Version("1.1"), > + new Version("1.1.8"), > + new Version("1.2"), > + new Version("1.3"), > + new Version("2.0"), > + new Version("1.3.1"), > + new Version("1.2.1"), > + new Version("1.3.1-beta"), > + new Version("1.1 1.2"), > + new Version("1.2 1.3"),}; > + > + @Test > + public void testMatches() { > + > + int i = 0; > + for (int j = 0; j < jvms.length; j++) { > + for (int v = 0; v < versions.length; v++) { > + i++; > + String debugOutput = i + " " + jvms[j].toString() + " "; > + if (!jvms[j].matches(versions[v])) { > + debugOutput += "!"; > + } > + debugOutput += "matches " + versions[v].toString(); > + ServerAccess.logOutputReprint(debugOutput); > + Assert.assertEquals(results[i - 1], > jvms[j].matches(versions[v])); > + } > + } > + > + > + } > +} > diff -r 3fa3d0fdce30 > tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > --- > a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > Tue Apr 30 11:31:28 2013 -0400 > +++ > b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > Thu May 02 11:38:23 2013 +0200 > @@ -1,54 +1,70 @@ > /* ResourceTrackerTest.java > -Copyright (C) 2012 Red Hat, Inc. > + Copyright (C) 2012 Red Hat, Inc. > > -This file is part of IcedTea. > + 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, version 2. > + 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, version 2. > > -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. > + 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. > + 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. > + 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. > + 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 net.sourceforge.jnlp.cache; > > +import java.io.ByteArrayOutputStream; > +import java.io.File; > +import java.io.IOException; > +import java.io.PrintStream; > import java.io.UnsupportedEncodingException; > +import java.net.HttpURLConnection; > import java.net.MalformedURLException; > import java.net.URISyntaxException; > import java.net.URL; > - > +import java.util.HashMap; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.ServerLauncher; > +import net.sourceforge.jnlp.Version; > +import net.sourceforge.jnlp.runtime.JNLPRuntime; > import net.sourceforge.jnlp.util.UrlUtils; > - > +import org.junit.AfterClass; > import org.junit.Assert; > +import org.junit.BeforeClass; > import org.junit.Test; > > -/** Test various corner cases of the parser */ > public class ResourceTrackerTest { > > + public static ServerLauncher testServer; > + public static ServerLauncher testServerWithBrokenHead; Thankyou :-)) > + private static PrintStream backedUpStream; > + private static ByteArrayOutputStream currentErrorStream; > + private static final String nameStub1 = "itw-server"; > + private static final String nameStub2 = "test-file"; > + > @Test > public void testNormalizeUrl() throws Exception { > URL[] u = getUrls(); > [..snip..] > Exception { > + redirectErr(); > + try { > + File fileForServerWithHeader = > File.createTempFile(nameStub1, nameStub2); > + File versiondFileForServerWithHeader = new > File(fileForServerWithHeader.getParentFile(), > fileForServerWithHeader.getName() + "-2.0"); versiond -> versioned Thanks. It may be a mouthful but it really is better IMO [..snip..] > + } catch (Exception ex) { > + ServerAccess.logException(ex); > + exception = ex; > + } > + Assert.assertNull("no exception expected - was" + exception, > exception); > + > + ServerLauncher serverLauncher > =ServerAccess.getIndependentInstance(System.getProperty("user.dir"), > ServerAccess.findFreePort()); > + try{ > + try { > + HttpUtils.consumeAndCloseConnectionSilently(new > HttpURLConnection(serverLauncher.getUrl("someIhopeReallyNotExistingUrlOnBlahBlahTestServerToMakeAdamHappy")) > { //:) Simple names please. 'NotExisting' or something. My point was that where you used 'blahblah' most people use 'foo', 'bar', or 'test'. Otherwise OK. You can push once these points are addressed IMO. Happy hacking, -Adam From jvanek at redhat.com Thu May 2 06:40:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 15:40:49 +0200 Subject: [rfc][icedtea-web] AWTHelper small modification In-Reply-To: <1367487965.2541.6.camel@jana-2-174.nrt.redhat.com> References: <1367337872.6039.22.camel@jana-2-174.nrt.redhat.com> <5181053A.6040702@redhat.com> <1367487965.2541.6.camel@jana-2-174.nrt.redhat.com> Message-ID: <51826CE1.6020502@redhat.com> Yup. Give more sense. Thank you. J. On 05/02/2013 11:46 AM, Jana Fabrikova wrote: > Hi, thank you for the comments, I have refactored the AWTHelper class > more, completely getting rid of the unnecessary variable initStrGiven > and the new patch is in the attachment. > > ChangeLog: > > 2013-05-02 Jana Fabrikova > > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: > refactoring - removing initStrGiven variable - now it only > matters if the initStr is null or not. Modifying the following > two methods: (charReaded) - if initStr is null the run method > can not be started from charReaded and the presence of initStr > is not checked in stdout. Method (getInitStrAsRule) returns rule > that is always true if initStr is null. > > cheers, > Jana > > On Wed, 2013-05-01 at 14:06 +0200, Jiri Vanek wrote: >> >On 04/30/2013 06:04 PM, Jana Fabrikova wrote: >>> > >Hello, I am sending only a small modification to the file AWTHelper, >>> > >part of AWTFramework, in dealing with an initialisation string (it can >>> > >be null or given), >>> > >thanks for any comments, >>> > >Jana >>> > > >>> > > >>> > >ChangeLog: >>> > > >>> > >2013-04-30 Jana Fabrikova >>> > > >>> > > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: >>> > > modifying the (charrReaded) method >>> > > >>> > > >>> > >modifying_AWTHelper_null_initStr.patch >>> > > >> >Hmm this does not seems to be correct. >> >a) This should allow awt helper to work with null "magic string" >> >b) this should allow awt helper to run without need of magic string. >> > >> >The (a) looks nearly ok, but I'm confused by initStrGiven variable. It jus disappeared from condition. So it is not needed any more? Then please remove it. >> >Or have it just slipped from condition accidentally? >> > >> >for (b) I'm not sure if it is enough - is it? >>> > > >>> > >diff -r 3fa3d0fdce30 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java >>> > >--- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 11:31:28 2013 -0400 >>> > >+++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 18:00:55 2013 +0200 >>> > >@@ -60,7 +60,7 @@ >>> > > public abstract class AWTHelper extends RulesFolowingClosingListener implements Runnable{ >>> > > >>> > > //attributes possibly set by user >>> > >- private String initStr = ""; >>> > >+ private String initStr = null; >>> > > private Color appletColor; >>> > > private BufferedImage marker; >>> > > private Point markerPosition; >>> > >@@ -171,6 +171,7 @@ >>> > > } catch (IOException e) { >>> > > throw new RuntimeException("AWTHelper could not read marker.png.",e); >>> > > } >>> > >+ >>> > > >>> > > this.appletWidth = appletWidth; >>> > > this.appletHeight = appletHeight; >>> > >@@ -206,7 +207,7 @@ >>> > > public void charReaded(char ch) { >>> > > sb.append(ch); >>> > > //is applet ready to start clicking? >>> > >- if (initStrGiven&& !actionStarted&& appletIsReady(sb.toString())) { >>> > >+ if ((initStr != null)&& !actionStarted&& appletIsReady(sb.toString())) { >> >also pelase keep code according to rules - spaces on both sides of logical operators >> > >>> > > try{ >>> > > actionStarted = true; >>> > > this.findAndActivateApplet(); >> > >> >Thank you for keeping teh awt helper classes more usable - it was not possible without second person to try it. >> > >> > Thank you >> > J. > > > modifying_AWTHelper_initStrnull.patch > > > diff -r 0e4641f585bf tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Thu May 02 11:16:36 2013 +0200 > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Thu May 02 11:37:45 2013 +0200 > @@ -60,7 +60,7 @@ > public abstract class AWTHelper extends RulesFolowingClosingListener implements Runnable{ > > //attributes possibly set by user > - private String initStr = ""; > + private String initStr = null; > private Color appletColor; > private BufferedImage marker; > private Point markerPosition; > @@ -75,7 +75,6 @@ > private BufferedImage screenshot; > private Robot robot; > private boolean appletFound = false; > - private boolean initStrGiven = false; //impossible to find in the output if not given > private boolean appletColorGiven = false; //impossible to search for color difference if not given > private boolean markerGiven = false; //impossible to find the applet if marker not given > private boolean appletDimensionGiven = false; > @@ -117,7 +116,6 @@ > this(); > > this.initStr = initStr; > - this.initStrGiven = true; > } > > /** > @@ -148,7 +146,6 @@ > this(icon, iconPosition, appletWidth, appletHeight); > > this.initStr = initString; > - this.initStrGiven = true; > } > > /** > @@ -176,7 +173,6 @@ > public AWTHelper(String initString, int appletWidth, int appletHeight){ > this(appletWidth, appletHeight); > this.initStr = initString; > - this.initStrGiven = true; > } > > /** > @@ -194,6 +190,8 @@ > * override of method charReaded (from RulesFolowingClosingListener) > * > * waiting for the applet, when applet is ready run action thread > + * (if initStr==null, do not check and do not call run) > + * > * when all the wanted strings are in the stdout, applet can be closed > * > * @param ch > @@ -202,7 +200,8 @@ > public void charReaded(char ch) { > sb.append(ch); > //is applet ready to start clicking? > - if (initStrGiven && !actionStarted && appletIsReady(sb.toString())) { > + //check and run applet only if initStr is not null > + if ((initStr != null) && !actionStarted && appletIsReady(sb.toString())) { > try{ > actionStarted = true; > this.findAndActivateApplet(); > @@ -241,22 +240,43 @@ > * @return > */ > public Rule getInitStrAsRule(){ > - return new ContainsRule(this.initStr); > + if( initStr != null ){ > + return new ContainsRule(this.initStr); > + }else{ > + return new Rule(){ > + > + @Override > + public void setRule(Object rule) { > + } > + > + @Override > + public boolean evaluate(Object upon) { > + return true; > + } > + > + @Override > + public String toPassingString() { > + return "nothing to check, initStr is null"; > + } > + > + @Override > + public String toFailingString() { > + return "nothing to check, initStr is null"; > + } > + > + } ; > + } > } > > //boolean controls getters > protected boolean appletIsReady(String content) { > - return (content.contains(initStr)); > + return this.getInitStrAsRule().evaluate(content); > } > > public boolean isActionStarted() { > return actionStarted; > } > > - public boolean isInitStrGiven(){ > - return initStrGiven; > - } > - > public boolean isAppletColorGiven(){ > return appletColorGiven; > } > @@ -292,7 +312,6 @@ > > public void setInitStr(String initStr) { > this.initStr = initStr; > - this.initStrGiven = true; > } > > public void setMarker(BufferedImage marker, Point markerPosition) { > From adomurad at redhat.com Thu May 2 06:05:57 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 02 May 2013 09:05:57 -0400 Subject: Upcoming releases of IcedTea-Web 1.2, 1.3, 1.4 In-Reply-To: References: <515E921C.2030207@redhat.com> <51659134.8050509@redhat.com> <516E6419.5050409@redhat.com> <517AC48C.6060006@redhat.com> Message-ID: <518264B5.1010405@redhat.com> On 05/02/2013 03:32 AM, helpcrypto helpcrypto wrote: > > * Plugin > - PR1198: JSObject is not passed to javascript correctly > > > This one has caused lot of work, isnt it? (and still causing it) :P Nah. The specific bug @PR1198 was wrapped up cleanly. However, different problems in icedtea-web to-javascript exist. The whole to-javascript communication part of ITW does cause a lot of work, though. Happy hacking, -Adam -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/fe5f64e5/attachment.html From jfabriko at icedtea.classpath.org Thu May 2 06:52:45 2013 From: jfabriko at icedtea.classpath.org (jfabriko at icedtea.classpath.org) Date: Thu, 02 May 2013 13:52:45 +0000 Subject: /hg/icedtea-web: refactoring of AWTHelper (class from AWTFramework) Message-ID: changeset 01c529dee2b7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=01c529dee2b7 author: Jana Fabrikova date: Thu May 02 15:55:51 2013 +0200 refactoring of AWTHelper (class from AWTFramework) diffstat: ChangeLog | 10 ++ tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 45 +++++++--- 2 files changed, 42 insertions(+), 13 deletions(-) diffs (138 lines): diff -r 55c943c320fd -r 01c529dee2b7 ChangeLog --- a/ChangeLog Thu May 02 15:31:55 2013 +0200 +++ b/ChangeLog Thu May 02 15:55:51 2013 +0200 @@ -1,3 +1,13 @@ +2013-05-02 Jana Fabrikova + + * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: + refactoring - removing initStrGiven variable - now it only + matters if the initStr is null or not. Modifying the following + two methods: (charReaded) - if initStr is null the run method + can not be started from charReaded and the presence of initStr + is not checked in stdout. Method (getInitStrAsRule) returns rule + that is always true if initStr is null. + 2013-05-02 Jiri Vanek Renamed cz locales to be more general diff -r 55c943c320fd -r 01c529dee2b7 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Thu May 02 15:31:55 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Thu May 02 15:55:51 2013 +0200 @@ -60,7 +60,7 @@ public abstract class AWTHelper extends RulesFolowingClosingListener implements Runnable{ //attributes possibly set by user - private String initStr = ""; + private String initStr = null; private Color appletColor; private BufferedImage marker; private Point markerPosition; @@ -75,7 +75,6 @@ private BufferedImage screenshot; private Robot robot; private boolean appletFound = false; - private boolean initStrGiven = false; //impossible to find in the output if not given private boolean appletColorGiven = false; //impossible to search for color difference if not given private boolean markerGiven = false; //impossible to find the applet if marker not given private boolean appletDimensionGiven = false; @@ -117,7 +116,6 @@ this(); this.initStr = initStr; - this.initStrGiven = true; } /** @@ -148,7 +146,6 @@ this(icon, iconPosition, appletWidth, appletHeight); this.initStr = initString; - this.initStrGiven = true; } /** @@ -176,7 +173,6 @@ public AWTHelper(String initString, int appletWidth, int appletHeight){ this(appletWidth, appletHeight); this.initStr = initString; - this.initStrGiven = true; } /** @@ -194,6 +190,8 @@ * override of method charReaded (from RulesFolowingClosingListener) * * waiting for the applet, when applet is ready run action thread + * (if initStr==null, do not check and do not call run) + * * when all the wanted strings are in the stdout, applet can be closed * * @param ch @@ -202,7 +200,8 @@ public void charReaded(char ch) { sb.append(ch); //is applet ready to start clicking? - if (initStrGiven && !actionStarted && appletIsReady(sb.toString())) { + //check and run applet only if initStr is not null + if ((initStr != null) && !actionStarted && appletIsReady(sb.toString())) { try{ actionStarted = true; this.findAndActivateApplet(); @@ -241,22 +240,43 @@ * @return */ public Rule getInitStrAsRule(){ - return new ContainsRule(this.initStr); + if( initStr != null ){ + return new ContainsRule(this.initStr); + }else{ + return new Rule(){ + + @Override + public void setRule(Object rule) { + } + + @Override + public boolean evaluate(Object upon) { + return true; + } + + @Override + public String toPassingString() { + return "nothing to check, initStr is null"; + } + + @Override + public String toFailingString() { + return "nothing to check, initStr is null"; + } + + } ; + } } //boolean controls getters protected boolean appletIsReady(String content) { - return (content.contains(initStr)); + return this.getInitStrAsRule().evaluate(content); } public boolean isActionStarted() { return actionStarted; } - public boolean isInitStrGiven(){ - return initStrGiven; - } - public boolean isAppletColorGiven(){ return appletColorGiven; } @@ -292,7 +312,6 @@ public void setInitStr(String initStr) { this.initStr = initStr; - this.initStrGiven = true; } public void setMarker(BufferedImage marker, Point markerPosition) { From jvanek at icedtea.classpath.org Thu May 2 07:05:37 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 14:05:37 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset f20482af9a95 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f20482af9a95 author: Jiri Vanek date: Thu May 02 16:00:17 2013 +0200 Fix for portalbank.no (trying get after failed head requests) and tests changeset 882d1bc0ff8f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=882d1bc0ff8f author: Jiri Vanek date: Thu May 02 16:05:57 2013 +0200 Merge with: Fix for portalbank.no (trying get after failed head requests) and tests diffstat: ChangeLog | 42 + netx/net/sourceforge/jnlp/Version.java | 38 +- netx/net/sourceforge/jnlp/cache/Resource.java | 2 + netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 65 +- netx/net/sourceforge/jnlp/util/HttpUtils.java | 76 ++ netx/net/sourceforge/jnlp/util/StreamUtils.java | 13 - tests/netx/unit/net/sourceforge/jnlp/VersionTest.java | 98 +++ tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 308 ++++++++- tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java | 248 ++++++++ tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 37 + tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java | 17 +- tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 30 +- tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 45 +- 13 files changed, 883 insertions(+), 136 deletions(-) diffs (truncated from 1318 to 500 lines): diff -r 55c943c320fd -r 882d1bc0ff8f ChangeLog --- a/ChangeLog Thu May 02 15:31:55 2013 +0200 +++ b/ChangeLog Thu May 02 16:05:57 2013 +0200 @@ -1,3 +1,45 @@ +2013-05-02 Jiri Vanek + + Added various tests related to portalbank.no fixes + * netx/net/sourceforge/jnlp/cache/Resource.java: added fixme to warn + before wrong url comparator + * netx/net/sourceforge/jnlp/Version.java: removed useless main. Its + purpose moved to new + * tests/netx/unit/net/sourceforge/jnlp/VersionTest: some small tests to + version class + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: + added tests to (getUrlResponseCode) and (findBestUrl) + * tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java: added tests for + (consumeAndCloseConnectionSilently) and (consumeAndCloseConnection) + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest: added license header + * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: and + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: added + support for simulation of not working HEAD request. + +2013-05-02 Jiri Vanek + + Fix for portalbank.no (trying get after failed head requests) + * net/sourceforge/jnlp/cache/ResourceTracker : (findBestUrl) + now trying GET after each error request of HEAD type. Changed and + added debug messages. (getUrlResponseCode) closing of stream + moved to separate method HttpUtils.consumeAndCloseConnectionSilently + * net/sourceforge/jnlp/util/HttpUtils.java: new file designed for + http utils. Now contains (consumeAndCloseConnection) and + (consumeAndCloseConnectionSilently) which calls consumeAndCloseConnection + but do not rethrow exception + * netx/net/sourceforge/jnlp/util/StreamUtils.java: removed + (consumeAndCloseInputStream) now improved and moved to HttpUtils + +2013-05-02 Jana Fabrikova + + * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java: + refactoring - removing initStrGiven variable - now it only + matters if the initStr is null or not. Modifying the following + two methods: (charReaded) - if initStr is null the run method + can not be started from charReaded and the presence of initStr + is not checked in stdout. Method (getInitStrAsRule) returns rule + that is always true if initStr is null. + 2013-05-02 Jiri Vanek Renamed cz locales to be more general diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/Version.java --- a/netx/net/sourceforge/jnlp/Version.java Thu May 02 15:31:55 2013 +0200 +++ b/netx/net/sourceforge/jnlp/Version.java Thu May 02 16:05:57 2013 +0200 @@ -308,42 +308,6 @@ public String toString() { return versionString; - } - - /** - * Test. - */ - /* - public static void main(String args[]) { - Version jvms[] = { - new Version("1.1* 1.3*"), - new Version("1.2+"), - }; - - Version versions[] = { - new Version("1.1"), - new Version("1.1.8"), - new Version("1.2"), - new Version("1.3"), - new Version("2.0"), - new Version("1.3.1"), - new Version("1.2.1"), - new Version("1.3.1-beta"), - new Version("1.1 1.2"), - new Version("1.2 1.3"), - }; - - for (int j = 0; j < jvms.length; j++) { - for (int v = 0; v < versions.length; v++) { - System.out.print( jvms[j].toString() + " " ); - if (!jvms[j].matches(versions[v])) - System.out.print( "!" ); - System.out.println( "matches " + versions[v].toString() ); - } - } - - System.out.println("Test completed"); - } - */ + } } diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/cache/Resource.java --- a/netx/net/sourceforge/jnlp/cache/Resource.java Thu May 02 15:31:55 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/Resource.java Thu May 02 16:05:57 2013 +0200 @@ -109,6 +109,8 @@ synchronized (resources) { Resource resource = new Resource(location, requestVersion, updatePolicy); + //FIXME - url ignores port during its comparison + //this may affect test-suites int index = resources.indexOf(resource); if (index >= 0) { // return existing object Resource result = resources.get(index); diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 15:31:55 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 16:05:57 2013 +0200 @@ -24,14 +24,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; -import java.net.URLDecoder; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; @@ -49,7 +45,7 @@ import net.sourceforge.jnlp.event.DownloadEvent; import net.sourceforge.jnlp.event.DownloadListener; import net.sourceforge.jnlp.runtime.JNLPRuntime; -import net.sourceforge.jnlp.util.StreamUtils; +import net.sourceforge.jnlp.util.HttpUtils; import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.WeakList; @@ -118,6 +114,9 @@ /** max threads */ private static final int maxThreads = 5; + + /** methods used to try individual URLs when choosing best*/ + private static final String[] requestMethods = {"HEAD", "GET"}; /** running threads */ private static int threads = 0; @@ -859,7 +858,7 @@ * @return the response code if HTTP connection, or HttpURLConnection.HTTP_OK if not. * @throws IOException */ - private static int getUrlResponseCode(URL url, Map requestProperties, String requestMethod) throws IOException { + static int getUrlResponseCode(URL url, Map requestProperties, String requestMethod) throws IOException { URLConnection connection = url.openConnection(); for (Map.Entry property : requestProperties.entrySet()){ @@ -874,7 +873,7 @@ /* Fully consuming current request helps with connection re-use * See http://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html */ - StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream()); + HttpUtils.consumeAndCloseConnectionSilently(httpConnection); return responseCode; } @@ -891,7 +890,7 @@ * @param resource the resource * @return the best URL, or null if all failed to resolve */ - private URL findBestUrl(Resource resource) { + URL findBestUrl(Resource resource) { DownloadOptions options = downloadOptions.get(resource); if (options == null) { options = new DownloadOptions(false, false); @@ -903,33 +902,33 @@ resource.toString() + " : " + urls); } - for (URL url : urls) { - try { - Map requestProperties = new HashMap(); - requestProperties.put("Accept-Encoding", "pack200-gzip, gzip"); + for (String requestMethod : requestMethods) { + for (URL url : urls) { + try { + Map requestProperties = new HashMap(); + requestProperties.put("Accept-Encoding", "pack200-gzip, gzip"); - int responseCode = getUrlResponseCode(url, requestProperties, "HEAD"); + int responseCode = getUrlResponseCode(url, requestProperties, requestMethod); - if (responseCode == HttpURLConnection.HTTP_NOT_IMPLEMENTED ) { - System.err.println("NOTE: The server does not appear to support HEAD requests, falling back to GET requests."); - /* Fallback: use GET request in the rare case the server does not support HEAD requests */ - responseCode = getUrlResponseCode(url, requestProperties, "GET"); - } - - /* Check if within valid response code range */ - if (responseCode >= 200 && responseCode < 300) { - if (JNLPRuntime.isDebug()) { - System.err.println("best url for " + resource.toString() + " is " + url.toString()); - } - return url; /* This is the best URL */ - } - } catch (IOException e) { - // continue to next candidate - if (JNLPRuntime.isDebug()) { - System.err.println("While processing " + url.toString() + " for resource " + resource.toString() + " got " + e); - } - } - } + if (responseCode < 200 || responseCode >= 300) { + if (JNLPRuntime.isDebug()) { + System.err.println("For "+resource.toString()+" the server returned " + responseCode + " code for "+requestMethod+" request for " + url.toExternalForm()); + } + }else { + if (JNLPRuntime.isDebug()) { + System.out.println("best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod); + } + return url; /* This is the best URL */ + } + } catch (IOException e) { + // continue to next candidate + if (JNLPRuntime.isDebug()) { + System.err.println("While processing " + url.toString() + " by " + requestMethod + " for resource " + resource.toString() + " got " + e + ": "); + e.printStackTrace(); + } + } + } + } /* No valid URL, return null */ return null; diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/util/HttpUtils.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/util/HttpUtils.java Thu May 02 16:05:57 2013 +0200 @@ -0,0 +1,76 @@ +/* + Copyright (C) 2011 Red Hat, Inc. + + 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, version 2. + + 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 net.sourceforge.jnlp.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; + +public class HttpUtils { + + /** + * Ensure a HttpURLConnection is fully read, required for correct behavior. + * Captured IOException is consumed and printed + */ + public static void consumeAndCloseConnectionSilently(HttpURLConnection c) { + try { + consumeAndCloseConnection(c); + } catch (IOException ex) { + ex.printStackTrace(System.err); + } + } + + /** + * Ensure a HttpURLConnection is fully read, required for correct behavior + * + * @throws IOException + */ + public static void consumeAndCloseConnection(HttpURLConnection c) throws IOException { + InputStream in = null; + try { + in = c.getInputStream(); + byte[] throwAwayBuffer = new byte[256]; + while (in.read(throwAwayBuffer) > 0) { + /* ignore contents */ + } + } finally { + if (in != null) { + in.close(); + } + } + } +} diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/util/StreamUtils.java --- a/netx/net/sourceforge/jnlp/util/StreamUtils.java Thu May 02 15:31:55 2013 +0200 +++ b/netx/net/sourceforge/jnlp/util/StreamUtils.java Thu May 02 16:05:57 2013 +0200 @@ -45,19 +45,6 @@ public class StreamUtils { - /** - * Ensure a stream is fully read, required for correct behaviour in some - * APIs, namely HttpURLConnection. - * @throws IOException - */ - public static void consumeAndCloseInputStream(InputStream in) throws IOException { - byte[] throwAwayBuffer = new byte[256]; - while (in.read(throwAwayBuffer) > 0) { - /* ignore contents */ - } - in.close(); - } - /*** * Closes a stream, without throwing IOException. * In case of IOException, prints the stack trace to System.err. diff -r 55c943c320fd -r 882d1bc0ff8f tests/netx/unit/net/sourceforge/jnlp/VersionTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/VersionTest.java Thu May 02 16:05:57 2013 +0200 @@ -0,0 +1,98 @@ +/* + Copyright (C) 2011 Red Hat, Inc. + + 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, version 2. + + 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 net.sourceforge.jnlp; + +import org.junit.Assert; +import org.junit.Test; + +public class VersionTest { + + private static boolean[] results = {true, + true, + false, + true, + false, + true, + false, + true, + false, + false, + false, + false, + true, + true, + true, + true, + true, + true, + false, + true}; + private static Version jvms[] = { + new Version("1.1* 1.3*"), + new Version("1.2+"),}; + private static Version versions[] = { + new Version("1.1"), + new Version("1.1.8"), + new Version("1.2"), + new Version("1.3"), + new Version("2.0"), + new Version("1.3.1"), + new Version("1.2.1"), + new Version("1.3.1-beta"), + new Version("1.1 1.2"), + new Version("1.2 1.3"),}; + + @Test + public void testMatches() { + + int i = 0; + for (int j = 0; j < jvms.length; j++) { + for (int v = 0; v < versions.length; v++) { + i++; + String debugOutput = i + " " + jvms[j].toString() + " "; + if (!jvms[j].matches(versions[v])) { + debugOutput += "!"; + } + debugOutput += "matches " + versions[v].toString(); + ServerAccess.logOutputReprint(debugOutput); + Assert.assertEquals(results[i - 1], jvms[j].matches(versions[v])); + } + } + + + } +} diff -r 55c943c320fd -r 882d1bc0ff8f tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Thu May 02 15:31:55 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Thu May 02 16:05:57 2013 +0200 @@ -1,54 +1,70 @@ /* ResourceTrackerTest.java -Copyright (C) 2012 Red Hat, Inc. + Copyright (C) 2012 Red Hat, Inc. -This file is part of IcedTea. + 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, version 2. + 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, version 2. -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. + 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. + 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. + 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. + 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 From gitne at excite.co.jp Thu May 2 07:07:11 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 2 May 2013 23:07:11 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIFJlZmluZWQgbWVzc2FnZXM=?= Message-ID: <201305021407.r42E7BMB018983@mail-web01.excite.co.jp> "Jiri Vanek" wrote: > ...snip.. > > > > They should at least be consistent with CVUser and CVSystem. As I see it, "Global" is a vague term that implies blurry boundries. What is "Global"? The local computer? The enterprise network? The web or even the world? > > > > @Jiri > > Thank you for filtering out the missing messages! I will provide translations for them asap. > > > > Cheers! > > Jacob > > > > Hi! > > How is it going? I would like to freeze HEAD today. It sohuld be nice to have PL finished. > If not, then just let me know. I can delay a release bit (but i really do not wont) or I can release > without (As majority of PL strings is done) Hello, This patch contains refined messages and translations of previously missing messages. Good luck! ;) Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: Refined messages.patch Type: text/x-patch Size: 26398 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/d6e0a6a8/ISO-2022-JPBUmVmaW5lZCBtZXNzYWdlcy5wYXRjaA.patch From ptisnovs at redhat.com Thu May 2 07:08:01 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 2 May 2013 10:08:01 -0400 (EDT) Subject: [rfc][icedtea-web] Refactor pipe-message mock code from PluginAppletViewerTest into PluginPipeMockUtils In-Reply-To: <517FE31F.9060504@redhat.com> References: <517FE31F.9060504@redhat.com> Message-ID: <8029063.6096315.1367503681477.JavaMail.root@redhat.com> Hi Adam, this patch looks correct, ok for HEAD. I'm just a bit worried about the code which parses string transfered from/to C-part of ITW. AFAIK someone should think about improvements of this part (but obviously it's outside the range of this patch). Cheers, Pavel ----- Adam Domurad wrote: > Hi all. This patch takes out some bits that are strongly not > test-specific. This will make it easier to use the pipe mock in other tests. > I would still like to add more utility functions here, but this is a > good starting base. Some functions call through the pipe even though it > is not the main focus of the function, and something really convenient > to respond to certain message types would be ideal in that case (I have > a little bit written, but I'd like this base reviewed first). > > Changes: > 2013-XX-XX Adam Domurad > > Introduce PluginPipeMock utility methods. > * tests/test-extensions/sun/applet/PluginPipeMockUtil.java: New, > enapsulates PluginPipeMock initialization, cleanup. As well, contains > utility methods. > * tests/netx/unit/sun/applet/PluginAppletViewerTest.java: Use > newly introduced utility methods. > > Happy hacking, > -Adam From adomurad at redhat.com Thu May 2 07:23:52 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 02 May 2013 10:23:52 -0400 Subject: [rfc][icedtea-web] Remove legacy xulrunner check Message-ID: <518276F8.6070603@redhat.com> Hi all. Now that the legacy NPAPI support has been dropped, this check should be dropped too. Worse yet, this #ifdef incorrectly was activated when helping someone build on a clean F18. Investigating the issue is possible -- but dropping it is easier and makes sense. Note, this is the only occurrence of 'LEGACY_XULRUNNERAPI'. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: no-legacy-xulrunner.patch Type: text/x-patch Size: 509 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/b8a1afc8/no-legacy-xulrunner.patch From adomurad at icedtea.classpath.org Thu May 2 07:40:01 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 02 May 2013 14:40:01 +0000 Subject: /hg/icedtea-web: Remove incorrect undummied code in MethodOverlo... Message-ID: changeset 64d08fb70c0f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64d08fb70c0f author: Adam Domurad date: Thu May 02 10:41:20 2013 -0400 Remove incorrect undummied code in MethodOverloadResolver diffstat: ChangeLog | 6 ++++ plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 15 ++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diffs (60 lines): diff -r 882d1bc0ff8f -r 64d08fb70c0f ChangeLog --- a/ChangeLog Thu May 02 16:05:57 2013 +0200 +++ b/ChangeLog Thu May 02 10:41:20 2013 -0400 @@ -1,3 +1,9 @@ +2013-05-02 Adam Domurad + + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java + (getCostAndCastedObject): Remove code that had no effect before refactoring. + (getBestOverloadMatch): Move debug-only code to debug if-block. + 2013-05-02 Jiri Vanek Added various tests related to portalbank.no fixes diff -r 882d1bc0ff8f -r 64d08fb70c0f plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Thu May 02 16:05:57 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Thu May 02 10:41:20 2013 -0400 @@ -44,8 +44,6 @@ import java.util.Arrays; import java.util.List; -import netscape.javascript.JSObject; - /* * This class resolved overloaded methods in Java objects using a cost * based-approach described here: @@ -65,7 +63,6 @@ static final int CLASS_SUPERCLASS_COST = 6; static final int CLASS_STRING_COST = 7; - static final int JSOBJECT_TO_ARRAY_COST = CLASS_STRING_COST; static final int ARRAY_CAST_COST = 8; /* A method signature with its casted parameters @@ -198,10 +195,10 @@ castedArgs[i] = castedObj; - Class castedObjClass = castedObj == null ? null : castedObj.getClass(); - boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); + if (PluginDebug.DEBUG) { /* avoid toString if not needed */ + Class castedObjClass = castedObj == null ? null : castedObj.getClass(); + boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive(); - if (PluginDebug.DEBUG) { /* avoid toString if not needed */ PluginDebug.debug("Param " + i + " of method " + candidate + " has cost " + weightedCast.getCost() + " original param type " + suppliedParamClass @@ -340,12 +337,6 @@ return new WeightedCast(CLASS_STRING_COST, suppliedParam.toString()); } - // JSObject to Java array - if (suppliedParam instanceof JSObject - && paramTypeClass.isArray()) { - return new WeightedCast(JSOBJECT_TO_ARRAY_COST, suppliedParam); - } - return null; } From jvanek at redhat.com Thu May 2 07:40:35 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 16:40:35 +0200 Subject: [rfc][icedtea-web] Remove legacy xulrunner check In-Reply-To: <518276F8.6070603@redhat.com> References: <518276F8.6070603@redhat.com> Message-ID: <51827AE3.7000207@redhat.com> On 05/02/2013 04:23 PM, Adam Domurad wrote: > Hi all. Now that the legacy NPAPI support has been dropped, this check should be dropped too. > Worse yet, this #ifdef incorrectly was activated when helping someone build on a clean F18. > Investigating the issue is possible -- but dropping it is easier and makes sense. > > Note, this is the only occurrence of 'LEGACY_XULRUNNERAPI'. > > Happy hacking, > -Adam How it could be activated!??!!? ANyway ok to remove. Loks like today is big push day.... From jfabriko at redhat.com Thu May 2 07:43:30 2013 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 02 May 2013 16:43:30 +0200 Subject: [rfc][icedtea-web] second modification to Makefile - all icons from testcases Message-ID: <1367505810.28857.16.camel@jana-2-174.nrt.redhat.com> Hello, please find the attached patch (+one image file) for the second change to the Makefile.am (and corresponding reproducer which uses the changes). The change: During the processing of one reproducer all the files from reproducer/testcases were compiled. The new possibility is to include also non-java files (images...) in the reproducer/testcases directories. *.java files are compiled and processed as usual, non-java files are all copied into tests.build/test-extensions-tests directory which is on classpath for the reproducers, unit tests, and code-coverage. Reason for this change: The testcases of reproducers that use AWTFramework may sometimes contain an image of a button or other component of applet/application that should be found in the screenshot. These images should be copied somewhere to be accessible from the testcase via classloader. ChangeLog: * Makefile.am: Change in processing the goal (stamps/compile-reproducers-testcases.stamp): All .java files from reproducers testcases directory are compiled, all non-java files are copied into the TEST_EXTENSIONS_TESTS_DIR, i.e. tests.build/test-extensions-tests directory * tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp: jnlp file for displaying the applet * tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java: the applet used in the reproducer * tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java: adding 2 tests: that an icon is loaded, and that the button is identified from the given icon and clicked by awt robot * tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png: the icon of the wanted button cheers, Jana -------------- next part -------------- A non-text attachment was scrubbed... Name: modifying_makefile_all_icons.patch Type: text/x-patch Size: 14582 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/542c3086/modifying_makefile_all_icons.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: buttonA.png Type: image/png Size: 452 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/542c3086/buttonA.png From jvanek at redhat.com Thu May 2 07:50:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 16:50:00 +0200 Subject: [rfc][icedtea-web] second modification to Makefile - all icons from testcases In-Reply-To: <1367505810.28857.16.camel@jana-2-174.nrt.redhat.com> References: <1367505810.28857.16.camel@jana-2-174.nrt.redhat.com> Message-ID: <51827D18.2020606@redhat.com> Looks good. Just two and half nit: > + if [ -n "`ls | grep -v \".*\\.java$$\"`" ]; then \ > + cp `ls | grep -v ".*\\.java$$"` $(TEST_EXTENSIONS_TESTS_DIR)/ ; \ what an nasty duplicite code. Store `ls | grep -v \".*\\.java$$\"` to variable VAR=`ls | grep -v \".*\\.java$$\"` if [ -n "$$VAR" ]; then \ cp `$$VAR` $(TEST_EXTENSIONS_TESTS_DIR)/ ; \ Secondly - why is the test extending browsertest? (no browser test included :) ) And last one - where is html test? Feel free to push after those is fixed. /me looking forward for this J. On 05/02/2013 04:43 PM, Jana Fabrikova wrote: > Hello, > > please find the attached patch (+one image file) for the second change > to the Makefile.am (and corresponding reproducer which uses the > changes). > > The change: > During the processing of one reproducer all the files from > reproducer/testcases were compiled. > The new possibility is to include also non-java files (images...) in the > reproducer/testcases directories. *.java files are compiled and > processed as usual, non-java files are all copied into > tests.build/test-extensions-tests directory which is on classpath for > the reproducers, unit tests, and code-coverage. > > Reason for this change: > The testcases of reproducers that use AWTFramework may sometimes contain > an image of a button or other component of applet/application that > should be found in the screenshot. These images should be copied > somewhere to be accessible from the testcase via classloader. > > ChangeLog: > * Makefile.am: > Change in processing the goal > (stamps/compile-reproducers-testcases.stamp): > All .java files from reproducers testcases directory are > compiled, all non-java files are copied into the > TEST_EXTENSIONS_TESTS_DIR, i.e. > tests.build/test-extensions-tests directory > * > tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp: > jnlp file for displaying the applet > * > tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java: > the applet used in the reproducer > * > tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java: > adding 2 tests: that an icon is loaded, and that the button is > identified from the given icon and clicked by awt robot > * > tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png: > the icon of the wanted button > > cheers, > Jana > > > modifying_makefile_all_icons.patch > > > diff -r 882d1bc0ff8f Makefile.am > --- a/Makefile.am Thu May 02 16:05:57 2013 +0200 > +++ b/Makefile.am Thu May 02 16:24:57 2013 +0200 > @@ -788,7 +788,14 @@ > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > -d $(TEST_EXTENSIONS_TESTS_DIR) \ > -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ > - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \ > + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ > + if [ -d "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ]; then \ > + pushd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ; \ > + if [ -n "`ls | grep -v \".*\\.java$$\"`" ]; then \ > + cp `ls | grep -v ".*\\.java$$"` $(TEST_EXTENSIONS_TESTS_DIR)/ ; \ > + fi ; \ > + popd ; \ > + fi ; \ > done ; \ > done ; \ > mkdir -p stamps && \ > diff -r 882d1bc0ff8f tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp Thu May 02 16:24:57 2013 +0200 > @@ -0,0 +1,57 @@ > + > + > + > + > + AWTRobot usage sample > + IcedTea > + > + AWTRobot usage sample > + > + > + > + > + > + > + + name="AWTRobot usage sample" > + main-class="JavawsAWTRobotFindsButton" > + width="400" > + height="400"> > + > + > diff -r 882d1bc0ff8f tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java Thu May 02 16:24:57 2013 +0200 > @@ -0,0 +1,166 @@ > +/* JavawsAWTRobotFindsButton.java > +Copyright (C) 2012 Red Hat, Inc. > + > +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, version 2. > + > +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. > + */ > + > +import java.applet.Applet; > +import java.awt.Graphics; > +import java.awt.Color; > +import java.awt.Image; > +import java.awt.Panel; > +import java.awt.Button; > +import java.awt.Dimension; > +import java.awt.event.MouseEvent; > +import java.awt.event.MouseListener; > + > +public class JavawsAWTRobotFindsButton extends Applet { > + > + private static final String initStr = "JavawsAWTRobotFindsButton is ready for awt tests!"; > + public static final String iconFile = "marker.png"; > + > + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > + > + public Image img; > + public Panel panel; > + > + public void init(){ > + img = getImage(getCodeBase(), iconFile); > + > + createGUI(); > + > + writeAppletInitialized(); > + } > + > + //this method should be called by the extending applet > + //when the whole gui is ready > + public void writeAppletInitialized(){ > + System.out.println(initStr); > + } > + > + //paint the icon in upper left corner > + @Override public void paint(Graphics g){ > + int width = 32; > + int height = 32; > + int x = 0; > + int y = 0; > + g.drawImage(img, x, y, width, height, this); > + super.paint(g); > + } > + > + private Button createButton(String label, Color color) { > + Button b = new Button(label); > + b.setBackground(color); > + b.setPreferredSize(new Dimension(100, 50)); > + return b; > + } > + > + // sets background of the applet > + // and adds the panel with 2 buttons > + private void createGUI() { > + setBackground(APPLET_COLOR); > + > + panel = new Panel(); > + panel.setBounds(33,33,267,267); > + > + Button bA = createButton("Button A", BUTTON_COLOR1); > + > + > + bA.addMouseListener(new MouseListener() { > + > + public void mouseClicked(MouseEvent e) { > + System.out.println("Mouse clicked button A."); > + } > + > + @Override > + public void mouseEntered(MouseEvent arg0) { > + > + } > + > + @Override > + public void mouseExited(MouseEvent arg0) { > + > + } > + > + @Override > + public void mousePressed(MouseEvent arg0) { > + > + } > + > + @Override > + public void mouseReleased(MouseEvent arg0) { > + > + } > + > + }); > + > + panel.add(bA); > + > + > + Button bB = createButton("Button B", BUTTON_COLOR1); > + > + > + bB.addMouseListener(new MouseListener() { > + > + public void mouseClicked(MouseEvent e) { > + System.out.println("Mouse clicked button B."); > + } > + > + @Override > + public void mouseEntered(MouseEvent e) { > + > + } > + > + @Override > + public void mouseExited(MouseEvent e) { > + > + } > + > + @Override > + public void mousePressed(MouseEvent e) { > + > + } > + > + @Override > + public void mouseReleased(MouseEvent e) { > + > + } > + }); > + > + panel.add(bB); > + > + this.add(panel); > + } > +} > diff -r 882d1bc0ff8f tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java Thu May 02 16:24:57 2013 +0200 > @@ -0,0 +1,137 @@ > +/* JavawsAWTRobotFindsButtonTest.java > +Copyright (C) 2012 Red Hat, Inc. > + > +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, version 2. > + > +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. > + */ > + > +import java.awt.Color; > +import java.awt.event.InputEvent; > +import java.awt.image.BufferedImage; > +import java.io.File; > +import java.io.IOException; > + > +import javax.imageio.ImageIO; > + > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.awt.AWTFrameworkException; > +import net.sourceforge.jnlp.awt.AWTHelper; > +import net.sourceforge.jnlp.awt.imagesearch.ComponentFinder; > +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.closinglisteners.Rule; > + > +import org.junit.Assert; > +import org.junit.Test; > + > +public class JavawsAWTRobotFindsButtonTest extends BrowserTest { > + > + private final String initStr = "JavawsAWTRobotFindsButton is ready for awt tests!"; > + > + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender > + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green > + > + private static final BufferedImage buttonIcon; > + > + static{ > + try { > + buttonIcon = ImageIO.read(JavawsAWTRobotFindsButtonTest.class.getClassLoader().getResource("buttonA.png")); > + } catch (IOException e) { > + throw new RuntimeException("Problem initializing buttonIcon",e); > + } > + } > + > + private class AWTHelperImpl_ClickButtonIcon extends AWTHelper{ > + > + public AWTHelperImpl_ClickButtonIcon() { > + super(initStr, 400, 400); > + > + this.setAppletColor(APPLET_COLOR); > + } > + > + @Override > + public void run() { > + // move mouse into the button area and out > + try { > + clickOnIconExact(buttonIcon, InputEvent.BUTTON1_MASK); > + } catch (ComponentNotFoundException e) { > + Assert.fail("Button icon not found: "+e.getMessage()); > + } > + > + } > + } > + > + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { > + > + // Assert that the applet was initialized. > + Rule i = helper.getInitStrAsRule(); > + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); > + > + // Assert there are all the test messages from applet > + for (Rule r : helper.getRules() ) { > + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); > + } > + > + } > + > + > + private void appletAWTMouseTest(String url, AWTHelper helper) throws Exception { > + > + String strURL = "/" + url; > + > + try { > + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms > + ProcessResult pr = server.executeJavaws(strURL, helper, helper); > + evaluateStdoutContents(pr, helper); > + } finally { > + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms > + } > + } > + > + @Test > + @NeedsDisplay > + public void findAndClickButtonByIcon_Test() throws Exception { > + // display the page, activate applet, click on button > + AWTHelper helper = new AWTHelperImpl_ClickButtonIcon(); > + helper.addClosingRulesFromStringArray(new String[] { "Mouse clicked button A." }); > + appletAWTMouseTest("javaws-awtrobot-finds-button.jnlp", helper); > + } > + > + @Test > + public void iconFileLoaded_Test() throws IOException { > + Assert.assertNotNull("buttonIcon should not be null", buttonIcon); > + } > + > +} > diff -r 882d1bc0ff8f tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png > Binary file tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png has changed > > > buttonA.png > > From gitne at excite.co.jp Thu May 2 07:51:13 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 2 May 2013 23:51:13 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIFJlZmluZWQgbWVzc2FnZXMgKDIp?= Message-ID: <201305021451.r42EpDd6017801@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > "Jiri Vanek" wrote: > > ...snip.. > > > > > > They should at least be consistent with CVUser and CVSystem. As I see it, "Global" is a vague term that implies blurry boundries. What is "Global"? The local computer? The enterprise network? The web or even the world? > > > > > > @Jiri > > > Thank you for filtering out the missing messages! I will provide translations for them asap. > > > > > > Cheers! > > > Jacob > > > > > > > Hi! > > > > How is it going? I would like to freeze HEAD today. It sohuld be nice to have PL finished. > > If not, then just let me know. I can delay a release bit (but i really do not wont) or I can release > > without (As majority of PL strings is done) > > Hello, > > This patch contains refined messages and translations of previously missing messages. Oops, still missed 3 :( Fixed it, so this patch supersedes the previous. Thx Jiri. Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: Refined messages.patch Type: text/x-patch Size: 27134 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/170cbcca/ISO-2022-JPBUmVmaW5lZCBtZXNzYWdlcy5wYXRjaA.patch From adomurad at icedtea.classpath.org Thu May 2 07:55:04 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 02 May 2013 14:55:04 +0000 Subject: /hg/icedtea-web: MethodOverloadResolve array casting tests Message-ID: changeset f3c918a41d10 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f3c918a41d10 author: Adam Domurad date: Thu May 02 10:56:15 2013 -0400 MethodOverloadResolve array casting tests diffstat: ChangeLog | 11 + plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 4 + tests/netx/unit/sun/applet/MethodOverloadResolverTest.java | 87 ++++++++++- 3 files changed, 92 insertions(+), 10 deletions(-) diffs (167 lines): diff -r 64d08fb70c0f -r f3c918a41d10 ChangeLog --- a/ChangeLog Thu May 02 10:41:20 2013 -0400 +++ b/ChangeLog Thu May 02 10:56:15 2013 -0400 @@ -1,3 +1,14 @@ +2013-05-02 Adam Domurad + + * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java + (getBestOverloadMatch): Return null if a valid method was not found. + * tests/netx/unit/sun/applet/MethodOverloadResolverTest.java + (getResolvedMethod): New, gets ResolvedMethod from array of bundled class, + string, and parameters + (assertExpectedOverload): New variant that tests exact received values + (testArrayToStringResolve): Tests array conversion to String + (testArrayToArrayResolve): Tests array conversion to other arrays + 2013-05-02 Adam Domurad * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java diff -r 64d08fb70c0f -r f3c918a41d10 plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Thu May 02 10:41:20 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Thu May 02 10:56:15 2013 -0400 @@ -227,6 +227,10 @@ PluginDebug.debug("*** Warning: Ambiguous overload of ", c.getClass(), "#", cheapestMethod, "!"); } + if (cheapestMethod == null) { + return null; + } + return new ResolvedMethod(lowestCost, cheapestMethod, cheapestArgs); } diff -r 64d08fb70c0f -r f3c918a41d10 tests/netx/unit/sun/applet/MethodOverloadResolverTest.java --- a/tests/netx/unit/sun/applet/MethodOverloadResolverTest.java Thu May 02 10:41:20 2013 -0400 +++ b/tests/netx/unit/sun/applet/MethodOverloadResolverTest.java Thu May 02 10:56:15 2013 -0400 @@ -272,25 +272,41 @@ return objects.toArray( new Object[0]); } - static private void assertExpectedOverload(Object[] params, + // Takes {class, method, arguments...} bundled in one array + static private ResolvedMethod getResolvedMethod(Object[] methodAndParams) { + /* Copy over argument portion (class and method are bundled in same array for convenience) */ + Class c = (Class)methodAndParams[0]; + String methodName = (String)methodAndParams[1]; + /* Copy over argument portion (class and method are bundled in same array for convenience) */ + Object[] params = Arrays.copyOfRange(methodAndParams, 2, methodAndParams.length); + + return MethodOverloadResolver.getBestMatchMethod(c, methodName, params); + } + + /* Assert that the overload completed properly by simply providing a type signature*/ + static private void assertExpectedOverload(Object[] methodAndParams, String expectedSignature, int expectedCost) { - Class c = (Class)params[0]; - String methodName = (String)params[1]; - Object[] args = Arrays.copyOfRange(params, 2, params.length); - ResolvedMethod result = MethodOverloadResolver.getBestMatchMethod(c, methodName, args); - + ResolvedMethod result = getResolvedMethod(methodAndParams); // Check signature array as string for convenience assertEquals(expectedSignature, simpleSignature(result.getAccessibleObject())); assertEquals(expectedCost, result.getCost()); } + /* Assert that the overload completed by providing the expected objects */ + static private void assertExpectedOverload(Object[] methodAndParams, + Object[] expectedCasts, int expectedCost) { + + ResolvedMethod result = getResolvedMethod(methodAndParams); + assertArrayEquals(expectedCasts, result.getCastedParameters()); + assertEquals(expectedCost, result.getCost()); + } + // Test methods @Test public void testMultipleArgResolve() { - @SuppressWarnings("unused") abstract class MultipleArg { public abstract void testmethod(String s, int i); public abstract void testmethod(String s, Integer i); @@ -318,7 +334,6 @@ @Test public void testBoxedNumberResolve() { - @SuppressWarnings("unused") abstract class BoxedNumber { public abstract void testmethod(Number n); public abstract void testmethod(Integer i); @@ -336,7 +351,6 @@ @Test public void testPrimitivesResolve() { - @SuppressWarnings("unused") abstract class Primitives { public abstract void testmethod(int i); public abstract void testmethod(long l); @@ -365,7 +379,6 @@ @Test public void testComplexResolve() { - @SuppressWarnings("unused") abstract class Complex { public abstract void testmethod(float f); public abstract void testmethod(String s); @@ -417,4 +430,58 @@ "FooChild", MethodOverloadResolver.CLASS_SUPERCLASS_COST); } + /* + * Test that arrays are casted to strings by using Javascript rules. + * Notably, commas have no spacing, and null values are printed as empty strings. + */ + @Test + public void testArrayToStringResolve() { + abstract class ArrayAsStringResolve { + public abstract void testmethod(String stringRepr); + } + + final Object[] asStringExpectedResult = {"foo,,bar"}; + + assertExpectedOverload( + args( ArrayAsStringResolve.class, (Object) new String[] {"foo", null, "bar"}), + asStringExpectedResult, MethodOverloadResolver.ARRAY_CAST_COST); + } + + /* + * Test that arrays are casted to other arrays by recursively invoking the + * casting rules on each element. + */ + @Test + public void testArrayToArrayResolve() { + + abstract class IntArrayResolve { + public abstract void testmethod(int[] intArray); + } + + // Note that currently, the only array actually received from the Javascript side is + // a String[] array, but this may change. + final Object[] intArrayExpectedResult = {new int[] {0, 1, 2}}; + + assertExpectedOverload( + args(IntArrayResolve.class, (Object) new String[] {null, "1", "2.1"}), + intArrayExpectedResult, MethodOverloadResolver.ARRAY_CAST_COST); + + assertExpectedOverload( + args(IntArrayResolve.class, new int[] {0, 1, 2}), + intArrayExpectedResult, MethodOverloadResolver.ARRAY_CAST_COST); + + assertExpectedOverload( + args(IntArrayResolve.class, new double[] {0, 1, 2.1}), + intArrayExpectedResult, MethodOverloadResolver.ARRAY_CAST_COST); + + abstract class NestedArrayResolve { + public abstract void testmethod(int[][] nestedArray); + } + + final Object[] nestedArrayExpectedResult = { new int[][] { {1,1}, {2,2} } }; + + assertExpectedOverload( + args(NestedArrayResolve.class, (Object) new String[][] { {"1", "1"}, {"2", "2"} }), + nestedArrayExpectedResult, MethodOverloadResolver.ARRAY_CAST_COST); + } } From adomurad at icedtea.classpath.org Thu May 2 08:07:32 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 02 May 2013 15:07:32 +0000 Subject: /hg/icedtea-web: Introduce PluginPipeMock utility methods. Message-ID: changeset d6d929b4a9a9 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d6d929b4a9a9 author: Adam Domurad date: Thu May 02 11:08:55 2013 -0400 Introduce PluginPipeMock utility methods. diffstat: ChangeLog | 9 + tests/netx/unit/sun/applet/PluginAppletViewerTest.java | 105 +++++------ tests/test-extensions/sun/applet/PluginPipeMockUtil.java | 131 +++++++++++++++ 3 files changed, 188 insertions(+), 57 deletions(-) diffs (326 lines): diff -r f3c918a41d10 -r d6d929b4a9a9 ChangeLog --- a/ChangeLog Thu May 02 10:56:15 2013 -0400 +++ b/ChangeLog Thu May 02 11:08:55 2013 -0400 @@ -1,3 +1,12 @@ +2013-05-02 Adam Domurad + + Introduce PluginPipeMock utility methods. + * tests/test-extensions/sun/applet/PluginPipeMockUtil.java: New, + enapsulates PluginPipeMock initialization, cleanup. As well, contains + utility methods. + * tests/netx/unit/sun/applet/PluginAppletViewerTest.java: Use + newly introduced utility methods. + 2013-05-02 Adam Domurad * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java diff -r f3c918a41d10 -r d6d929b4a9a9 tests/netx/unit/sun/applet/PluginAppletViewerTest.java --- a/tests/netx/unit/sun/applet/PluginAppletViewerTest.java Thu May 02 10:56:15 2013 -0400 +++ b/tests/netx/unit/sun/applet/PluginAppletViewerTest.java Thu May 02 11:08:55 2013 -0400 @@ -1,7 +1,47 @@ +/* +Copyright (C) 2013 Red Hat, Inc. + +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, version 2. + +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 sun.applet; import static org.junit.Assert.assertEquals; +import static sun.applet.PluginPipeMockUtil.getPluginStoreId; +import static sun.applet.PluginPipeMockUtil.getPluginStoreObject; + import java.util.concurrent.Callable; import net.sourceforge.jnlp.AsyncCall; @@ -12,6 +52,7 @@ import org.junit.Test; import sun.applet.mock.PluginPipeMock; +import sun.applet.PluginPipeMockUtil; public class PluginAppletViewerTest { @@ -19,52 +60,15 @@ * Test setup * **************************************************************************/ - ThreadGroup spawnedForTestThreadGroup; // Set up before each test PluginPipeMock pipeMock; // Set up before each test - - /* By providing custom implementations of the input stream & output stream used by PluginStreamHandler, - * we are able to mock the C++-side of the plugin. We do this by sending the messages the Java-side expects - * to receive. Additionally, we able to test that the Java-side sends the correct requests. - * See PluginPipeMock for more details. - */ - private void installPipeMock() { - AppletSecurityContextManager.addContext(0, new PluginAppletSecurityContext(0, false /* no security */)); - - pipeMock = new PluginPipeMock(); - - PluginStreamHandler streamHandler = new PluginStreamHandler(pipeMock.getResponseInputStream(), pipeMock.getRequestOutputStream()); - PluginAppletViewer.setStreamhandler(streamHandler); - PluginAppletViewer.setPluginCallRequestFactory(new PluginCallRequestFactory()); - - streamHandler.startProcessing(); - } - - /* Call installPipeMock, wrapping the threads it creates in a ThreadGroup. - * This allows us to stop the message handling threads we spawn, while normally - * this would be difficult as they are meant to be alive at all times. - */ @Before public void setupMockedMessageHandling() throws Exception { - spawnedForTestThreadGroup = new ThreadGroup("PluginAppletViewerTestThreadGroup") { - public void uncaughtException(Thread t, Throwable e) { - // Silent death for plugin message handler threads - } - }; - // Do set-up in a thread so we can pass along our thread-group, used for clean-up. - Thread initThread = new Thread(spawnedForTestThreadGroup, "InstallPipeMockThread") { - @Override - public void run() { - installPipeMock(); - } - }; - initThread.start(); - initThread.join(); + pipeMock = PluginPipeMockUtil.setupMockedMessageHandling(); } @After - @SuppressWarnings("deprecation") // 'stop' must be used, 'interrupt' is too gentle. public void cleanUpMessageHandlingThreads() throws Exception { - spawnedForTestThreadGroup.stop(); + PluginPipeMockUtil.cleanUpMockedMessageHandling(pipeMock); } /************************************************************************** @@ -89,7 +93,7 @@ Object expectedReturn = new Object(); pipeMock.sendResponse("context 0 reference " + parseAndCheckJSCall(message, jsObjectID, callName, arguments) - + " JavaScriptCall " + storeObject(expectedReturn)); + + " JavaScriptCall " + getPluginStoreId(expectedReturn)); assertEquals(expectedReturn, call.join()); } @@ -110,7 +114,7 @@ Object expectedReturn = new Object(); pipeMock.sendResponse("context 0 reference " + parseAndCheckJSEval(message, jsObjectID, callName) - + " JavaScriptEval " + storeObject(expectedReturn)); + + " JavaScriptEval " + getPluginStoreId(expectedReturn)); assertEquals(expectedReturn, call.join()); } @@ -147,7 +151,7 @@ String expectedReturn = "testreturn"; pipeMock.sendResponse("context 0 reference " + parseAndCheckJSToString(message, jsObjectID) - + " JavaScriptToString " + storeObject(expectedReturn)); + + " JavaScriptToString " + getPluginStoreId(expectedReturn)); assertEquals(expectedReturn, call.join()); } @@ -157,19 +161,6 @@ **************************************************************************/ /* - * Helpers for manipulating the object mapping using to refer to objects in - * the plugin - */ - private static Object getStoredObject(int id) { - return PluginObjectStore.getInstance().getObject(id); - } - - private static int storeObject(Object obj) { - PluginObjectStore.getInstance().reference(obj); - return PluginObjectStore.getInstance().getIdentifier(obj); - } - - /* * Asserts that the message is a valid javascript request and returns the * reference number */ @@ -200,11 +191,11 @@ int reference = parseAndCheckJSMessage(message, expectedLength, messageType, contextObjectID); String[] parts = message.split(" "); - assertEquals(stringArg, getStoredObject(Integer.parseInt(parts[6]))); + assertEquals(stringArg, getPluginStoreObject(Integer.parseInt(parts[6]))); for (int i = 0; i < arguments.length; i++) { int objectID = Integer.parseInt(parts[7+i]); - assertEquals(arguments[i], getStoredObject(objectID)); + assertEquals(arguments[i], getPluginStoreObject(objectID)); } return reference; diff -r f3c918a41d10 -r d6d929b4a9a9 tests/test-extensions/sun/applet/PluginPipeMockUtil.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-extensions/sun/applet/PluginPipeMockUtil.java Thu May 02 11:08:55 2013 -0400 @@ -0,0 +1,131 @@ +/* Copyright (C) 2013 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. */ + +/* Must be in sun.applet to access PluginAppletSecurityContext's constructor and PluginObjectStore */ +package sun.applet; + +import java.util.IdentityHashMap; + +import sun.applet.mock.PluginPipeMock; + +/* + * Convenience class for PluginPipeMock. + * Provides convenient methods for installing a custom pipe mock and cleaning it up. + * + * Provides PipeMessageHandler interface and accompany convenience methods which can + * be used to define mocked pipes in a simple manner. + * */ +public class PluginPipeMockUtil { + + /************************************************************************** + * Basic setup & teardown * + **************************************************************************/ + + /* Maps PluginPipeMock instances to a ThreadGroup, allowing us to stop all the + * message handling threads that we started when setting up the mock pipes. */ + static private IdentityHashMap pipeToThreadGroup = new IdentityHashMap(); + + /* By providing custom implementations of the input stream & output stream used by PluginStreamHandler, + * we are able to mock the C++-side of the plugin. We do this by sending the messages the Java-side expects + * to receive. Additionally, we are able to test that the Java-side sends the correct requests. + * See PluginPipeMock for more details. + */ + static private PluginPipeMock installPipeMock() { + AppletSecurityContextManager.addContext(0, new PluginAppletSecurityContext(0, false /* no security manager */)); + + PluginPipeMock pipeMock = new PluginPipeMock(); + + PluginStreamHandler streamHandler = new PluginStreamHandler(pipeMock.getResponseInputStream(), pipeMock.getRequestOutputStream()); + PluginAppletViewer.setStreamhandler(streamHandler); + PluginAppletViewer.setPluginCallRequestFactory(new PluginCallRequestFactory()); + + streamHandler.startProcessing(); + + return pipeMock; + } + + + /* Set up the mocked plugin pipe environment. See installPipeMock for details. */ + static public PluginPipeMock setupMockedMessageHandling() throws Exception { + ThreadGroup pipeThreadGroup = new ThreadGroup("PluginAppletViewerTestThreadGroup") { + public void uncaughtException(Thread t, Throwable e) { + // Silent death for plugin message handler threads + } + }; + + final PluginPipeMock[] pipeMock = {null}; + // Do set-up in a thread so we can pass along our thread-group, used for clean-up. + Thread initThread = new Thread(pipeThreadGroup, "InstallPipeMockThread") { + @Override + public void run() { + pipeMock[0] = installPipeMock(); + } + }; + + initThread.start(); + initThread.join(); + + pipeToThreadGroup.put(pipeMock[0], pipeThreadGroup); + return pipeMock[0]; + } + + /* Kill any message handling threads started when setting up the mocked pipes */ + @SuppressWarnings("deprecation") + static public void cleanUpMockedMessageHandling(PluginPipeMock pipeMock) throws Exception { + ThreadGroup pipeThreadGroup = pipeToThreadGroup.get(pipeMock); + if (pipeThreadGroup != null) { + pipeThreadGroup.stop(); + } + pipeToThreadGroup.remove(pipeMock); + } + + /************************************************************************** + * Object store utilities * + **************************************************************************/ + /* + * Helpers for manipulating the object mapping using to refer to objects in + * the plugin + */ + public static Object getPluginStoreObject(int id) { + return PluginObjectStore.getInstance().getObject(id); + } + + /* Stores the object if it is not yet stored */ + public static int getPluginStoreId(Object obj) { + PluginObjectStore.getInstance().reference(obj); + return PluginObjectStore.getInstance().getIdentifier(obj); + } +} From gitne at excite.co.jp Thu May 2 08:07:56 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 00:07:56 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIE1vcmUgY29tcGxldGUgTmV0WCBqYXIgZmlsZSBtYW5pZmVzdA==?= Message-ID: <201305021507.r42F7uTv019027@mail-web03.excite.co.jp> Hello! I would like to propose to make the jar file manifest more complete, though I am not sure about the "Implementation-Vendor" attribute's (key) value. Have a nice day! Jacob From gitne at excite.co.jp Thu May 2 08:15:12 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 00:15:12 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBNb3JlIGNvbXBsZXRlIE5ldFggamFyIGZpbGUgbWFuaWZlc3Q=?= Message-ID: <201305021515.r42FFCQf023914@mail-web01.excite.co.jp> "Jacob Wisor" wrote: > Hello! > > I would like to propose to make the jar file manifest more complete, though I am not sure about the "Implementation-Vendor" attribute's (key) value. > > Have a nice day! > Jacob Sorry, webmailer issues again :( -------------- next part -------------- A non-text attachment was scrubbed... Name: More complete NetX manifest.patch Type: text/x-patch Size: 511 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130503/54271ec7/ISO-2022-JPBTW9yZSBjb21wbGV0ZSBOZXRYIG1hbmlmZXN0LnBhdGNo.patch From jvanek at icedtea.classpath.org Thu May 2 08:16:03 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 15:16:03 +0000 Subject: /hg/icedtea-web: Added default, DE and PL localization's tweeks Message-ID: changeset c90e2e706130 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c90e2e706130 author: Jiri Vanek date: Thu May 02 17:16:18 2013 +0200 Added default, DE and PL localization's tweeks diffstat: ChangeLog | 8 + netx/net/sourceforge/jnlp/resources/Messages.properties | 10 +- netx/net/sourceforge/jnlp/resources/Messages_de.properties | 44 ++++- netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 106 ++++++++---- 4 files changed, 124 insertions(+), 44 deletions(-) diffs (365 lines): diff -r d6d929b4a9a9 -r c90e2e706130 ChangeLog --- a/ChangeLog Thu May 02 11:08:55 2013 -0400 +++ b/ChangeLog Thu May 02 17:16:18 2013 +0200 @@ -1,3 +1,11 @@ +2013-04-26 Jiri Vanek + Jacob Wisor + + Added default, DE and PL localization's tweeks + * /netx/net/sourceforge/jnlp/resources/Messages.properties: + * netx/net/sourceforge/jnlp/resources/Messages_de.properties: + * netx/net/sourceforge/jnlp/resources/Messages_pl.properties + 2013-05-02 Adam Domurad Introduce PluginPipeMock utility methods. diff -r d6d929b4a9a9 -r c90e2e706130 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu May 02 11:08:55 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Thu May 02 17:16:18 2013 +0200 @@ -313,9 +313,9 @@ CPDebuggingDescription=Enable options here to help with debugging CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut. CPJVMPluginArguments=Set JVM arguments for plugin. -CPJVMitwExec=Set JVM for icedtea-web - working best with OpenJDK -CPJVMitwExecValidation=Validate JVM for icedtea-web -CPJVMPluginSelectExec=Select JVM for icedtea-web +CPJVMitwExec=Set JVM for IcedTea-Web ??? working best with OpenJDK +CPJVMitwExecValidation=Validate JVM for IcedTea-Web +CPJVMPluginSelectExec=Browse for JVM for IcedTea-Web CPJVMnone=No validation result for CPJVMvalidated=Validation result for CPJVMvalueNotSet=Value is not set. Hardcoded JVM will be used. @@ -332,9 +332,9 @@ CPJVMjava=Ok, the directory you chose contains bin/java. CPJVMnoRtJar=Error, the directory you chose does not contain lib/rt.jar CPJVMrtJar=Ok, the directory you chose contains lib/rt.jar. -CPJVMPluginAllowTTValidation=Allow type-time validation +CPJVMPluginAllowTTValidation=Validate JRE immediately CPJVMNotokMessage1=You have entered invalid JDK value ({0}) with following error message: -CPJVMNotokMessage2=You might be seeing this message because:
* Some validation has not been passed
* Non-OpenJDK is detected
With invalid JDK IcedTea-Web will probably not be able to start.
You will have to modify or remove {0} property in your configuration file {1}.
You should try to search for OpenJDK in your system or be sure you know what you are doing. +CPJVMNotokMessage2=You might be seeing this message because:
* Some validity tests have not been passed
* Non-OpenJDK is detected
With invalid JDK IcedTea-Web will probably not be able to start.
You will have to modify or remove {0} property in your configuration file {1}.
You should try to search for OpenJDK in your system or be sure you know what you are doing. CPJVMconfirmInvalidJdkTitle=Confirm invalid JDK CPJVMconfirmReset=Reset to default? diff -r d6d929b4a9a9 -r c90e2e706130 netx/net/sourceforge/jnlp/resources/Messages_de.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties Thu May 02 11:08:55 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties Thu May 02 17:16:18 2013 +0200 @@ -79,6 +79,9 @@ LUnsignedJarWithSecurityInfo=Anwendung hat Sicherheitsberechtigungen angefordert, aber Jars sind nicht signiert. LSignedJNLPAppDifferentCerts=Die JNLP Anwendung ist nicht vollst\u00e4ndig durch ein einzelnes Zertifikat signiert. LSignedJNLPAppDifferentCertsInfo=Der JNLP Anwendung wurden ihre Komponenten individuell signiert, jedoch muss es einen gemeinsamen Unterzeichner zu allen Eintr\u00e4gen geben. +LUnsignedApplet=Das Applet war nicht signiert. +LUnsignedAppletPolicyDenied=Das Applet war nicht signiert, deshalb wurde es an der Ausf\u00fchrung durch die Sicherheitsrichtlinie gehindert. +LUnsignedAppletUserDenied=Das Applet war nicht signiert und nicht vertrauensw\u00fcrdig. LSignedAppJarUsingUnsignedJar=Signierte Anwendung nutzt nicht signierte Jars. LSignedAppJarUsingUnsignedJarInfo=Das Haupt-Jar der Anwendung ist signiert, aber manche Jars, die sie nutzt sind nicht. LSignedJNLPFileDidNotMatch=Die signierte JNLP-Datei stimmt nicht mit der startenden JNLP-Datei \u00fcberein. @@ -187,11 +190,12 @@ BOStrict=Aktiviert die strikte Pr\u00fcfung des JNLP-Dateiformats. BOViewer=Zeigt die Ansicht der vertrauensw\u00fcrdigen Zertifikate. BXnofork=Keine weitere JVM erstellen. -BXclearcache=Den JNLP Anwendungszwischenspeicher s\u00e4ubern. +BXclearcache=Den JNLP-Anwendungszwischenspeicher s\u00e4ubern. +BXignoreheaders=Die Pr\u00fcfung der Metadaten von Jar-Dateien auslassen. BOHelp=Diese Meldung ausgeben und beenden. # Cache -CAutoGen=Automatisch generiert - Nicht editieren +CAutoGen=Automatisch generiert - Nicht editieren! CNotCacheable={0} ist keine zwischenspeicherbare Ressource CDownloading=Herunterladen CComplete=Vollst\u00e4ndig @@ -220,6 +224,14 @@ SUnverified=(nicht verifiziert) SAlwaysTrustPublisher=Dem Inhalt von diesem Herausgeber immer vertrauen SHttpsUnverified=Das HTTPS Zertifikat dieser Website kann nicht verifiziert werden. +SRememberOption=Soll diese Option gespeichert werden? +SRememberAppletOnly=F\u00fcr Applet +SRememberCodebase=F\u00fcr Website {0} +SUnsignedSummary=Eine nicht signierte Java Anwendung m\u00f6chte zur Ausf\u00fchrung gebracht werden. +SUnsignedDetail=Eine nicht signierte Anwendung am folgenden Ort m\u00f6chte zur Ausf\u00fchrung gebracht werden:
  {0}
Seite, welche die Anforderung gestellt hat:
  {1}

Es wird empfohlen ausschlie\u00dflich Anwendungen zur Ausf\u00fchrung zu bringen, die von vertrauensw\u00fcrdigen Websites stammen. +SUnsignedAllowedBefore=Dieses Applet wurde bereits akzeptiert. +SUnsignedRejectedBefore=Dieses Applet wurde bereits abgelehnt. +SUnsignedQuestion=Soll dem Applet die Ausf\u00fchrung erlaubt werden? SNotAllSignedSummary=Nur Teile des Anwendungscodes sind signiert. SNotAllSignedDetail=Diese Anwendung enth\u00e4lt sowohl signierten als auch nicht signierten Code. W\u00e4hrend signierter Code sicher ist, wenn Sie dem Anbieter vertrauen, kann nicht signierter Code sich \u00fcber Code erstrecken, der sich der Kontrolle des Anbieters entzieht. SNotAllSignedQuestion=Soll fortgefahren und diese Anwendung dennoch zur Ausf\u00fchrung gebracht werden? @@ -299,7 +311,31 @@ CPSecurityDescription=Dies zur Konfiguration von Sicherheitseinstellungen nutzen. CPDebuggingDescription=Hier Optionen aktivieren um bei der Fehlerbeseitigung zu helfen CPDesktopIntegrationDescription=Die Erstellung von Desktopverkn\u00fcpfungen zulassen oder verhindern. -CPJVMPluginArguments=JVM Argumente f\u00fcr das Plugin setzen. +CPJVMPluginArguments=JVM-Argumente f\u00fcr das Plugin setzen. +CPJVMitwExec=Eine JVM f\u00fcr IcedTea-Web einstellen, welche am besten mit OpenJDK funktioniert +CPJVMitwExecValidation=JVM f\u00fcr IcedTea-Web pr\u00fcfen +CPJVMPluginSelectExec=Nach JVM f\u00fcr IcedTea-Web durchsuchen +CPJVMnone=Kein Pr\u00fcfergebnis f\u00fcr +CPJVMvalidated=Pr\u00fcfergebnis f\u00fcr +CPJVMvalueNotSet=Kein Wert angegeben. Die fest eincodierte JVM wird verwendet. +CPJVMnotLaunched=Fehler: Der Prozess wurde nicht gestartet. F\u00fcr weitere Informationen, bitte die Konsolenausgabe beachten. +CPJVMnoSuccess=Der Prozess wurde mit einem Fehler beendet. Bitte die Ausgabe f\u00fcr weitere Details beachten. Die Java-Laufzeitumgebung ist nicht korrekt eingestellt. +CPJVMopenJdkFound=Exzellent, OpenJDK wurde erkannt +CPJVMoracleFound=Gro\u00dfartig, Oracle Java wurde erkannt +CPJVMibmFound=Gut, IBM Java wurde erkannt +CPJVMgijFound=Warnung, gij wurde erkannt +CPJVMstrangeProcess=Der Pfad hatte einen ausf\u00fchrbaren Prozess, aber dies wurde nicht erkannt. Bitte die Java-Version anhand der Konsolenausgabe \u00fcberpr\u00fcfen. +CPJVMnotDir=Fehler: Der gew\u00e4hlte Pfad ist kein Verzeichnis. +CPJVMisDir=Der gew\u00e4hlte Pfad is ein Verzeichnis. +CPJVMnoJava=Fehler: Das gew\u00e4hlte Verzeichnis enth\u00e4lt bin/java nicht. +CPJVMjava=Das gew\u00e4hlte Verzeichnis enth\u00e4lt bin/java. +CPJVMnoRtJar=Fehler: Das gew\u00e4hlte Verzeichnis enth\u00e4lt lib/rt.jar nicht. +CPJVMrtJar=Das Verzeichnis enth\u00e4lt lib/rt.jar. +CPJVMPluginAllowTTValidation=JRE sofort pr\u00fcfen +CPJVMNotokMessage1=Es wurde der ung\u00fcltige JDK-Wert ({0}) mit folgender Fehlermeldung eingegeben: +CPJVMNotokMessage2=M\u00f6gliche Gr\u00fcnde f\u00fcr diese Meldung sind:
* Einige Pr\u00fcftests wurden nicht bestanden
* Es wurde kein OpenJDK erkannt
Wegen eines ungeeigneten JDKs wird IcedTea-Web wahrscheinlich nicht starten k\u00f6nnen.
Die Eigenschaft {0} in der Konfigurationsdatei {1} m\u00fcsste angepasst oder entfernt werden.
Es wird empfohlen nach OpenJDK auf diesem System zu suchen. +CPJVMconfirmInvalidJdkTitle=Ungeeignetes JDK +CPJVMconfirmReset=Auf Standard zur\u00fccksetzen? # Control Panel - Buttons CPButAbout=\u00dcber... @@ -456,7 +492,7 @@ SPLASHClose=Schlie\u00dfen SPLASHclosewAndCopyException=Schlie\u00dfen und den Stapelverlauf in die Zwischenablage kopieren SPLASHexOccured=Eine schwerwiegende Ausnahme ist aufgetreten... -SPLASHHome=Heim +SPLASHHome=Seitenanfang SPLASHcantCopyEx=Kann Ausnahme nicht kopieren SPLASHnoExRecorded=Keine Ausnahme aufgezeichnet SPLASHmainL1=Um noch mehr Informationen zu erhalten, kann {0} besucht und die dort beschriebenen Schritte befolgt werden, um notwendige Informationen zu erhalten einen Fehler zu melden diff -r d6d929b4a9a9 -r c90e2e706130 netx/net/sourceforge/jnlp/resources/Messages_pl.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Thu May 02 11:08:55 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Thu May 02 17:16:18 2013 +0200 @@ -8,7 +8,7 @@ ButCancel=\ Anuluj ButClose=Zamknij ButCopy=Kopiuj do schowka -ButMoreInformation=Wi\u0119cej\u00A0informacji... +ButMoreInformation=Wi\u0119cej\u00a0informacji... ButOk=OK ButProceed=Kontynuuj ButRun=Uruchom @@ -17,7 +17,7 @@ ButShowDetails=Poka\u017c szczeg\u00f3\u0142y ButHideDetails=Chowaj szczeg\u00f3\u0142y -AFileOnTheMachine=plik na maszynie +AFileOnTheMachine=plik na komputerze AlwaysAllowAction=Zawsze zezwalaj na t\u0105 akcj\u0119 Usage=Stosowanie: Error=B\u0142\u0105d @@ -62,22 +62,25 @@ LNetxJarMissingInfo=Podj\u0119to pr\u00f3b\u0119 wystartowania pliku JNLP w innej JVM, lecz nie mo\u017cna by\u0142o zlokalizowa\u0107 netx.jar. Aby wystartowa\u0107 w zewn\u0119trznej JVM, uruchomienie programowe musi by\u0107 w stanie zlokalizowa\u0107 plik netx.jar. LNotToSpec=Plik JNLP nie spe\u0142nia \u015bci\u015ble specyfikacji. LNotToSpecInfo=Plik JNLP zawiera dane, kt\u00f3re s\u0105 zabronione wed\u0142ug specyfikacji JNLP. Uruchomienie programowe mo\u017ce pr\u00f3bowa\u0107 ignorowa\u0107 niepoprawne informacje i kontynuowa\u0107 startowanie pliku. -LNotApplication=Brak pliku aplikacyjnego. -LNotApplicationInfo=Podj\u0119to pr\u00f3b\u0119 za\u0142adowania innego pliku ni\u017c aplikacyjny jako aplikacj\u0119. -LNotApplet=Brak pliku aplikacyjkowego. -LNotAppletInfo=Podj\u0119to pr\u00f3b\u0119 za\u0142adowania innego pliku ni\u017c aplikacyjkowy jako aplikacyjk\u0119. +LNotApplication=Brak pliku applet-owego. +LNotApplicationInfo=Podj\u0119to pr\u00f3b\u0119 za\u0142adowania innego pliku ni\u017c applet-owego jako aplikacj\u0119. +LNotApplet=Brak pliku applet-owego. +LNotAppletInfo=Podj\u0119to pr\u00f3b\u0119 za\u0142adowania innego pliku ni\u017c applet-owy jako applet. LNoInstallers=Brak obs\u0142ugi instalator\u00f3w. LNoInstallersInfo=Pliki instalacyjne JNLP nie s\u0105 jeszcze obs\u0142ugiwane. -LInitApplet=Nie mo\u017cna zainicjalizowa\u0107 aplikacyjk\u0119. -LInitAppletInfo=Aby uzyska\u0107 wi\u0119cej informacji kliknij na przycisk \u201eWi\u0119cej\u00A0informacji\u201d. +LInitApplet=Nie mo\u017cna zainicjalizowa\u0107 applet-u. +LInitAppletInfo=Aby uzyska\u0107 wi\u0119cej informacji kliknij na przycisk \u201eWi\u0119cej\u00a0informacji\u201d. LInitApplication=Nie mo\u017cna zainicjalizowa\u0107 aplikacj\u0119. LInitApplicationInfo=Nie zainicjalizowano aplikacji. Aby uzyska\u0107 wi\u0119cej informacji, uruchom javaws z wiersza polece\u0144. LNotLaunchable=Plik JNLP nie do uruchomienia. -LNotLaunchableInfo=Plik musi by\u0107 typu aplikacja, aplikacyjka lub instalator JNLP. +LNotLaunchableInfo=Plik musi by\u0107 typu aplikacja, applet lub instalator JNLP. LCantDetermineMainClass=Klasa g\u0142\u00f3wna nieznana. LCantDetermineMainClassInfo=Nie da\u0142o si\u0119 ustali\u0107 klasy g\u0142\u00f3wnej tej aplikacji. LUnsignedJarWithSecurity=Nie mo\u017cna nada\u0107 uprawnie\u0144 niepodpisanym plikom jar. LUnsignedJarWithSecurityInfo=Aplikacja za\u017c\u0105da\u0142a uprawnie\u0144 bezpiecze\u0144stwa, lecz pliki jar nie s\u0105 podpisane. +LUnsignedApplet=Applet by\u0142 niepodpisany. +LUnsignedAppletPolicyDenied=Applet by\u0142 niepodpisany, a wytyczna bezpiecze\u0144stwa wstrzyma\u0142a jego uruchomienie. +LUnsignedAppletUserDenied=Applet by\u0142 niepodpisany i nie zaufano mu. LSignedJNLPAppDifferentCerts=Aplikacja JNLP nie jest w pe\u0142ni podpisana jednym certyfikatem. LSignedJNLPAppDifferentCertsInfo=Komponenty tej aplikacji JNLP podpisano indywidualnie, jednak musi by\u0107 wsp\u00f3lny podpisuj\u0105cy dla wszystkich wpis\u00f3w. LSignedAppJarUsingUnsignedJar=Podpisana aplikacja u\u017cywa niepodpisane pliki jar. @@ -85,9 +88,9 @@ LSignedJNLPFileDidNotMatch=Podpisany plik JNLP nie pasuje do starowanego pliku JNLP. LNoSecInstance=B\u0142\u0105d: Brak instancji bezpiecze\u0144stwa dla {0}. Aplikacja mo\u017ce dozna\u0107 problem\u00f3w w kontynuowaniu LCertFoundIn=Znalezino {0} w cacerts ({1}) -LSingleInstanceExists=Inna instancja tej aplikacyjki ju\u017c istnieje, a wy\u0142\u0105cznie jedna mo\u017ce by\u0107 wykonywana r\u00f3wnocze\u015bnie. +LSingleInstanceExists=Inna instancja tego applet-u ju\u017c istnieje, a wy\u0142\u0105cznie jedna mo\u017ce by\u0107 wykonywana r\u00f3wnocze\u015bnie. -JNotApplet=Plik nie jest aplikacyjk\u0105. +JNotApplet=Plik nie jest applet-em. JNotApplication=Plik nie jest aplikacj\u0105. JNotComponent=Plik nie jest komponentem. JNotInstaller=Plik nie jest instalatorem. @@ -123,9 +126,9 @@ PTwoTitles=Wy\u0142\u0105cznie jeden element \u201etitle\u201d jest dozwolony. PTwoIcons=Wy\u0142\u0105cznie jeden element \u201eicon\u201d jest dozwolony. PTwoUpdates=Wy\u0142\u0105cznie jeden element \u201eupdate\u201d jest dozwolony. -PUnknownApplet=Nieznana aplikacyjka -PBadWidth=Nieprawid\u0142owa szeroko\u015b\u0107 aplikacyjki -PBadHeight=Nieprawid\u0142owa wysoko\u015b\u0107 aplikacyjki +PUnknownApplet=Nieznany applet +PBadWidth=Nieprawid\u0142owa szeroko\u015b\u0107 applet-u +PBadHeight=Nieprawid\u0142owa wysoko\u015b\u0107 applet-u PUrlNotInCodebase=Po\u015bredni URL nie wskazuje na podkatalog bazy kodu. (w\u0119ze\u0142={0}, href={1}, baza={2}) PBadRelativeUrl=Nieprawid\u0142owy po\u015bredni URL (w\u0119ze\u0142={0}, href={1}, baza={2}) PBadNonrelativeUrl=Nieprawid\u0142owy bezpo\u015bredni URL (w\u0119ze\u0142={0}, href={1}) @@ -175,7 +178,7 @@ BOUsage2=javaws [-opcje-sterowania] BOJnlp=Lokalizacja pliku JNLP do wystartowania (URL lub plik) BOArg=Do wiesza argument aplikacji przed wystartowaniem -BOParam=Do wiesza parametr aplikacyjki przed wystartowaniem +BOParam=Do wiesza parametr applet-u przed wystartowaniem BOProperty=Ustawia w\u0142a\u015bciwo\u015b\u0107 systemow\u0105 przed wystartowaniem BOUpdate=Sprawd\u017a dost\u0119pno\u015b\u0107 aktualizacji BOLicense=Wy\u015bwietl licencj\u0119 GPL i zako\u0144cz @@ -188,6 +191,7 @@ BOViewer=Pokazuje podgl\u0105d zaufanych certyfikat\u00f3w BXnofork=Nie tw\u00f3rz nast\u0119pnej JVM BXclearcache=Wyczy\u015b\u0107 pami\u0119\u0107 podr\u0119czn\u0105 aplikacji JNLP +BXignoreheaders=Pomijaj weryfikacj\u0119 nag\u0142\u00f3wk\u00f3w plik\u00f3w jar BOHelp=Wy\u015bwietl ten komunikat i zako\u0144cz # Cache @@ -220,6 +224,14 @@ SUnverified=(niezweryfikowany) SAlwaysTrustPublisher=Zawsze ufaj materia\u0142om od tego wydawcy. SHttpsUnverified=Nie zweryfikowano certyfikat HTTPS witryny internetowej. +SRememberOption=Czy chcesz zapami\u0119ta\u0107 t\u0105 opcj\u0119? +SRememberAppletOnly=Dla applet-u +SRememberCodebase=Dla witryny {0} +SUnsignedSummary=Niepodpisana aplikacja Java domaga si\u0119 uruchomienia. +SUnsignedDetail=Niepodpisana aplikacja z nast\u0119puj\u0105cej lokalizacji domaga si\u0119 uruchomienia:
  {0}
Strona, kt\u00f3ra postawi\u0142a \u017c\u0105danie:
  {1}

Zaleca si\u0119 uruchamia\u0107 wy\u0142\u0105cznie aplikacje z zaufanych witryn. +SUnsignedAllowedBefore=Zaakceptowa\u0142e\u015b ten applet poprzednio. +SUnsignedRejectedBefore=Odrzuci\u0142e\u015b ten applet poprzednio. +SUnsignedQuestion=Czy chcesz zezwoli\u0107 temu applet-owi na uruchomienie? SNotAllSignedSummary=Zaledwie cz\u0119\u015bci kodu tej aplikacji s\u0105 podpisane. SNotAllSignedDetail=Ta aplikacja zawiera zar\u00f3wno podpisany jak i niepodpisany kod. Cho\u0107 kod, kt\u00f3ry jest podpisany przez zaufanego dostawc\u0119 jest bezpieczny, niepodpisany kod mo\u017ce poci\u0105ga\u0107 za sob\u0105 kod, kt\u00f3ry jest poza kontrolnym zasi\u0119giem zaufanego dostawcy. SNotAllSignedQuestion=Czy chcesz kontynuowa\u0107 i mimo to uruchomi\u0107 t\u0105 aplikacj\u0119? @@ -292,14 +304,38 @@ # Control Panel - Tab Descriptions CPAboutDescription=Przegl\u0105daj informacje o wersji panela sterowania IcedTea. -CPNetworkSettingsDescription=Konfiguruj ustawienia sieciowe, \u0142\u0105cznie ze sposobem \u0142\u0105czenia si\u0119 IcedTea-Web z internetem, czy te\u017c za po\u015brednictwem serwera proxy. +CPNetworkSettingsDescription=Konfiguruj ustawienia sieciowe, razem ze sposobem \u0142\u0105czenia si\u0119 IcedTea-Web z internetem, czy te\u017c za po\u015brednictwem serwera proxy. CPTempInternetFilesDescription=Java sk\u0142aduje dane aplikacji dla szybszego wykonywania podczas nast\u0119pnego uruchomienia. -CPJRESettingsDescription=Zarz\u0105dzaj wersjami Java Runtime Environment, jak i ustawieniami aplikacji i aplikacyjek Java. +CPJRESettingsDescription=Zarz\u0105dzaj wersjami Java Runtime Environment, jak i ustawieniami aplikacji i applet-\u00f3w Java. CPCertificatesDescription=Stosuj certyfikaty aby legitymowa\u0107 si\u0119, jak i sprawdza\u0107 to\u017csamo\u015b\u0107 certyfikat\u00f3w, organ\u00f3w certyfikacji i wydawc\u00f3w. CPSecurityDescription=Konfiguruj t\u0105 mask\u0105 ustawienia bezpiecze\u0144stwa. CPDebuggingDescription=W\u0142\u0105czaj opcje aby pom\u00f3c w usuwaniu b\u0142\u0119d\u00f3w w programie. CPDesktopIntegrationDescription=Ustaw czy zezwala\u0107 na tworzenie skr\u00f3tu na pulpicie. CPJVMPluginArguments=Ustaw argumenty maszyny wirtualnej Java (JVM) dla wtyczki. +CPJVMitwExec=Ustaw maszyn\u0119 wirtualn\u0105 Java (JVM) dla IcedTea-Web \u2014 dzia\u0142aj\u0105c\u0105 najlepiej z OpenJDK +CPJVMitwExecValidation=Sprawd\u017a JVM dla IcedTea-Web +CPJVMPluginSelectExec=Przegl\u0105daj za JVM dla IcedTea-Web +CPJVMnone=Brak wyniku sprawdzianu dla +CPJVMvalidated=Wynik sprawdzianu dla +CPJVMvalueNotSet=Nie ustawiono warto\u015bci. Stosowana b\u0119dzie JVM zakodowana na sztywno. +CPJVMnotLaunched=B\u0142\u0105d: Nie wystartowano procesu. Zobacz komunikaty konsoli, aby uzyska\u0107 wi\u0119cej informacji. +CPJVMnoSuccess=B\u0142\u0105d: Nie zako\u0144czono procesu pomy\u015blnie. Zobacz komunikaty aby uzyska\u0107 szczeg\u00f3\u0142y, przyczym Java jest \u017ale ustawiona. +CPJVMopenJdkFound=Znakomicie, wykryto OpenJDK +CPJVMoracleFound=Wspaniale, wykryto Oracle Java +CPJVMibmFound=Dobrze, wykryto IBM Java +CPJVMgijFound=Ostrze\u017cenie, wykryto gij +CPJVMstrangeProcess=\u015acie\u017cka mia\u0142a proces wykonywalny, lecz go nie rozpoznano. Sprawd\u017a wersj\u0119 Java w komunikatach konsoli. +CPJVMnotDir=B\u0142\u0105d: Wybrana \u015bcie\u017cka nie jest katalogiem. +CPJVMisDir=Wybrana \u015bcie\u017cka jest katalogiem. +CPJVMnoJava=B\u0142\u0105d: Wybrana \u015bcie\u017cka nie zawiera bin/java. +CPJVMjava=Wybrana \u015bcie\u017cka zawiera bin/java. +CPJVMnoRtJar=B\u0142\u0105d: Wybrana \u015bcie\u017cka nie zawiera lib/rt.jar. +CPJVMrtJar=Wybrana \u015bcie\u017cka zawiera lib/rt.jar. +CPJVMPluginAllowTTValidation=Sprawd\u017a JRE bezzw\u0142ocznie +CPJVMNotokMessage1=Wprowadzono nieprawid\u0142ow\u0105 warto\u015b\u0107 JDK ({0}) z nast\u0119puj\u0105cym komunikatem o b\u0142\u0119dzie: +CPJVMNotokMessage2=Przyczyn\u0105 tego komunikatu mog\u0105 by\u0107:
* Nie zaliczono niekt\u00f3trych sprawdzan\u00f3w
* Wykryto inny ni\u017c OpenJDK
Ze wzgl\u0119du na nieprawid\u0142owy JDK IcedTea-Web prawdopodobnie nie b\u0119dzie w stanie wystartowa\u0107.
Trzeba b\u0119dzie dostosowa\u0107 lub usun\u0105\u0107 w\u0142a\u015bciwo\u015b\u0107 \u201e{0}\u201d w pliku konfiguracyjnym \u201e{1}\u201d.
Przeszukaj system za OpenJDK. +CPJVMconfirmInvalidJdkTitle=Nieprawid\u0142owy JDK +CPJVMconfirmReset=Przywr\u00f3ci\u0107 stan domy\u015blny? # Control Panel - Buttons CPButAbout=O... @@ -318,7 +354,7 @@ CPHeadDebugging=\u00a0Ustawienia\u00a0analizy\u00a0i\u00a0usuwania\u00a0b\u0142\u0119d\u00f3w\u00a0 CPHeadDesktopIntegration=\u00a0Integracja\u00a0z\u00a0pulpitem\u00a0 CPHeadSecurity=\u00a0Ustawienia\u00a0bezpiecze\u0144stwa\u00a0 -CPHeadJVMSettings=\u00a0Ustawienia\u00a0wirtualnej\u00a0maszyny\u00a0Java\u00a0(JVM)\u00a0 +CPHeadJVMSettings=\u00a0Ustawienia\u00a0maszyny\u00a0wirtualnej\u00a0Java\u00a0(JVM)\u00a0 # Control Panel - Tabs CPTabAbout=O IcedTea-Web @@ -359,7 +395,7 @@ DPJavaConsole=Konsola Java # Control Panel - DesktopShortcutPanel -DSPNeverCreate=Tw\u00f3rz nigdy +DSPNeverCreate=Nigdy nie tw\u00f3rz DSPAlwaysAllow=Zawsze zezwalaj DSPAskUser=Pytaj u\u017cytkownika DSPAskIfHinted=Pytaj je\u015bli sugerowane @@ -456,7 +492,7 @@ SPLASHClose=Zamknij SPLASHclosewAndCopyException=Zamknij i kopiuj \u015blad stosu do schowka SPLASHexOccured=Wyst\u0105pi\u0142 powa\u017cny wyj\u0105tek... -SPLASHHome=Plac\u00f3wka +SPLASHHome=Pocz\u0105tek SPLASHcantCopyEx=Nie mo\u017cna skopiowa\u0107 wyj\u0105tku SPLASHnoExRecorded=Nie odnotowano wyj\u0105tku SPLASHmainL1=Aby uzyska\u0107 wi\u0119cej informacji wejd\u017a na stron\u0119 {0} i zastosuj tam opisane kroki aby pozyska\u0107 informacje niezb\u0119dne do z\u0142o\u017cenia raportu o b\u0142\u0119dzie w programie. @@ -472,21 +508,21 @@ SPLASHdefaultHomepage=Brak witryny, sprawd\u017a raczej \u017ar\u00f3d\u0142o SPLASHerrorInInformation=Wyst\u0105pi\u0142 b\u0142\u0105d w trakcie \u0142adowania elementu \u201einformation\u201d, sprawd\u017a raczej \u017ar\u00f3d\u0142o SPLASHmissingInformation=Brak elementu \u201einformation\u201d, sprawd\u017a raczej \u017ar\u00f3d\u0142o -SPLASHchainWas=To jest lista wyj\u0105tk\u00f3w kt\u00f3re wyst\u0105pi\u0142y w trakcie startowania aplikacyjki. Prosz\u0119 zauwa\u017cy\u0107, \u017ce wyj\u0105tki te mog\u0105 pochodzi\u0107 z r\u00f3\u017cnych aplikacyjek. Aby uzyska\u0107 po\u017cyteczny raport o b\u0142\u0119dzie w programie, upewnij si\u0119 aby wykonywano wy\u0142\u0105cznie jedn\u0105 aplikacyjk\u0119. +SPLASHchainWas=To jest lista wyj\u0105tk\u00f3w kt\u00f3re wyst\u0105pi\u0142y w trakcie startowania applet-u. Prosz\u0119 zauwa\u017cy\u0107, \u017ce wyj\u0105tki te mog\u0105 pochodzi\u0107 z r\u00f3\u017cnych applet-\u00f3w. Aby uzyska\u0107 po\u017cyteczny raport o b\u0142\u0119dzie w programie, upewnij si\u0119 aby wykonywano wy\u0142\u0105cznie jeden applet. -APPEXTSECappletSecurityLevelExtraHighId=Wy\u0142\u0105cz uruchamianie wszystkich aplikacyjek Java +APPEXTSECappletSecurityLevelExtraHighId=Wy\u0142\u0105cz uruchamianie wszystkich applet-\u00f3w Java APPEXTSECappletSecurityLevelVeryHighId=Bardzo wysokie bezpiecze\u0144stwo APPEXTSECappletSecurityLevelHighId=Wysokie bezpiecze\u0144stwo APPEXTSECappletSecurityLevelLowId=Niskie bezpiecze\u0144stwo -APPEXTSECappletSecurityLevelExtraHighExplanation=\u017badna aplikacyjka nie b\u0119dzie uruchamiania -APPEXTSECappletSecurityLevelVeryHighExplanation=Wy\u0142\u0105cznie podpisane aplikacyjki b\u0119d\u0105 uruchamianie -APPEXTSECappletSecurityLevelHighExplanation=U\u017cytkownik b\u0119dzie pytany dla ka\u017cdej aplikacyjki -APPEXTSECappletSecurityLevelLowExplanation=Wszystkie aplikacyjki b\u0119d\u0105 uruchamianie, nawet niepodpisane -APPEXTSECunsignedAppletActionAlways=Zawsze ufaj tym (zaznaczonym) aplikacyjkom -APPEXTSECunsignedAppletActionNever=Nigdy nie ufaj tym (zaznaczonym) aplikacyjkom -APPEXTSECunsignedAppletActionYes=Wizytowano i zezwolono tej aplikacyjce -APPEXTSECunsignedAppletActionNo=Wizytowano i odm\u00f3wiono zezwolenia tej aplikacyjce -APPEXTSECControlPanelExtendedAppletSecurityTitle=Rozszerzone bezpiecze\u0144stwo aplikacyjek +APPEXTSECappletSecurityLevelExtraHighExplanation=\u017baden applet nie b\u0119dzie uruchamiany +APPEXTSECappletSecurityLevelVeryHighExplanation=Wy\u0142\u0105cznie podpisane applet-y b\u0119d\u0105 uruchamianie +APPEXTSECappletSecurityLevelHighExplanation=U\u017cytkownik b\u0119dzie pytany dla ka\u017cdego applet-u +APPEXTSECappletSecurityLevelLowExplanation=Wszystkie applet-y b\u0119d\u0105 uruchamianie, nawet niepodpisane +APPEXTSECunsignedAppletActionAlways=Zawsze ufaj tym (zaznaczonym) applet-om +APPEXTSECunsignedAppletActionNever=Nigdy nie ufaj tym (zaznaczonym) applet-om +APPEXTSECunsignedAppletActionYes=Wizytowano i zezwolono temu applet-owi +APPEXTSECunsignedAppletActionNo=Wizytowano i odm\u00f3wiono zezwolenia temu applet-owi +APPEXTSECControlPanelExtendedAppletSecurityTitle=Rozszerzone bezpiecze\u0144stwo applet-\u00f3w APPEXTSECguiTableModelTableColumnAction=Akcja APPEXTSECguiTableModelTableColumnDateOfAction=Data akcji APPEXTSECguiTableModelTableColumnDocumentBase=Baza dokumentu @@ -497,13 +533,13 @@ APPEXTSECguiPanelConfirmDeletionOf=Czy na pewno chcesz usun\u0105\u0107 nast\u0119puj\u0105ce pozycje: {0}? APPEXTSECguiPanelHelpButton=Pomoc APPEXTSECguiPanelSecurityLevel=Poziom bezpiecze\u0144stwa -APPEXTSECguiPanelGlobalBehaviourCaption=Ustawienia systemowe post\u0119powania przy obs\u0142udze aplikacyjek +APPEXTSECguiPanelGlobalBehaviourCaption=Ustawienia systemowe post\u0119powania przy obs\u0142udze applet-\u00f3w APPEXTSECguiPanelDeleteMenuSelected=Zaznaczone APPEXTSECguiPanelDeleteMenuAllA=Wszystkie dozwolone (A) APPEXTSECguiPanelDeleteMenuAllN=Wszystkie zabronione (N) APPEXTSECguiPanelDeleteMenuAlly=Wszystkie zatwierdzone (y) APPEXTSECguiPanelDeleteMenuAlln=Wszystkie odrzucone (n) -APPEXTSECguiPanelDeleteMenuAllAll=Zupe\u0142nie wszystkie +APPEXTSECguiPanelDeleteMenuAllAll=Bezwzgl\u0119dnie wszystkie APPEXTSECguiPanelDeleteButton=Usu\u0144 APPEXTSECguiPanelDeleteButtonToolTip=Naciskaj\u0105c klawisz DEL, podczas przegl\u0105dania tabeli, mo\u017cesz usun\u0105\u0107 zaznaczone wpisy APPEXTSECguiPanelTestUrlButton=Testuj URL @@ -532,6 +568,6 @@ APPEXTSECguiPanelShowAll=Pokazuj wszystkie wpisy APPEXTSECguiPanelShowOnlyPermanentA=Pokazuj wy\u0142\u0105cznie zezwolone wpisy sta\u0142e APPEXTSECguiPanelShowOnlyPermanentN=Pokazuj wy\u0142\u0105cznie zabronione wpisy sta\u0142e -APPEXTSECguiPanelShowOnlyTemporalY=Pokazuj poprzednio zezwolone wpisy aplikacyjek -APPEXTSECguiPanelShowOnlyTemporalN=Pokazuj poprzednio odm\u00f3wione wpisy aplikacyjek +APPEXTSECguiPanelShowOnlyTemporalY=Pokazuj poprzednio zezwolone wpisy applet-\u00f3w +APPEXTSECguiPanelShowOnlyTemporalN=Pokazuj poprzednio odm\u00f3wione wpisy applet-\u00f3w APPEXTSEChelpHomeDialogue=Dialog From gitne at excite.co.jp Thu May 2 08:16:05 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 00:16:05 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIE1vcmUgY29tcGxldGUgTmV0WCBqYXIgZmlsZSBtYW5pZmVzdA==?= Message-ID: <201305021516.r42FG5Qn019538@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > Hello! > > I would like to propose to make the jar file manifest more complete, though I am not sure about the "Implementation-Vendor" attribute's (key) value. > > Have a nice day! > Jacob Sorry, webmailer issues again :( -------------- next part -------------- A non-text attachment was scrubbed... Name: More complete NetX manifest.patch Type: text/x-patch Size: 511 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130503/cb30309b/ISO-2022-JPBTW9yZSBjb21wbGV0ZSBOZXRYIG1hbmlmZXN0LnBhdGNo.patch From gitne at excite.co.jp Thu May 2 08:20:51 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 00:20:51 +0900 Subject: =?ISO-2022-JP?B?UmU6IC9oZy9pY2VkdGVhLXdlYjogQWRkZWQgZGVmYXVsdCwgREUgYW5kIFBMIGxvY2FsaXphdGlvbidzIHR3ZWVrcw==?= Message-ID: <201305021520.r42FKp62019844@mail-web03.excite.co.jp> wrote: > changeset c90e2e706130 in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c90e2e706130 > author: Jiri Vanek > date: Thu May 02 17:16:18 2013 +0200 > > Added default, DE and PL localization's tweeks > > > diffstat: > > ChangeLog | 8 + > netx/net/sourceforge/jnlp/resources/Messages.properties | 10 +- > netx/net/sourceforge/jnlp/resources/Messages_de.properties | 44 ++++- > netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 106 ++++++++---- > 4 files changed, 124 insertions(+), 44 deletions(-) > > diffs (365 lines): > > diff -r d6d929b4a9a9 -r c90e2e706130 ChangeLog > --- a/ChangeLog Thu May 02 11:08:55 2013 -0400 > +++ b/ChangeLog Thu May 02 17:16:18 2013 +0200 > @@ -1,3 +1,11 @@ > +2013-04-26 Jiri Vanek > + Jacob Wisor > + > + Added default, DE and PL localization's tweeks > + * /netx/net/sourceforge/jnlp/resources/Messages.properties: One slash too many at the beginning of the path ;) > + * netx/net/sourceforge/jnlp/resources/Messages_de.properties: > + * netx/net/sourceforge/jnlp/resources/Messages_pl.properties > + [...] From jfabriko at icedtea.classpath.org Thu May 2 08:25:40 2013 From: jfabriko at icedtea.classpath.org (jfabriko at icedtea.classpath.org) Date: Thu, 02 May 2013 15:25:40 +0000 Subject: /hg/icedtea-web: change to the Makefile.am, all icons from repro... Message-ID: changeset d1b601fe784c in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d1b601fe784c author: Jana Fabrikova date: Thu May 02 17:28:46 2013 +0200 change to the Makefile.am, all icons from reproducers diffstat: ChangeLog | 19 + Makefile.am | 10 +- netx-dist-tests-whitelist | 2 +- tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp | 57 +++ tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java | 166 ++++++++++ tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java | 138 ++++++++ tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png | Bin tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java | 5 +- 8 files changed, 393 insertions(+), 4 deletions(-) diffs (444 lines): diff -r c90e2e706130 -r d1b601fe784c ChangeLog --- a/ChangeLog Thu May 02 17:16:18 2013 +0200 +++ b/ChangeLog Thu May 02 17:28:46 2013 +0200 @@ -1,3 +1,22 @@ +2013-05-02 Jana Fabrikova + + * Makefile.am: + Change in processing the goal + (stamps/compile-reproducers-testcases.stamp) + All .java files from reproducers testcases directory are + compiled, all non-java files are copied into the + TEST_EXTENSIONS_TESTS_DIR, i.e. + tests.build/test-extensions-tests directory + * tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp: + jnlp file for displaying the applet + * tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java: + the applet used in the reproducer + * tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java: + adding 2 tests: that an icon is loaded, and that the button is + identified from the given icon and clicked by awt robot + * tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png: + the icon of the wanted button + 2013-04-26 Jiri Vanek Jacob Wisor diff -r c90e2e706130 -r d1b601fe784c Makefile.am --- a/Makefile.am Thu May 02 17:16:18 2013 +0200 +++ b/Makefile.am Thu May 02 17:28:46 2013 +0200 @@ -788,7 +788,15 @@ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(TEST_EXTENSIONS_TESTS_DIR) \ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \ + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ + if [ -d "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ]; then \ + pushd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ; \ + NONJAVA_RESOURCES=`ls | grep -v ".*\\.java$$"` ; \ + if [ -n "$$NONJAVA_RESOURCES" ]; then \ + cp $$NONJAVA_RESOURCES $(TEST_EXTENSIONS_TESTS_DIR)/ ; \ + fi ; \ + popd ; \ + fi ; \ done ; \ done ; \ mkdir -p stamps && \ diff -r c90e2e706130 -r d1b601fe784c netx-dist-tests-whitelist --- a/netx-dist-tests-whitelist Thu May 02 17:16:18 2013 +0200 +++ b/netx-dist-tests-whitelist Thu May 02 17:28:46 2013 +0200 @@ -1,1 +1,1 @@ -.* +.*JavawsAWTRobot.* diff -r c90e2e706130 -r d1b601fe784c tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/resources/javaws-awtrobot-finds-button.jnlp Thu May 02 17:28:46 2013 +0200 @@ -0,0 +1,57 @@ + + + + + AWTRobot usage sample + IcedTea + + AWTRobot usage sample + + + + + + + + + diff -r c90e2e706130 -r d1b601fe784c tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/srcs/JavawsAWTRobotFindsButton.java Thu May 02 17:28:46 2013 +0200 @@ -0,0 +1,166 @@ +/* JavawsAWTRobotFindsButton.java +Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + */ + +import java.applet.Applet; +import java.awt.Graphics; +import java.awt.Color; +import java.awt.Image; +import java.awt.Panel; +import java.awt.Button; +import java.awt.Dimension; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +public class JavawsAWTRobotFindsButton extends Applet { + + private static final String initStr = "JavawsAWTRobotFindsButton is ready for awt tests!"; + public static final String iconFile = "marker.png"; + + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green + + public Image img; + public Panel panel; + + public void init(){ + img = getImage(getCodeBase(), iconFile); + + createGUI(); + + writeAppletInitialized(); + } + + //this method should be called by the extending applet + //when the whole gui is ready + public void writeAppletInitialized(){ + System.out.println(initStr); + } + + //paint the icon in upper left corner + @Override public void paint(Graphics g){ + int width = 32; + int height = 32; + int x = 0; + int y = 0; + g.drawImage(img, x, y, width, height, this); + super.paint(g); + } + + private Button createButton(String label, Color color) { + Button b = new Button(label); + b.setBackground(color); + b.setPreferredSize(new Dimension(100, 50)); + return b; + } + + // sets background of the applet + // and adds the panel with 2 buttons + private void createGUI() { + setBackground(APPLET_COLOR); + + panel = new Panel(); + panel.setBounds(33,33,267,267); + + Button bA = createButton("Button A", BUTTON_COLOR1); + + + bA.addMouseListener(new MouseListener() { + + public void mouseClicked(MouseEvent e) { + System.out.println("Mouse clicked button A."); + } + + @Override + public void mouseEntered(MouseEvent arg0) { + + } + + @Override + public void mouseExited(MouseEvent arg0) { + + } + + @Override + public void mousePressed(MouseEvent arg0) { + + } + + @Override + public void mouseReleased(MouseEvent arg0) { + + } + + }); + + panel.add(bA); + + + Button bB = createButton("Button B", BUTTON_COLOR1); + + + bB.addMouseListener(new MouseListener() { + + public void mouseClicked(MouseEvent e) { + System.out.println("Mouse clicked button B."); + } + + @Override + public void mouseEntered(MouseEvent e) { + + } + + @Override + public void mouseExited(MouseEvent e) { + + } + + @Override + public void mousePressed(MouseEvent e) { + + } + + @Override + public void mouseReleased(MouseEvent e) { + + } + }); + + panel.add(bB); + + this.add(panel); + } +} diff -r c90e2e706130 -r d1b601fe784c tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java Thu May 02 17:28:46 2013 +0200 @@ -0,0 +1,138 @@ +/* JavawsAWTRobotFindsButtonTest.java +Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + */ + +import java.awt.Color; +import java.awt.event.InputEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.awt.AWTFrameworkException; +import net.sourceforge.jnlp.awt.AWTHelper; +import net.sourceforge.jnlp.awt.imagesearch.ComponentFinder; +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.closinglisteners.Rule; + +import org.junit.Assert; +import org.junit.Test; + +public class JavawsAWTRobotFindsButtonTest { + + public static final ServerAccess server = new ServerAccess(); + + private final String initStr = "JavawsAWTRobotFindsButton is ready for awt tests!"; + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green + + private static final BufferedImage buttonIcon; + + static{ + try { + buttonIcon = ImageIO.read(JavawsAWTRobotFindsButtonTest.class.getClassLoader().getResource("buttonA.png")); + } catch (IOException e) { + throw new RuntimeException("Problem initializing buttonIcon",e); + } + } + + private class AWTHelperImpl_ClickButtonIcon extends AWTHelper{ + + public AWTHelperImpl_ClickButtonIcon() { + super(initStr, 400, 400); + + this.setAppletColor(APPLET_COLOR); + } + + @Override + public void run() { + // move mouse into the button area and out + try { + clickOnIconExact(buttonIcon, InputEvent.BUTTON1_MASK); + } catch (ComponentNotFoundException e) { + Assert.fail("Button icon not found: "+e.getMessage()); + } + + } + } + + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { + + // Assert that the applet was initialized. + Rule i = helper.getInitStrAsRule(); + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); + + // Assert there are all the test messages from applet + for (Rule r : helper.getRules() ) { + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); + } + + } + + + private void appletAWTMouseTest(String url, AWTHelper helper) throws Exception { + + String strURL = "/" + url; + + try { + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms + ProcessResult pr = server.executeJavaws(strURL, helper, helper); + evaluateStdoutContents(pr, helper); + } finally { + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms + } + } + + @Test + @NeedsDisplay + public void findAndClickButtonByIcon_Test() throws Exception { + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_ClickButtonIcon(); + helper.addClosingRulesFromStringArray(new String[] { "Mouse clicked button A." }); + appletAWTMouseTest("javaws-awtrobot-finds-button.jnlp", helper); + } + + @Test + public void iconFileLoaded_Test() throws IOException { + Assert.assertNotNull("buttonIcon should not be null", buttonIcon); + } + +} diff -r c90e2e706130 -r d1b601fe784c tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png Binary file tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/buttonA.png has changed diff -r c90e2e706130 -r d1b601fe784c tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java --- a/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Thu May 02 17:16:18 2013 +0200 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Thu May 02 17:28:46 2013 +0200 @@ -55,10 +55,11 @@ import org.junit.Assert; import org.junit.Test; -public class JavawsAWTRobotUsageSampleTest extends BrowserTest { +public class JavawsAWTRobotUsageSampleTest { + + public static final ServerAccess server = new ServerAccess(); private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; - private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green From jvanek at icedtea.classpath.org Thu May 2 08:48:41 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 15:48:41 +0000 Subject: /hg/icedtea-web: Minor cleanup, fixed output from ResourceTracke... Message-ID: changeset 2131a590d645 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2131a590d645 author: Jiri Vanek date: Thu May 02 17:48:10 2013 +0200 Minor cleanup, fixed output from ResourceTracker and whitelist diffstat: netx-dist-tests-whitelist | 2 +- netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r d1b601fe784c -r 2131a590d645 netx-dist-tests-whitelist --- a/netx-dist-tests-whitelist Thu May 02 17:28:46 2013 +0200 +++ b/netx-dist-tests-whitelist Thu May 02 17:48:10 2013 +0200 @@ -1,1 +1,1 @@ -.*JavawsAWTRobot.* +.* diff -r d1b601fe784c -r 2131a590d645 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 17:28:46 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 17:48:10 2013 +0200 @@ -916,7 +916,7 @@ } }else { if (JNLPRuntime.isDebug()) { - System.out.println("best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod); + System.err.println("best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod); } return url; /* This is the best URL */ } From jvanek at redhat.com Thu May 2 08:59:14 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 17:59:14 +0200 Subject: [rfc] [icedtea-web] remote tests for applets Message-ID: <51828D52.7060209@redhat.com> Hi! As promised long ago, now when there is the possibility to get rid of "security dialog" by awt robot there are some automated remote applet reproducers. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: remoteAppletTests.diff Type: text/x-patch Size: 18875 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3d2eba74/remoteAppletTests.diff -------------- next part -------------- A non-text attachment was scrubbed... Name: runButton.png Type: image/png Size: 642 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3d2eba74/runButton.png -------------- next part -------------- A non-text attachment was scrubbed... Name: javaInfo.png Type: image/png Size: 1009 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3d2eba74/javaInfo.png -------------- next part -------------- A non-text attachment was scrubbed... Name: portalbankLogo.png Type: image/png Size: 330 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3d2eba74/portalbankLogo.png From jfabriko at redhat.com Thu May 2 09:06:46 2013 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 02 May 2013 18:06:46 +0200 Subject: [rfc][icedtea-web] modification to JavawsAWTRobotUsageSample reproducer Message-ID: <1367510806.28857.22.camel@jana-2-174.nrt.redhat.com> Hi, I am sending a patch that modifies the JavawsAWTRobotUsageSample reproducer by adding 6 browser tests that test also clicking on a button inside an applet, only in browser, any comments welcome, cheers, Jana ChangeLog: 2013-05-02 Jana Fabrikova * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html: new resource, html page for displaying the applet in browser * tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java: new testcase with 6 browser tests -------------- next part -------------- A non-text attachment was scrubbed... Name: adding_browsertests_to_JavawsAWTRobotUsageSample.patch Type: text/x-patch Size: 13310 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3aacc818/adding_browsertests_to_JavawsAWTRobotUsageSample.patch From jvanek at redhat.com Thu May 2 09:07:24 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 18:07:24 +0200 Subject: [rfc][icedtea-web] modification to JavawsAWTRobotUsageSample reproducer In-Reply-To: <1367510806.28857.22.camel@jana-2-174.nrt.redhat.com> References: <1367510806.28857.22.camel@jana-2-174.nrt.redhat.com> Message-ID: <51828F3C.8050903@redhat.com> On 05/02/2013 06:06 PM, Jana Fabrikova wrote: > Hi, > > I am sending a patch that modifies the JavawsAWTRobotUsageSample > reproducer by adding 6 browser tests that test also clicking on a button > inside an applet, only in browser, > any comments welcome, > > cheers, > Jana > > ChangeLog: > > 2013-05-02 Jana Fabrikova > > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html: > new resource, html page for displaying the applet in browser > * > tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java: > new testcase with 6 browser tests > > Considering this compiles, and passes Then I'm happy with it to go in. J. From adomurad at icedtea.classpath.org Thu May 2 09:29:57 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 02 May 2013 16:29:57 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 15b3aaef3a81 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=15b3aaef3a81 author: Adam Domurad date: Thu May 02 11:43:13 2013 -0400 Remove only occurence of LEGACY_XULRUNNERAPI changeset 1d648cbb2555 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1d648cbb2555 author: Adam Domurad date: Thu May 02 12:28:10 2013 -0400 Ensure that PluginAppletViewer is resized in case of error. diffstat: ChangeLog | 15 ++ plugin/icedteanp/IcedTeaNPPlugin.cc | 6 +- plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java | 63 ++++----- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10 +- 4 files changed, 50 insertions(+), 44 deletions(-) diffs (172 lines): diff -r 2131a590d645 -r 1d648cbb2555 ChangeLog --- a/ChangeLog Thu May 02 17:48:10 2013 +0200 +++ b/ChangeLog Thu May 02 12:28:10 2013 -0400 @@ -27,6 +27,21 @@ 2013-05-02 Adam Domurad + Ensure that PluginAppletviewer is resized in case of error. + This fixes most of the cases of the error splash screen + not appearing. + * plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java + (createPanel): Resize earlier, before erroring out. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (PluginAppletViewer): Set size, remove fixme. + +2013-05-02 Adam Domurad + + * plugin/icedteanp/IcedTeaNPPlugin.cc: + Remove only occurence of LEGACY_XULRUNNERAPI + +2013-05-02 Adam Domurad + Introduce PluginPipeMock utility methods. * tests/test-extensions/sun/applet/PluginPipeMockUtil.java: New, enapsulates PluginPipeMock initialization, cleanup. As well, contains diff -r 2131a590d645 -r 1d648cbb2555 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu May 02 17:48:10 2013 +0200 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu May 02 12:28:10 2013 -0400 @@ -1995,11 +1995,7 @@ // Returns a string describing the MIME type that this plugin // handles. __attribute__ ((visibility ("default"))) -#ifdef LEGACY_XULRUNNERAPI - char* -#else - const char* -#endif +const char* NP_GetMIMEDescription () { PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); diff -r 2131a590d645 -r 1d648cbb2555 plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java Thu May 02 17:48:10 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletPanelFactory.java Thu May 02 12:28:10 2013 -0400 @@ -112,13 +112,14 @@ }, "NetXPanel initializer"); panelInit.start(); - while(panelInit.isAlive()) { - try { - panelInit.join(); - } catch (InterruptedException e) { - } + try { + panelInit.join(); + } catch (InterruptedException e) { + e.printStackTrace(); } + setAppletViewerSize(panel, params.getWidth(), params.getHeight()); + // Wait for the panel to initialize PluginAppletViewer.waitForAppletInit(panel); @@ -133,30 +134,6 @@ PluginDebug.debug("Applet ", a.getClass(), " initialized"); streamhandler.write("instance " + identifier + " reference 0 initialized"); - /* AppletViewerPanel sometimes doesn't set size right initially. This - * causes the parent frame to be the default (10x10) size. - * - * Normally it goes unnoticed since browsers like Firefox make a resize - * call after init. However some browsers (e.g. Midori) don't. - * - * We therefore manually set the parent to the right size. - */ - try { - SwingUtilities.invokeAndWait(new Runnable() { - public void run() { - panel.getParent().setSize(params.getWidth(), params.getHeight()); - } - }); - } catch (InvocationTargetException ite) { - // Not being able to resize is non-fatal - PluginDebug.debug("Unable to resize panel: "); - ite.printStackTrace(); - } catch (InterruptedException ie) { - // Not being able to resize is non-fatal - PluginDebug.debug("Unable to resize panel: "); - ie.printStackTrace(); - } - panel.removeSplash(); AppletSecurityContextManager.getSecurityContext(0).associateSrc(panel.getAppletClassLoader(), doc); @@ -165,10 +142,32 @@ return panel; } - public boolean isStandalone() { - return false; + /* AppletViewerPanel sometimes doesn't set size right initially. This + * causes the parent frame to be the default (10x10) size. + * + * Normally it goes unnoticed since browsers like Firefox make a resize + * call after init. However some browsers (e.g. Midori) don't. + * + * We therefore manually set the parent to the right size. + */ + static private void setAppletViewerSize(final AppletPanel panel, + final int width, final int height) { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + panel.getParent().setSize(width, height); + } + }); + } catch (InvocationTargetException e) { + // Not being able to resize is non-fatal + PluginDebug.debug("Unable to resize panel: "); + e.printStackTrace(); + } catch (InterruptedException e) { + // Not being able to resize is non-fatal + PluginDebug.debug("Unable to resize panel: "); + e.printStackTrace(); + } } - /** * Send the initial set of events to the appletviewer event queue. * On start-up the current behaviour is to load the applet and call diff -r 2131a590d645 -r 1d648cbb2555 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu May 02 17:48:10 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu May 02 12:28:10 2013 -0400 @@ -188,11 +188,7 @@ public PluginAppletViewer() { } - //FIXME - when multiple applets are on one page, this method is visited simultaneously - //and then appelts creates in little bit strange manner. This issue is visible with - //randomly showing/notshowing spalshscreens. - //See also Launcher.createApplet - public static PluginAppletViewer framePanel(int identifier,long handle, int width, int height, NetxPanel panel) { + public static PluginAppletViewer framePanel(int identifier, long handle, int width, int height, NetxPanel panel) { PluginDebug.debug("Framing ", panel); @@ -200,6 +196,7 @@ System.getSecurityManager().checkPermission(new AllPermission()); PluginAppletViewer appletFrame = new PluginAppletViewer(handle, identifier, panel); + appletFrame.setSize(width, height); appletFrame.appletEventListener = new AppletEventListener(appletFrame, appletFrame); panel.addAppletListener(appletFrame.appletEventListener); @@ -216,7 +213,7 @@ appletsLock.unlock(); PluginDebug.debug(panel, " framed"); - return appletFrame; + return appletFrame; } /** @@ -332,7 +329,6 @@ return -1; } } - private static class AppletEventListener implements AppletListener { final Frame frame; From omajid at redhat.com Thu May 2 09:32:03 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 02 May 2013 12:32:03 -0400 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <201305021515.r42FFCQf023914@mail-web01.excite.co.jp> References: <201305021515.r42FFCQf023914@mail-web01.excite.co.jp> Message-ID: <51829503.2090608@redhat.com> On 05/02/2013 11:15 AM, Jacob Wisor wrote: > "Jacob Wisor" wrote: >>> I would like to propose to make the jar file manifest more >>> complete, though I am not sure about the "Implementation-Vendor" >>> attribute's (key) value. I would use "IcedTea" > +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web Please use @PACKAGE_URL@ here, instead of duplicating the URL. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jfabriko at icedtea.classpath.org Thu May 2 09:41:09 2013 From: jfabriko at icedtea.classpath.org (jfabriko at icedtea.classpath.org) Date: Thu, 02 May 2013 16:41:09 +0000 Subject: /hg/icedtea-web: modification of JavawsAWTRobotUsageSample repro... Message-ID: changeset 0d6213db4fc7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0d6213db4fc7 author: Jana Fabrikova date: Thu May 02 18:44:16 2013 +0200 modification of JavawsAWTRobotUsageSample reproducer diffstat: ChangeLog | 7 + tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html | 72 ++ tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java | 256 ++++++++++ 3 files changed, 335 insertions(+), 0 deletions(-) diffs (350 lines): diff -r 1d648cbb2555 -r 0d6213db4fc7 ChangeLog --- a/ChangeLog Thu May 02 12:28:10 2013 -0400 +++ b/ChangeLog Thu May 02 18:44:16 2013 +0200 @@ -1,3 +1,10 @@ +2013-05-02 Jana Fabrikova + + * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html: + new resource, html page for displaying the applet in browser + * tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java: + new testcase with 6 browser tests + 2013-05-02 Jana Fabrikova * Makefile.am: diff -r 1d648cbb2555 -r 0d6213db4fc7 tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html Thu May 02 18:44:16 2013 +0200 @@ -0,0 +1,72 @@ + + + + + AWTRobot usage sample page with an applet + + + + +
+
+
+ +
+ +
+
+
+ +
+ + + +
+ +
+
+
+ +
+ + + diff -r 1d648cbb2555 -r 0d6213db4fc7 tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/AppletAWTRobotUsageSampleTest.java Thu May 02 18:44:16 2013 +0200 @@ -0,0 +1,256 @@ +/* AppletAWTRobotUsageSampleTest.java +Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + */ + +import java.awt.AWTException; +import java.awt.Color; +import java.awt.event.InputEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; +import net.sourceforge.jnlp.awt.AWTFrameworkException; +import net.sourceforge.jnlp.awt.AWTHelper; +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.Rule; + +import org.junit.Assert; +import org.junit.Test; + +public class AppletAWTRobotUsageSampleTest extends BrowserTest { + + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!"; + + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green + + private abstract class AWTHelperImpl extends AWTHelper{ + + public AWTHelperImpl() { + super(initStr, 400, 400); + + this.setAppletColor(APPLET_COLOR); + } + + } + + private class AWTHelperImpl_EnterExit extends AWTHelperImpl { + + @Override + public void run() { + // move mouse into the button area and out + try { + moveToMiddleOfColoredRectangle(BUTTON_COLOR1); + moveOutsideColoredRectangle(BUTTON_COLOR1); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{ + + @Override + public void run() { + // click in the middle of the button + + try { + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON1_MASK); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseClick2 extends AWTHelperImpl{ + @Override + public void run() { + // move mouse in the middle of the button and click 2nd + // button + try { + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON2_MASK); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseClick3 extends AWTHelperImpl{ + @Override + public void run() { + // move mouse in the middle of the button and click 3rd + // button + try { + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON3_MASK); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseDrag extends AWTHelperImpl{ + @Override + public void run() { + // move into the rectangle, press 1st button, drag out + try { + dragFromColoredRectangle(BUTTON_COLOR1); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + private class AWTHelperImpl_MouseMove extends AWTHelperImpl{ + @Override + public void run() { + clickInTheMiddleOfApplet(); + try { + moveInsideColoredRectangle(BUTTON_COLOR1); + } catch (ComponentNotFoundException e) { + Assert.fail("Button not found: "+e.getMessage()); + } catch (AWTFrameworkException e2){ + Assert.fail("AWTFrameworkException: "+e2.getMessage()); + } + } + } + + + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) { + + // Assert that the applet was initialized. + Rule i = helper.getInitStrAsRule(); + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr)); + + // Assert there are all the test messages from applet + for (Rule r : helper.getRules() ) { + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout)); + } + + } + + + private void appletAWTMouseTest(String url, AWTHelper helper) + throws Exception { + + String strURL = "/" + url; + + ProcessResult pr = server.executeBrowser(strURL, helper, helper); + evaluateStdoutContents(pr, helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_EnterAndExit_Test() throws Exception { + + // display the page, activate applet, move over the button + AWTHelper helper = new AWTHelperImpl_EnterExit(); + helper.addClosingRulesFromStringArray(new String[] { "mouseEntered", "mouseExited"}); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_ClickButton1_Test() throws Exception { + + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_MouseClick1(); + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton1", "mouseReleasedButton1", "mouseClickedButton1" }); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_ClickButton2_Test() throws Exception { + + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_MouseClick2(); + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton2", "mouseReleasedButton2", "mouseClickedButton2" }); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_ClickButton3_Test() throws Exception { + + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_MouseClick3(); + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton3", "mouseReleasedButton3", "mouseClickedButton3" }); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_Drag_Test() throws Exception { + + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_MouseDrag(); + helper.addClosingRulesFromStringArray(new String[] { "mouseDragged" }); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } + + @Test + @TestInBrowsers(testIn = { Browsers.one }) + @NeedsDisplay + public void AppletAWTMouse_Move_Test() throws Exception { + + // display the page, activate applet, click on button + AWTHelper helper = new AWTHelperImpl_MouseMove(); + helper.addClosingRulesFromStringArray(new String[] { "mouseMoved" }); + appletAWTMouseTest("AppletAWTRobotUsageSample.html", helper); + } +} From jfabriko at redhat.com Thu May 2 09:54:03 2013 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 02 May 2013 18:54:03 +0200 Subject: [rfc] [icedtea-web] remote tests for applets In-Reply-To: <51828D52.7060209@redhat.com> References: <51828D52.7060209@redhat.com> Message-ID: <1367513643.28857.29.camel@jana-2-174.nrt.redhat.com> Hello, thank you for the patch. I have tried to run the testcases and on my computer only the last one passed. The two tests that search for the "Run" button did not succeed, probably because the buttons looked different than the given pattern, even with the swing look and feel. The idea is great, but I think some modifications will be needed for running the tests with slightly different dialogs on different systems. Maybe if searching for blurred image was used instead of searching for exact image, the button could be found (i did not try it yet). Other possible solution may be to create the pattern before the tests on the same system where the tests will run, cheers, Jana On Thu, 2013-05-02 at 17:59 +0200, Jiri Vanek wrote: > Hi! > > As promised long ago, now when there is the possibility to get rid of "security dialog" by awt robot > there are some automated remote applet reproducers. > > J. > From gnu_andrew at member.fsf.org Thu May 2 09:56:05 2013 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 2 May 2013 17:56:05 +0100 Subject: [SECURITY] IcedTea 2.1.8 for OpenJDK 7 Released! Message-ID: <20130502165603.GA14824@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. This release updates our OpenJDK 7 support to include the latest security updates. We recommend that users of the 2.1.x branch upgrade to this latest release as soon as possible. The security fixes are as follows: * S6657673, CVE-2013-1518: Issues with JAXP * S7200507: Refactor Introspector internals * S8000724, CVE-2013-2417: Improve networking serialization * S8001031, CVE-2013-2419: Better font processing * S8001040, CVE-2013-1537: Rework RMI model * S8001322: Refactor deserialization * S8001329, CVE-2013-1557: Augment RMI logging * S8003335: Better handling of Finalizer thread * S8003445: Adjust JAX-WS to focus on API * S8003543, CVE-2013-2415: Improve processing of MTOM attachments * S8004261: Improve input validation * S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames * S8004986, CVE-2013-2383: Better handling of glyph table * S8004987, CVE-2013-2384: Improve font layout * S8004994, CVE-2013-1569: Improve checking of glyph table * S8005432: Update access to JAX-WS * S8005943: (process) Improved Runtime.exec * S8006309: More reliable control panel operation * S8006435, CVE-2013-2424: Improvements in JMX * S8006790: Improve checking for windows * S8006795: Improve font warning messages * S8007406: Improve accessibility of AccessBridge * S8007617, CVE-2013-2420: Better validation of images * S8007667, CVE-2013-2430: Better image reading * S8007918, CVE-2013-2429: Better image writing * S8008140: Better method handle resolution * S8009049, CVE-2013-2436: Better method handle binding * S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap * S8009305, CVE-2013-0401: Improve AWT data transfer * S8009677, CVE-2013-2423: Better setting of setters * S8009699, CVE-2013-2421: Methodhandle lookup * S8009814, CVE-2013-1488: Better driver management * S8009857, CVE-2013-2422: Problem with plugin In addition, IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more estoric architectures. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. New in release 2.1.8 (2013-05-02): * Security fixes - S6657673, CVE-2013-1518: Issues with JAXP - S7200507: Refactor Introspector internals - S8000724, CVE-2013-2417: Improve networking serialization - S8001031, CVE-2013-2419: Better font processing - S8001040, CVE-2013-1537: Rework RMI model - S8001322: Refactor deserialization - S8001329, CVE-2013-1557: Augment RMI logging - S8003335: Better handling of Finalizer thread - S8003445: Adjust JAX-WS to focus on API - S8003543, CVE-2013-2415: Improve processing of MTOM attachments - S8004261: Improve input validation - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames - S8004986, CVE-2013-2383: Better handling of glyph table - S8004987, CVE-2013-2384: Improve font layout - S8004994, CVE-2013-1569: Improve checking of glyph table - S8005432: Update access to JAX-WS - S8005943: (process) Improved Runtime.exec - S8006309: More reliable control panel operation - S8006435, CVE-2013-2424: Improvements in JMX - S8006790: Improve checking for windows - S8006795: Improve font warning messages - S8007406: Improve accessibility of AccessBridge - S8007617, CVE-2013-2420: Better validation of images - S8007667, CVE-2013-2430: Better image reading - S8007918, CVE-2013-2429: Better image writing - S8008140: Better method handle resolution - S8009049, CVE-2013-2436: Better method handle binding - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap - S8009305, CVE-2013-0401: Improve AWT data transfer - S8009677, CVE-2013-2423: Better setting of setters - S8009699, CVE-2013-2421: Methodhandle lookup - S8009814, CVE-2013-1488: Better driver management - S8009857, CVE-2013-2422: Problem with plugin * Backports - S7130662, RH928500: GTK file dialog crashes with a NPE * Bug fixes - PR1363: Fedora 19 / rawhide FTBFS SIGILL - Fix offset problem in ICU LETableReference. - Don't create debuginfo files if not stripping. The tarball can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.1.8.tar.gz SHA256 checksum: ea68180fe8b40732ccea41cdd6c628de4f660b20fccb4cd87ab35f0727c08b11 icedtea-2.1.8.tar.gz The tarball is accompanied by a digital signature available at: * http://icedtea.classpath.org/download/source/icedtea-2.1.8.tar.gz.sig This is produced using my public key. See details below. PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 The following people helped with these releases: * Andrew Hughes (application of security fixes & backports, release management) * Roman Kennke (offset fix) * Chris Phillips (PR1363 patch for ARM issue) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.1.8.tar.gz $ cd icedtea-2.1.8 Full build requirements and instructions are in INSTALL: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.1.8/configure [--enable-zero --enable-pulse-java --enable-systemtap ...] $ make Happy hacking! -- Andrew :) -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/21ccb7d3/attachment.bin From andrew at icedtea.classpath.org Thu May 2 09:57:03 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 02 May 2013 16:57:03 +0000 Subject: /hg/release/icedtea7-2.1: 4 new changesets Message-ID: changeset 3311abee7c58 in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=3311abee7c58 author: Andrew John Hughes date: Thu May 02 10:20:45 2013 +0100 Bring in security fixes and other recent forest changes. 2013-05-01 Andrew John Hughes (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD, bringing in security fixes, RH928500 & debuginfo file removal. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. * NEWS: Updated. * patches/boot/ecj-diamond.patch: Regenerate due to security patches. changeset 0f170ac337a6 in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=0f170ac337a6 author: Andrew John Hughes date: Thu May 02 10:21:43 2013 +0100 Prepare for 2.1.8 release. 2013-05-02 Andrew John Hughes * configure.ac: Bump to 2.1.8 proper. * NEWS: Set release date for 2.1.8. changeset 40b919581506 in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=40b919581506 author: Andrew John Hughes date: Thu May 02 16:10:08 2013 +0100 PR1404: Failure to bootstrap with ecj 4.2 2013-05-02 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Initialise to empty so it always has a value. Change addition of classes to += from =. * acinclude.m4: (IT_CHECK_FOR_METHOD): Remove call to IT_CHECK_JAVA_AND_JAVAC_WORK to avoid backporting. (IT_CHECK_FOR_CONSTRUCTOR): Likewise. 2013-04-18 Andrew John Hughes PR1404: Failure to bootstrap with ecj 4.2 * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext, SSLEngine and SslRMIServerSocketFactory if methods are missing. (IT_LANGUAGE_SOURCE_VERSION): Set to 7 if supported. (IT_CLASS_TARGET_VERSION): Likewise. * configure.ac: Mention bugs in comments. Add tests for getDefaultSSLParameters/setSSLParameters and new 7 SslRMIServerSocketFactory. * NEWS: Updated. 2013-01-11 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_CLASS): Write class toString() output to System.err rather than throwing it away. It then appears in config.log and may be useful in debugging. (IT_CHECK_FOR_METHOD): Fix documentation and add System.err output as for IT_CHECK_FOR_CLASS. (IT_CHECK_FOR_CONSTRUCTOR): New macro to test for the presence of a specific constructor. Works with both private & protected constructors by using a subclass for the compile test. 2012-08-13 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Only add Matcher if the quoteReplacement method is absent. * acinclude.m4: (IT_JAVAH): Explicitly set source & target. (IT_LIBRARY_CHECK): Likewise. (IT_PR40630_CHECK): Likewise. (IT_CHECK_FOR_CLASS): Likewise. (IT_DIAMOND_CHECK): Specify target as 7 as well. (IT_CHECK_FOR_METHOD): New macro to check for the existence of a Java method both at build and runtime. * configure.ac: Check for java.util.regex.Matcher.quoteReplacement. changeset bda6f93d4927 in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=bda6f93d4927 author: Andrew John Hughes date: Thu May 02 17:56:53 2013 +0100 Added tag icedtea-2.1.8 for changeset 40b919581506 diffstat: .hgtags | 1 + ChangeLog | 75 ++++++++++++++++++++++ Makefile.am | 50 +++++++++++--- NEWS | 40 +++++++++++- acinclude.m4 | 135 ++++++++++++++++++++++++++++++++++++++-- configure.ac | 25 +++++++- patches/boot/ecj-diamond.patch | 4 +- 7 files changed, 308 insertions(+), 22 deletions(-) diffs (469 lines): diff -r 9ee6ad4f47a9 -r bda6f93d4927 .hgtags --- a/.hgtags Mon Apr 08 01:25:42 2013 +0100 +++ b/.hgtags Thu May 02 17:56:53 2013 +0100 @@ -44,3 +44,4 @@ 763c13001988cc50ffd1d195a110c1650b2d7fe1 icedtea-2.1.5 05bc6e6f7d9cbed6d4760813236856c9782c5277 icedtea-2.1.6 04dbdea00c8531667d0273ed9ee76fa7db645f94 icedtea-2.1.7 +40b919581506871ff1e35d9b635b4bb371d656aa icedtea-2.1.8 diff -r 9ee6ad4f47a9 -r bda6f93d4927 ChangeLog --- a/ChangeLog Mon Apr 08 01:25:42 2013 +0100 +++ b/ChangeLog Thu May 02 17:56:53 2013 +0100 @@ -1,3 +1,78 @@ +2013-05-02 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Initialise to + empty so it always has a value. Change + addition of classes to += from =. + * acinclude.m4: + (IT_CHECK_FOR_METHOD): Remove call to + IT_CHECK_JAVA_AND_JAVAC_WORK to avoid backporting. + (IT_CHECK_FOR_CONSTRUCTOR): Likewise. + +2013-04-18 Andrew John Hughes + + PR1404: Failure to bootstrap with ecj 4.2 + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext, + SSLEngine and SslRMIServerSocketFactory if + methods are missing. + (IT_LANGUAGE_SOURCE_VERSION): Set to 7 if supported. + (IT_CLASS_TARGET_VERSION): Likewise. + * configure.ac: Mention bugs in comments. + Add tests for getDefaultSSLParameters/setSSLParameters + and new 7 SslRMIServerSocketFactory. + * NEWS: Updated. + +2013-01-11 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_FOR_CLASS): Write class toString() output + to System.err rather than throwing it away. It then + appears in config.log and may be useful in debugging. + (IT_CHECK_FOR_METHOD): Fix documentation and add + System.err output as for IT_CHECK_FOR_CLASS. + (IT_CHECK_FOR_CONSTRUCTOR): New macro to test for + the presence of a specific constructor. Works + with both private & protected constructors by + using a subclass for the compile test. + +2012-08-13 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Only add Matcher if + the quoteReplacement method is absent. + * acinclude.m4: + (IT_JAVAH): Explicitly set source & target. + (IT_LIBRARY_CHECK): Likewise. + (IT_PR40630_CHECK): Likewise. + (IT_CHECK_FOR_CLASS): Likewise. + (IT_DIAMOND_CHECK): Specify target as 7 as well. + (IT_CHECK_FOR_METHOD): New macro to check for the + existence of a Java method both at build and runtime. + * configure.ac: + Check for java.util.regex.Matcher.quoteReplacement. + +2013-05-02 Andrew John Hughes + + * configure.ac: Bump to 2.1.8 proper. + * NEWS: Set release date for 2.1.8. + +2013-05-01 Andrew John Hughes + + (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD, + bringing in security fixes, RH928500 & debuginfo file + removal. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + * NEWS: Updated. + * patches/boot/ecj-diamond.patch: + Regenerate due to security patches. + 2013-04-08 Andrew John Hughes * Makefile.am: diff -r 9ee6ad4f47a9 -r bda6f93d4927 Makefile.am --- a/Makefile.am Mon Apr 08 01:25:42 2013 +0100 +++ b/Makefile.am Thu May 02 17:56:53 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -HOTSPOT_CHANGESET = 4e4dd75d54e7 +HOTSPOT_CHANGESET = 2c4981784101 CORBA_CHANGESET = 313f1ee32118 -JAXP_CHANGESET = 691f82a0de0b -JAXWS_CHANGESET = a48ebab198a4 -JDK_CHANGESET = 1040c44a496d +JAXP_CHANGESET = c04b95aa746c +JAXWS_CHANGESET = d04602077b14 +JDK_CHANGESET = acaa2de9f547 LANGTOOLS_CHANGESET = c63c8a2164e4 OPENJDK_CHANGESET = c1c649636704 -HOTSPOT_SHA256SUM = 46b4bb240e3ebea1e151c57aa9afb0cb4706f4fc467b651a6c5090101352853d +HOTSPOT_SHA256SUM = 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b CORBA_SHA256SUM = 9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952 -JAXP_SHA256SUM = 17a242852010f535c11f874aae07a6d60f7007541fe1586666638cc6d58f8f1f -JAXWS_SHA256SUM = 57dab4837468b775ff55e21352c7920f3f35c1e6ceb130154fb89eeb163e176f -JDK_SHA256SUM = e624a809f099870100330022bda9dafe30bfa4539ee14ec118ffa3ebbafa012d +JAXP_SHA256SUM = 9df7d4d04168c9c6e57c5b51ca3a54defe5e892d56a256b3d3deda3b12173e63 +JAXWS_SHA256SUM = 1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d +JDK_SHA256SUM = bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6 OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f @@ -98,22 +98,50 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS) # Sources used from OpenJDK. +ICEDTEA_BOOTSTRAP_CLASSES = + if LACKS_SUN_AWT_TOOLKIT -#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement #PR48033 - Missing javax.management.remote.JMXServiceURL #PR48034 - javax.management.modelmbean.ModelMBeanInfo #PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure -ICEDTEA_BOOTSTRAP_CLASSES = \ - $(SHARE)/java/util/regex/Matcher.java \ +ICEDTEA_BOOTSTRAP_CLASSES += \ $(SHARE)/javax/management/remote/JMXServiceURL.java \ $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java endif +#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement +if LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/util/regex/Matcher.java +endif + +#PR56553 - SSLParameters support missing +if LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/net/ssl/SSLContext.java +endif +if LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/net/ssl/SSLEngine.java +endif + +#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7 +if LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7 +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java +endif + # Settings for javac +if NO_BYTECODE7 IT_LANGUAGE_SOURCE_VERSION=6 IT_CLASS_TARGET_VERSION=6 +else +IT_LANGUAGE_SOURCE_VERSION=7 +IT_CLASS_TARGET_VERSION=7 +endif + IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE) IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) diff -r 9ee6ad4f47a9 -r bda6f93d4927 NEWS --- a/NEWS Mon Apr 08 01:25:42 2013 +0100 +++ b/NEWS Thu May 02 17:56:53 2013 +0100 @@ -10,10 +10,48 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.1.8 (2013-04-XX): +New in release 2.1.8 (2013-05-02): +* Security fixes + - S6657673, CVE-2013-1518: Issues with JAXP + - S7200507: Refactor Introspector internals + - S8000724, CVE-2013-2417: Improve networking serialization + - S8001031, CVE-2013-2419: Better font processing + - S8001040, CVE-2013-1537: Rework RMI model + - S8001322: Refactor deserialization + - S8001329, CVE-2013-1557: Augment RMI logging + - S8003335: Better handling of Finalizer thread + - S8003445: Adjust JAX-WS to focus on API + - S8003543, CVE-2013-2415: Improve processing of MTOM attachments + - S8004261: Improve input validation + - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames + - S8004986, CVE-2013-2383: Better handling of glyph table + - S8004987, CVE-2013-2384: Improve font layout + - S8004994, CVE-2013-1569: Improve checking of glyph table + - S8005432: Update access to JAX-WS + - S8005943: (process) Improved Runtime.exec + - S8006309: More reliable control panel operation + - S8006435, CVE-2013-2424: Improvements in JMX + - S8006790: Improve checking for windows + - S8006795: Improve font warning messages + - S8007406: Improve accessibility of AccessBridge + - S8007617, CVE-2013-2420: Better validation of images + - S8007667, CVE-2013-2430: Better image reading + - S8007918, CVE-2013-2429: Better image writing + - S8008140: Better method handle resolution + - S8009049, CVE-2013-2436: Better method handle binding + - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap + - S8009305, CVE-2013-0401: Improve AWT data transfer + - S8009677, CVE-2013-2423: Better setting of setters + - S8009699, CVE-2013-2421: Methodhandle lookup + - S8009814, CVE-2013-1488: Better driver management + - S8009857, CVE-2013-2422: Problem with plugin +* Backports + - S7130662, RH928500: GTK file dialog crashes with a NPE * Bug fixes - PR1363: Fedora 19 / rawhide FTBFS SIGILL + - Fix offset problem in ICU LETableReference. + - Don't create debuginfo files if not stripping. New in release 2.1.7 (2013-03-11): diff -r 9ee6ad4f47a9 -r bda6f93d4927 acinclude.m4 --- a/acinclude.m4 Mon Apr 08 01:25:42 2013 +0100 +++ b/acinclude.m4 Thu May 02 17:56:53 2013 +0100 @@ -1181,7 +1181,7 @@ public native void doStuff(); } EOF -if $JAVAC -cp . $JAVACFLAGS $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then if $JAVAH -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then if cat $SUBHEADER | grep POTATO >&AS_MESSAGE_LOG_FD 2>&1; then it_cv_cp39408_javah=no; @@ -1232,7 +1232,7 @@ } } EOF -if $JAVAC -cp . $JAVACFLAGS $SRC >&AS_MESSAGE_LOG_FD 2>&1; then +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $SRC >&AS_MESSAGE_LOG_FD 2>&1; then if $JAVAH -classpath . $CLASSFILE >&AS_MESSAGE_LOG_FD 2>&1; then if test -e Test_Inner.h ; then it_cv_cp45526_javah=no; @@ -1333,7 +1333,7 @@ } }] EOF -if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then it_cv_cp40616=no; else @@ -1373,7 +1373,7 @@ } }] EOF - if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then it_cv_cp40630=no; else @@ -1470,12 +1470,12 @@ { public static void main(String[] args) { - $2.class.toString(); + System.err.println("Class found: " + $2.class); } } ] EOF -if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then it_cv_$1=no; else @@ -1727,7 +1727,7 @@ } }] EOF - if $JAVAC -cp . $JAVACFLAGS -source 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then it_cv_diamond=no; else it_cv_diamond=yes; @@ -2178,3 +2178,124 @@ AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes") AC_PROVIDE([$0])dnl ]) + +dnl Generic macro to check for a Java constructor +dnl Takes four arguments: the name of the macro, +dnl the name of the class, the method signature +dnl and an example call to the method. The macro name +dnl is usually the name of the class with '.' +dnl replaced by '_' and all letters capitalised. +dnl e.g. IT_CHECK_FOR_CONSTRUCTOR([JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_TWO_ARG],[javax.management.StandardMBean],[Class.class,Boolean.TYPE],[Object.class, true]) +AC_DEFUN([IT_CHECK_FOR_CONSTRUCTOR],[ +AC_CACHE_CHECK([if $2($3) is missing], it_cv_$1, [ +CLASS=Test.java +BYTECODE=$(echo $CLASS|sed 's#\.java##') +mkdir tmp.$$ +cd tmp.$$ +cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +import java.lang.reflect.Constructor; + +public class Test +{ + public static void main(String[] args) + { + Class cl = $2.class; + try + { + Constructor cons = cl.getDeclaredConstructor($3); + System.err.println("Constructor found: " + cons); + } + catch (NoSuchMethodException e) + { + System.exit(-1); + } + } + + private class TestCons extends $2 + { + TestCons() + { + super($4); + } + } + +} + +] +EOF +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_$1=no; + else + it_cv_$1=yes; + fi +else + it_cv_$1=yes; +fi +]) +rm -f $CLASS *.class +cd .. +rmdir tmp.$$ +AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes") +AC_PROVIDE([$0])dnl +]) + +dnl Generic macro to check for a Java method +dnl Takes five arguments: the name of the macro, +dnl the name of the method, the name of the class, +dnl the method signature and an example call to the +dnl method. The macro name is usually the name of +dnl the class with '.' replaced by '_' and all letters +dnl capitalised. +dnl e.g. IT_CHECK_FOR_METHOD([JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT],[java.util.regex.Matcher.quoteReplacement],[java.util.regex.Matcher],["quoteReplacement",String.class],java.util.regex.Matcher.quoteReplacement("Blah")) +AC_DEFUN([IT_CHECK_FOR_METHOD],[ +AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [ +CLASS=Test.java +BYTECODE=$(echo $CLASS|sed 's#\.java##') +mkdir tmp.$$ +cd tmp.$$ +cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +import java.lang.reflect.Method; + +public class Test +{ + public static void main(String[] args) + { + Class cl = $3.class; + try + { + Method m = cl.getDeclaredMethod($4); + System.err.println("Method found: " + m); + } + catch (NoSuchMethodException e) + { + System.exit(-1); + } + } + + public void dontRun() + { + $5; + } + +} +] +EOF +if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_$1=no; + else + it_cv_$1=yes; + fi +else + it_cv_$1=yes; +fi +]) +rm -f $CLASS *.class +cd .. +rmdir tmp.$$ +AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r 9ee6ad4f47a9 -r bda6f93d4927 configure.ac --- a/configure.ac Mon Apr 08 01:25:42 2013 +0100 +++ b/configure.ac Thu May 02 17:56:53 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.1.8pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.1.8], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) @@ -116,6 +116,29 @@ IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource]) IT_GETDTDTYPE_CHECK IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit]) +dnl PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement +IT_CHECK_FOR_METHOD([JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT],[java.util.regex.Matcher.quoteReplacement],[java.util.regex.Matcher],["quoteReplacement",String.class],java.util.regex.Matcher.quoteReplacement("Blah")) +dnl PR56553 - SSLParameters support missing +IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS], + [javax.net.ssl.SSLContext.getDefaultSSLParameters], + [javax.net.ssl.SSLContext], + ["getDefaultSSLParameters"], + [try { javax.net.ssl.SSLContext.getDefault().getDefaultSSLParameters(); } catch (Exception e) {}] +) +IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS], + [javax.net.ssl.SSLEngine.setSSLParameters], + [javax.net.ssl.SSLEngine], + ["setSSLParameters", javax.net.ssl.SSLParameters.class], + [try { javax.net.ssl.SSLContext.getDefault().createSSLEngine().setSSLParameters(new javax.net.ssl.SSLParameters()); } + catch (Exception e) {}] +) +dnl PR57008 - Add missing SslRMIServerSocketFactory constructor from 7 +IT_CHECK_FOR_CONSTRUCTOR([JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7], + [javax.rmi.ssl.SslRMIServerSocketFactory], + [javax.net.ssl.SSLContext.class,String@<:@@:>@.class,String@<:@@:>@.class,Boolean.TYPE], + [null,null,null,true] +) + IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_BYTECODE7_CHECK diff -r 9ee6ad4f47a9 -r bda6f93d4927 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Mon Apr 08 01:25:42 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Thu May 02 17:56:53 2013 +0100 @@ -948,8 +948,8 @@ */ final class ThreadGroupContext { -- private static final Map contexts = new WeakHashMap<>(); -+ private static final Map contexts = new WeakHashMap(); +- private static final WeakIdentityMap contexts = new WeakIdentityMap<>(); ++ private static final WeakIdentityMap contexts = new WeakIdentityMap(); /** * Returns the appropriate {@code AppContext} for the caller, From bugzilla-daemon at icedtea.classpath.org Thu May 2 09:57:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 02 May 2013 16:57:13 +0000 Subject: [Bug 1404] [IcedTea7] Failure to bootstrap with ecj 4.2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1404 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.1?cmd=changeset;node=40b919581506 author: Andrew John Hughes date: Thu May 02 16:10:08 2013 +0100 PR1404: Failure to bootstrap with ecj 4.2 2013-05-02 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Initialise to empty so it always has a value. Change addition of classes to += from =. * acinclude.m4: (IT_CHECK_FOR_METHOD): Remove call to IT_CHECK_JAVA_AND_JAVAC_WORK to avoid backporting. (IT_CHECK_FOR_CONSTRUCTOR): Likewise. 2013-04-18 Andrew John Hughes PR1404: Failure to bootstrap with ecj 4.2 * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext, SSLEngine and SslRMIServerSocketFactory if methods are missing. (IT_LANGUAGE_SOURCE_VERSION): Set to 7 if supported. (IT_CLASS_TARGET_VERSION): Likewise. * configure.ac: Mention bugs in comments. Add tests for getDefaultSSLParameters/setSSLParameters and new 7 SslRMIServerSocketFactory. * NEWS: Updated. 2013-01-11 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_CLASS): Write class toString() output to System.err rather than throwing it away. It then appears in config.log and may be useful in debugging. (IT_CHECK_FOR_METHOD): Fix documentation and add System.err output as for IT_CHECK_FOR_CLASS. (IT_CHECK_FOR_CONSTRUCTOR): New macro to test for the presence of a specific constructor. Works with both private & protected constructors by using a subclass for the compile test. 2012-08-13 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Only add Matcher if the quoteReplacement method is absent. * acinclude.m4: (IT_JAVAH): Explicitly set source & target. (IT_LIBRARY_CHECK): Likewise. (IT_PR40630_CHECK): Likewise. (IT_CHECK_FOR_CLASS): Likewise. (IT_DIAMOND_CHECK): Specify target as 7 as well. (IT_CHECK_FOR_METHOD): New macro to check for the existence of a Java method both at build and runtime. * configure.ac: Check for java.util.regex.Matcher.quoteReplacement. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/3863ae6f/attachment.html From gitne at excite.co.jp Thu May 2 09:57:54 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 01:57:54 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBNb3JlIGNvbXBsZXRlIE5ldFggamFyIGZpbGUgbWFuaWZlc3Q=?= Message-ID: <201305021657.r42GvsCD019580@mail-web02.excite.co.jp> "Omair Majid" wrote: > On 05/02/2013 11:15 AM, Jacob Wisor wrote: > > "Jacob Wisor" wrote: > >>> I would like to propose to make the jar file manifest more > >>> complete, though I am not sure about the "Implementation-Vendor" > >>> attribute's (key) value. > > I would use "IcedTea" > > > +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web > > Please use @PACKAGE_URL@ here, instead of duplicating the URL. Setting IcedTea as vendor and then setting "Implementation-URL" to @PACKAGE_URL@ does not compute. How about setting "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding it to the build script, hence "IcedTea" being the default for @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the default for @PACKAGE_URL@? Regards, Jacob From jvanek at icedtea.classpath.org Thu May 2 10:02:32 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:02:32 +0000 Subject: /hg/release/icedtea-web-1.4: Added appcontex hack to make sweeth... Message-ID: changeset eb52d04ba3bd in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=eb52d04ba3bd author: Jiri Vanek date: Thu May 02 19:02:06 2013 +0200 Added appcontex hack to make sweethome3d fully working again diffstat: netx/net/sourceforge/jnlp/Launcher.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diffs (74 lines): diff -r 0d6213db4fc7 -r eb52d04ba3bd netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Thu May 02 18:44:16 2013 +0200 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu May 02 19:02:06 2013 +0200 @@ -20,8 +20,11 @@ import java.applet.Applet; import java.awt.Container; +import java.awt.EventQueue; import java.awt.SplashScreen; +import java.awt.Toolkit; import java.io.File; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.net.InetAddress; import java.net.URL; @@ -46,6 +49,7 @@ import net.sourceforge.jnlp.runtime.AppletEnvironment; import net.sourceforge.jnlp.splashscreen.SplashUtils; +import sun.awt.AppContext; import sun.awt.SunToolkit; /** @@ -749,6 +753,7 @@ AppletInstance appletInstance = null; try { JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); + forceContextClassLoaderHack(loader); if (enableCodeBase) { loader.enableCodeBase(); @@ -794,6 +799,7 @@ protected Applet createAppletObject(JNLPFile file, boolean enableCodeBase, Container cont) throws LaunchException { try { JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); + forceContextClassLoaderHack(loader); if (enableCodeBase) { loader.enableCodeBase(); @@ -817,6 +823,7 @@ protected ApplicationInstance createApplication(JNLPFile file) throws LaunchException { try { JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); + forceContextClassLoaderHack(loader); ThreadGroup group = Thread.currentThread().getThreadGroup(); ApplicationInstance app = new ApplicationInstance(file, group, loader); @@ -898,6 +905,26 @@ new ParserDelegator(); } + /* + * This is necessary to ensure the AppContext context-classloader is correctly set to our JNLPClassLoader. + * This is unfortunately necessary until it is possible to create a JNLPClassLoader -before- we create our AppContext. + */ + private void forceContextClassLoaderHack(ClassLoader classLoader) { + try { + Field appContextClassLoaderField = AppContext.class.getDeclaredField("contextClassLoader"); + appContextClassLoaderField.setAccessible(true); + appContextClassLoaderField.set(AppContext.getAppContext(), classLoader); + + Field eventQueueClassLoaderField = EventQueue.class.getDeclaredField("classLoader"); + eventQueueClassLoaderField.setAccessible(true); + eventQueueClassLoaderField.set(Toolkit.getDefaultToolkit().getSystemEventQueue(), classLoader); + + } catch (Exception e) { + System.err.println("Problem occurred while setting the AppContext context-classloader using reflection:"); + e.printStackTrace(); + } + } + /** * This runnable is used to call the appropriate launch method * for the application, applet, or installer in its thread group. From gitne at excite.co.jp Thu May 2 10:02:47 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 02:02:47 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtTRUNVUklUWV0gSWNlZFRlYSAyLjEuOCBmb3IgT3BlbkpESyA3IFJlbGVhc2VkIQ==?= Message-ID: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> "Andrew John Hughes" wrote: [...] > In addition, IcedTea includes the usual IcedTea patches to allow > builds against system libraries and to support more estoric > architectures. You probably mean "exotic architectures"... How could an architecture be esoteric??? :D Well, maybe those with positive vibrations? [...] Have a nice day! Jacob From omajid at redhat.com Thu May 2 10:03:11 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 02 May 2013 13:03:11 -0400 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <201305021657.r42GvsCD019580@mail-web02.excite.co.jp> References: <201305021657.r42GvsCD019580@mail-web02.excite.co.jp> Message-ID: <51829C4F.8030300@redhat.com> On 05/02/2013 12:57 PM, Jacob Wisor wrote: > "Omair Majid" wrote: >> On 05/02/2013 11:15 AM, Jacob Wisor wrote: >>> "Jacob Wisor" wrote: >>>>> I would like to propose to make the jar file manifest more >>>>> complete, though I am not sure about the "Implementation-Vendor" >>>>> attribute's (key) value. >> >> I would use "IcedTea" >> >>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >> >> Please use @PACKAGE_URL@ here, instead of duplicating the URL. > > Setting IcedTea as vendor and then setting "Implementation-URL" to > @PACKAGE_URL@ does not compute. How about setting > "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding > it to the build script, hence "IcedTea" being the default for > @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the > default for @PACKAGE_URL@? That sounds fine to me. I went with @PACKAGE_URL@ since it's already defined, and used in only a few places, whereas the string IcedTea is probably present in every file already (along the lines of "This file is part of IcedTea"). I would like to hear what others think about "IcedTea" as the vendor, before we decide to use it. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at icedtea.classpath.org Thu May 2 10:07:29 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:07:29 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 14ea95104b8d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14ea95104b8d author: Jiri Vanek date: Thu May 02 19:05:25 2013 +0200 Added tag icedtea-web-1.4-branchpoint for changeset 0d6213db4fc7 changeset c2bcd4c4ee1e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c2bcd4c4ee1e author: Jiri Vanek date: Thu May 02 19:07:32 2013 +0200 Bumped to 1.5pre diffstat: .hgtags | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 0d6213db4fc7 -r c2bcd4c4ee1e .hgtags --- a/.hgtags Thu May 02 18:44:16 2013 +0200 +++ b/.hgtags Thu May 02 19:07:32 2013 +0200 @@ -1,3 +1,4 @@ 692d7e5b31039156aff1600fd7f5034fead2f258 icedtea-web-1.0-branchpoint b605505179459c9f2119e4dfde999fc6300e4c87 icedtea-web-1.1-branchpoint 41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint +0d6213db4fc7ec58ad8165278f672ed5cc201822 icedtea-web-1.4-branchpoint diff -r 0d6213db4fc7 -r c2bcd4c4ee1e configure.ac --- a/configure.ac Thu May 02 18:44:16 2013 +0200 +++ b/configure.ac Thu May 02 19:07:32 2013 +0200 @@ -1,4 +1,4 @@ -AC_INIT([icedtea-web],[1.4pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) +AC_INIT([icedtea-web],[1.5pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile netx.manifest]) From omajid at redhat.com Thu May 2 10:07:34 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 02 May 2013 13:07:34 -0400 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <51823592.9030706@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <51801B78.20603@redhat.com> <51823592.9030706@redhat.com> Message-ID: <51829D56.4060303@redhat.com> On 05/02/2013 05:44 AM, Jiri Vanek wrote: > /* Fully consuming current request helps with connection re-use > * See http://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html */ > - StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream()); > + HttpUtils.consumeAndCloseConnectionSilently(httpConnection); Just a nit: the CloseConnection in the name consumeAndCloseConnectionSilently implies that we are calling disconnect() or otherwise closing the HttpURLConnection, while we are not doing that explicitly to reuse connections. > - private URL findBestUrl(Resource resource) { > + URL findBestUrl(Resource resource) { I guess the method is exposed so some unit test can exercise this method? How about you make this change when adding that unit test itself? > + if (responseCode < 200 || responseCode >= 300) { > + if (JNLPRuntime.isDebug()) { > + System.err.println("For "+resource.toString()+" the server returned " + responseCode + " code for "+requestMethod+" request for " + url.toExternalForm()); Please uses spaces between symbols consistently. > + }else { Please fix the spacing here: "} else {" Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at icedtea.classpath.org Thu May 2 10:10:09 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:10:09 +0000 Subject: /hg/icedtea-web: fixed news - add pl localisation and added 1.5 Message-ID: changeset e99591814f02 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e99591814f02 author: Jiri Vanek date: Thu May 02 19:10:46 2013 +0200 fixed news - add pl localisation and added 1.5 diffstat: NEWS | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (18 lines): diff -r c2bcd4c4ee1e -r e99591814f02 NEWS --- a/NEWS Thu May 02 19:07:32 2013 +0200 +++ b/NEWS Thu May 02 19:10:46 2013 +0200 @@ -8,9 +8,12 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.4 (2012-XX-XX): -* Added cs_CZ localization +New in release 1.5 (2013-XX-XX): + +New in release 1.4 (2013-XX-XX): +* Added cs localization * Added de localization +* Added pl localization * Splash screen for javaws and plugin * Better error reporting for plugin via Error-splash-screen * All IcedTea-Web dialogues are centered to middle of active screen From jvanek at icedtea.classpath.org Thu May 2 10:17:21 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:17:21 +0000 Subject: /hg/release/icedtea-web-1.4: 2 new changesets Message-ID: changeset edcfd8b76af1 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=edcfd8b76af1 author: Jiri Vanek date: Thu May 02 19:12:13 2013 +0200 Added tag icedtea-web-1.4-branch for changeset 0d6213db4fc7 changeset 65b9cfc864d4 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=65b9cfc864d4 author: Jiri Vanek date: Thu May 02 19:17:54 2013 +0200 Marked as 1.4, fixed news and adapted configure diffstat: .hgtags | 1 + NEWS | 5 +++-- configure.ac | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diffs (33 lines): diff -r eb52d04ba3bd -r 65b9cfc864d4 .hgtags --- a/.hgtags Thu May 02 19:02:06 2013 +0200 +++ b/.hgtags Thu May 02 19:17:54 2013 +0200 @@ -1,3 +1,4 @@ 692d7e5b31039156aff1600fd7f5034fead2f258 icedtea-web-1.0-branchpoint b605505179459c9f2119e4dfde999fc6300e4c87 icedtea-web-1.1-branchpoint 41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint +0d6213db4fc7ec58ad8165278f672ed5cc201822 icedtea-web-1.4-branch diff -r eb52d04ba3bd -r 65b9cfc864d4 NEWS --- a/NEWS Thu May 02 19:02:06 2013 +0200 +++ b/NEWS Thu May 02 19:17:54 2013 +0200 @@ -8,9 +8,10 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.4 (2012-XX-XX): -* Added cs_CZ localization +New in release 1.4 (2013-05-02): +* Added cs localization * Added de localization +* Added pl localization * Splash screen for javaws and plugin * Better error reporting for plugin via Error-splash-screen * All IcedTea-Web dialogues are centered to middle of active screen diff -r eb52d04ba3bd -r 65b9cfc864d4 configure.ac --- a/configure.ac Thu May 02 19:02:06 2013 +0200 +++ b/configure.ac Thu May 02 19:17:54 2013 +0200 @@ -1,4 +1,4 @@ -AC_INIT([icedtea-web],[1.4pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) +AC_INIT([icedtea-web],[1.4],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile netx.manifest]) From jvanek at icedtea.classpath.org Thu May 2 10:18:26 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:18:26 +0000 Subject: /hg/release/icedtea-web-1.4: Added tag icedtea-web-1.4 for chang... Message-ID: changeset 8df4e27e68ab in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=8df4e27e68ab author: Jiri Vanek date: Thu May 02 19:18:38 2013 +0200 Added tag icedtea-web-1.4 for changeset 65b9cfc864d4 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 65b9cfc864d4 -r 8df4e27e68ab .hgtags --- a/.hgtags Thu May 02 19:17:54 2013 +0200 +++ b/.hgtags Thu May 02 19:18:38 2013 +0200 @@ -2,3 +2,4 @@ b605505179459c9f2119e4dfde999fc6300e4c87 icedtea-web-1.1-branchpoint 41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint 0d6213db4fc7ec58ad8165278f672ed5cc201822 icedtea-web-1.4-branch +65b9cfc864d47fa29aeea90c5abbca71c869e05b icedtea-web-1.4 From jvanek at redhat.com Thu May 2 10:27:12 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 02 May 2013 19:27:12 +0200 Subject: Upcoming releases of IcedTea-Web 1.2, 1.3, 1.4 In-Reply-To: <517AC48C.6060006@redhat.com> References: <515E921C.2030207@redhat.com> <51659134.8050509@redhat.com> <516E6419.5050409@redhat.com> <517AC48C.6060006@redhat.com> Message-ID: <5182A1F0.7010709@redhat.com> Branch http://icedtea.classpath.org/hg/release/icedtea-web-1.4 is now created. Please consider it as frozen. Also please consider HEAD as free to play. J. > > Hi all! > > Although feature and enhancement list for icedtea-web-1.4 (from users point of view) is compelte, > release itself can be a bit delayed because of several issues caused by core improvements and by few > missing tests. > I'm sorry for troubles but meanwhile I'm offering pre-release tarball for playing and testing:) > > http://icedtea.wildebeest.org/download/source/icedtea-web-1.4pre1.tar.gz > > > I hope that "regressions" or how to call those issues will be fixed asap. > > Sorry and thank you > J. > > New in IcedTea-Web 1.4 > > * Numerous improvements and enhancements in core and system of classloaders > * Added cs_CZ localization > * Added de localization > * Splash screen for javaws and plugin > * Better error reporting for plugin via Error-splash-screen > * All IcedTea-Web dialogues are centered to middle of active screen > * Download indicator made compact for more then one jar > * User can select its own JVM via itw-settings and deploy.properties. > * Added extended applets security settings and dialogue > * Security updates > - CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path. > - CVE-2013-1927, RH884705: fixed gifar vulnerabilit > - CVE-2012-3422, RH840592: Potential read from an uninitialized memory location > - CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings > * NetX > - PR1027: DownloadService is not supported by IcedTea-Web > - PR725: JNLP applications will prompt for creating desktop shortcuts every time they are run > - PR1292: Javaws does not resolve versioned jar names with periods correctly > * Plugin > - PR1106: Buffer overflow in plugin table- > - PR1166: Embedded JNLP File is not supported in applet tag > - PR1217: Add command line arguments for plugins > - PR1189: Icedtea-plugin requires code attribute when using jnlp_href > - PR1198: JSObject is not passed to javascript correctly > - PR1260: IcedTea-Web should not rely on GTK > - PR1157: Applets can hang browser after fatal exception > - PR580: http://www.horaoficial.cl/ loads improperly > * Common > - PR1049: Extension jnlp's signed jar with the content of only META-INF/* is considered > - PR955: regression: SweetHome3D fails to run > - PR1145: IcedTea-Web can cause ClassCircularityError > - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 > - PR822: Applets fail to load if jars have different signers > - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null > - PR909: The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails > - PR1299: WebStart doesn't read socket proxy settings from firefox correctly > > > > People who helped with this release (If I forgot somebody, please let me know!): > > > Deepak Bhole > Danesh Dadachanji > Adam Domurad > Jana Fabrikova > Peter Hatina > Andrew John Hughes > Matthias Klose > Alexandr Kolouch > Jan Kmetko > Omair Majid > Thomas Meyer > Saad Mohammad > Martin Olsson > Pavel Tisnovsky > Jiri Vanek > Jacob Wisor > > > Special thanks to: > > * Adam Domurad - for deep investigations and fixes in core, and in numerous classloaders or > otherwise complicated bugs > * Jan Kmetko - for initial design of splashscreen > * Deepak Bhole and Omair Majid - for ever keeping an watchful eye on patches > * to community - namely: > - Jacob Wisor and Alexandr Kolouch - who voluntary offered and delivered Pl and Cz translation > From gnu.andrew at redhat.com Thu May 2 10:32:49 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 2 May 2013 13:32:49 -0400 (EDT) Subject: [SECURITY] IcedTea 2.1.8 for OpenJDK 7 Released! In-Reply-To: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> References: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> Message-ID: <645434184.6106306.1367515969602.JavaMail.root@redhat.com> ----- Original Message ----- > "Andrew John Hughes" wrote: > [...] > > In addition, IcedTea includes the usual IcedTea patches to allow > > builds against system libraries and to support more esoteric > > architectures. > > You probably mean "exotic architectures"... How could an architecture be > esoteric??? :D Well, maybe those with positive vibrations? > "Understood only by a chosen few or an enlightened inner circle. The writing in this manual is very esoteric; I need a degree in engineering just to understand it! Having to do with concepts that are highly theoretical and without obvious practical application;" [1] Replace "understood" with "used" ;) What definition are you using? There is a typo there though, which I'll correct in the on-line version :) [1] https://en.wiktionary.org/wiki/esoteric > [...] > > Have a nice day! > Jacob > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From adomurad at redhat.com Thu May 2 10:39:56 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 02 May 2013 13:39:56 -0400 Subject: [SECURITY] IcedTea 2.1.8 for OpenJDK 7 Released! In-Reply-To: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> References: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> Message-ID: <5182A4EC.10600@redhat.com> On 05/02/2013 01:02 PM, Jacob Wisor wrote: > "Andrew John Hughes" wrote: > [...] >> In addition, IcedTea includes the usual IcedTea patches to allow >> builds against system libraries and to support more estoric >> architectures. > You probably mean "exotic architectures"... How could an architecture be esoteric??? :D Well, maybe those with positive vibrations? > > [...] > > Have a nice day! > Jacob It's a colourful term, but it makes sense to me. Eg, knowing how to support exotic architectures would require knowledge that could be described as esoteric, so they can themselves be described as esoteric. Cheers, -Adam From jvanek at icedtea.classpath.org Thu May 2 10:53:10 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 02 May 2013 17:53:10 +0000 Subject: /hg/release/icedtea-web-1.4: AppContextHasJNLPClassLoader - remo... Message-ID: changeset a2b168188cbe in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=a2b168188cbe author: Jiri Vanek date: Thu May 02 19:53:33 2013 +0200 AppContextHasJNLPClassLoader - removed knowntofail as by hack-fixed diffstat: tests/reproducers/signed/AppContextHasJNLPClassLoader/testcases/AppContextHasJNLPClassLoaderTest.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 8df4e27e68ab -r a2b168188cbe tests/reproducers/signed/AppContextHasJNLPClassLoader/testcases/AppContextHasJNLPClassLoaderTest.java --- a/tests/reproducers/signed/AppContextHasJNLPClassLoader/testcases/AppContextHasJNLPClassLoaderTest.java Thu May 02 19:18:38 2013 +0200 +++ b/tests/reproducers/signed/AppContextHasJNLPClassLoader/testcases/AppContextHasJNLPClassLoaderTest.java Thu May 02 19:53:33 2013 +0200 @@ -71,7 +71,6 @@ } @Test - @KnownToFail @Bug(id="PR1251") public void testJNLPApplicationAppContext() throws Exception { ProcessResult pr = server.executeJavawsHeadless("/AppContextHasJNLPClassLoader.jnlp"); @@ -88,7 +87,6 @@ @Test @TestInBrowsers(testIn={Browsers.one}) - @KnownToFail @Bug(id="PR1251") public void testAppletAppContext() throws Exception { ProcessResult pr = server.executeBrowser("/AppContextHasJNLPClassLoader.html", AutoClose.CLOSE_ON_CORRECT_END); From adomurad at icedtea.classpath.org Thu May 2 11:05:16 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 02 May 2013 18:05:16 +0000 Subject: /hg/release/icedtea-web-1.3: Ensure document-base is properly en... Message-ID: changeset ff0d07a33ad2 in /hg/release/icedtea-web-1.3 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=ff0d07a33ad2 author: Adam Domurad date: Thu May 02 13:55:23 2013 -0400 Ensure document-base is properly encoded. diffstat: ChangeLog | 10 ++++++++ netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 3 +- netx/net/sourceforge/jnlp/util/UrlUtils.java | 18 ++++++++++++++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 +- 4 files changed, 31 insertions(+), 3 deletions(-) diffs (82 lines): diff -r ded8ed9a9427 -r ff0d07a33ad2 ChangeLog --- a/ChangeLog Wed Apr 17 10:15:16 2013 +0200 +++ b/ChangeLog Thu May 02 13:55:23 2013 -0400 @@ -1,3 +1,13 @@ +2013-05-02 Adam Domurad + + Ensure document-base is properly encoded. + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java + (getCacheFile): Use decodeUrlAsFile instead of toURI().getPath(). + * netx/net/sourceforge/jnlp/util/UrlUtils.java + (decodeUrlAsFile): New, tolerates ill-formed URLs. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Don't decode documentBase + 2013-04-11 Jiri Vanek Added various self-describing tests for codebase diff -r ded8ed9a9427 -r ff0d07a33ad2 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Wed Apr 17 10:15:16 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 13:55:23 2013 -0400 @@ -46,6 +46,7 @@ import net.sourceforge.jnlp.event.DownloadEvent; import net.sourceforge.jnlp.event.DownloadListener; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.WeakList; /** @@ -394,7 +395,7 @@ return resource.localFile; if (location.getProtocol().equalsIgnoreCase("file")) { - File file = new File(location.getFile()); + File file = UrlUtils.decodeUrlAsFile(location); if (file.exists()) return file; } diff -r ded8ed9a9427 -r ff0d07a33ad2 netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Wed Apr 17 10:15:16 2013 +0200 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Thu May 02 13:55:23 2013 -0400 @@ -37,10 +37,28 @@ package net.sourceforge.jnlp.util; +import java.io.File; +import java.io.IOException; import java.net.URL; +import java.net.URLDecoder; public class UrlUtils { + /* Decode a percent-encoded URL. Catch checked exceptions and log. */ + public static URL decodeUrlQuietly(URL url) { + try { + return new URL(URLDecoder.decode(url.toString(), "utf-8")); + } catch (IOException e) { + e.printStackTrace(); + return url; + } + } + + /* Decode a URL as a file, being tolerant of URLs with mixed encoded & decoded portions. */ + public static File decodeUrlAsFile(URL url) { + return new File(decodeUrlQuietly(url).getFile()); + } + public static boolean isLocalFile(URL url) { if (url.getProtocol().equals("file") && diff -r ded8ed9a9427 -r ff0d07a33ad2 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 17 10:15:16 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu May 02 13:55:23 2013 -0400 @@ -478,8 +478,7 @@ String height = msgParts[2]; int spaceLocation = message.indexOf(' ', "tag".length() + 1); - String documentBase = - UrlUtil.decode(message.substring("tag".length() + 1, spaceLocation)); + String documentBase = message.substring("tag".length() + 1, spaceLocation); String tag = message.substring(spaceLocation + 1); PluginDebug.debug("Handle = ", handle, "\n", From bugzilla-daemon at icedtea.classpath.org Thu May 2 12:34:35 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 02 May 2013 19:34:35 +0000 Subject: [Bug 1419] New: More fine grained permissions and capabilities Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1419 Bug ID: 1419 Summary: More fine grained permissions and capabilities Classification: Unclassified Product: Thermostat Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Thermostat Assignee: unassigned at icedtea.classpath.org Reporter: omajid at redhat.com CC: thermostat at icedtea.classpath.org Blocks: 1414 We need to define more fine-grained set of capabilities and metadata to help in enforcing those permissions. One of the things we do need is to have the unix user name for each JVM that's running, to allow us to allow/reject another user from examining that JVM based on the current configuration. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/ffaa76fc/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 2 12:42:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 02 May 2013 19:42:16 +0000 Subject: [Bug 1422] New: Write and run performance tests Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1422 Bug ID: 1422 Summary: Write and run performance tests Classification: Unclassified Product: Thermostat Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Thermostat Assignee: unassigned at icedtea.classpath.org Reporter: omajid at redhat.com CC: thermostat at icedtea.classpath.org Blocks: 1414 We need to write more performance tests (tests that exercise how each of the agent/storage/gui/cli) that deal with lots of data to demonstrate that thermostat is fast enough to handle data at the scale that we want it to. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/8de6e83c/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 2 12:56:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 02 May 2013 19:56:44 +0000 Subject: [Bug 1424] New: Bring eclipse plugin to feature-parity with the swing gui Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1424 Bug ID: 1424 Summary: Bring eclipse plugin to feature-parity with the swing gui Classification: Unclassified Product: Thermostat Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: gui Assignee: unassigned at icedtea.classpath.org Reporter: omajid at redhat.com Blocks: 1415 The eclipse plugin should be feature-compatible with the standalone swing gui. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/16eb093c/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 2 13:00:03 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 02 May 2013 20:00:03 +0000 Subject: [Bug 1425] New: Improve plugin.xml authoring support Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1425 Bug ID: 1425 Summary: Improve plugin.xml authoring support Classification: Unclassified Product: Thermostat Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Thermostat Assignee: unassigned at icedtea.classpath.org Reporter: omajid at redhat.com CC: thermostat at icedtea.classpath.org Blocks: 1415 Now that we have a plugin schema, we should ensure that IDEs and editors can make use of it to validate the plugin.xml files as they are edited. We need to publish the schmea at a known location. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/17d05bb0/attachment.html From gnu.andrew at redhat.com Thu May 2 14:18:25 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 2 May 2013 17:18:25 -0400 (EDT) Subject: [SECURITY] IcedTea 2.1.8 for OpenJDK 7 Released! In-Reply-To: <5182A4EC.10600@redhat.com> References: <201305021702.r42H2loA028517@mail-web01.excite.co.jp> <5182A4EC.10600@redhat.com> Message-ID: <1082260651.6210602.1367529505832.JavaMail.root@redhat.com> ----- Original Message ----- > On 05/02/2013 01:02 PM, Jacob Wisor wrote: > > "Andrew John Hughes" wrote: > > [...] > >> In addition, IcedTea includes the usual IcedTea patches to allow > >> builds against system libraries and to support more esoteric > >> architectures. > > You probably mean "exotic architectures"... How could an architecture be > > esoteric??? :D Well, maybe those with positive vibrations? > > > > [...] > > > > Have a nice day! > > Jacob > > It's a colourful term, but it makes sense to me. Eg, knowing how to > support exotic architectures would require knowledge that could be > described as esoteric, so they can themselves be described as esoteric. > The use of "exotic" is equally odd to me. It implies "foreign" and makes me think more of exotic fruits than architectures with small userbases. Interesting that people should pick up on this now. I think it's been in countless release announcements ;) > Cheers, > -Adam > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gitne at excite.co.jp Thu May 2 15:38:31 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 3 May 2013 07:38:31 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtTRUNVUklUWV0gSWNlZFRlYSAyLjEuOCBmb3IgT3BlbkpESyA3IFJlbGVhc2VkIQ==?= Message-ID: <201305022238.r42McVM9029435@mail-web02.excite.co.jp> "Andrew Hughes" wrote: > ----- Original Message ----- > > On 05/02/2013 01:02 PM, Jacob Wisor wrote: > > > "Andrew John Hughes" wrote: > > > [...] > > >> In addition, IcedTea includes the usual IcedTea patches to allow > > >> builds against system libraries and to support more esoteric > > >> architectures. > > > You probably mean "exotic architectures"... How could an architecture be > > > esoteric??? :D Well, maybe those with positive vibrations? > > > > > > [...] > > > > > > Have a nice day! > > > Jacob > > > > It's a colourful term, but it makes sense to me. Eg, knowing how to > > support exotic architectures would require knowledge that could be > > described as esoteric, so they can themselves be described as esoteric. > > > > The use of "exotic" is equally odd to me. It implies "foreign" and makes > me think more of exotic fruits than architectures with small userbases. > > Interesting that people should pick up on this now. I think it's been in > countless release announcements ;) I am sorry, should I have upset you. My intention was not to be picky. The term just seems funny to me, since it reminds me of people with beliefs in esoterism that simply is incompatible with computer science (which infact is a science) or meta-physics, that bothers about some kind of non-existent architecture that still abides by logic. As for the announcement itself, I do not want to impose anything. Have fun! :) Jacob From ptisnovs at icedtea.classpath.org Fri May 3 00:26:46 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 03 May 2013 07:26:46 +0000 Subject: /hg/rhino-tests: Updated four tests in CompiledScriptClassTest f... Message-ID: changeset 32315f7a8cb8 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=32315f7a8cb8 author: Pavel Tisnovsky date: Fri May 03 09:30:03 2013 +0200 Updated four tests in CompiledScriptClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/CompiledScriptClassTest.java | 62 +++++++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diffs (113 lines): diff -r b4e6c7746fe3 -r 32315f7a8cb8 ChangeLog --- a/ChangeLog Thu May 02 10:08:03 2013 +0200 +++ b/ChangeLog Fri May 03 09:30:03 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-03 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Updated four tests in CompiledScriptClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-02 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: diff -r b4e6c7746fe3 -r 32315f7a8cb8 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Thu May 02 10:08:03 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Fri May 03 09:30:03 2013 +0200 @@ -523,9 +523,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.compiledScriptClass.getFields(); @@ -550,10 +563,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.compiledScriptClass.getDeclaredFields(); @@ -578,8 +604,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -605,8 +644,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From ptisnovs at icedtea.classpath.org Fri May 3 00:41:17 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 03 May 2013 07:41:17 +0000 Subject: /hg/gfx-test: Ten new tests added into ClippingCircleByConvexPol... Message-ID: changeset 1f651f68bc2f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=1f651f68bc2f author: Pavel Tisnovsky date: Fri May 03 09:44:22 2013 +0200 Ten new tests added into ClippingCircleByConvexPolygonalShape.. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java | 90 ++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diffs (112 lines): diff -r d07e7656ca0b -r 1f651f68bc2f ChangeLog --- a/ChangeLog Thu May 02 10:24:15 2013 +0200 +++ b/ChangeLog Fri May 03 09:44:22 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java: + Ten new tests added into ClippingCircleByConvexPolygonalShape.. + 2013-05-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r d07e7656ca0b -r 1f651f68bc2f src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Thu May 02 10:24:15 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Fri May 03 09:44:22 2013 +0200 @@ -699,6 +699,96 @@ } /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with magenta color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintMagenta000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 0% transparency + drawCircleClippedByPolygonalShapeAlphaPaintMagenta(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with magenta color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintMagenta025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 25% transparency + drawCircleClippedByPolygonalShapeAlphaPaintMagenta(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with magenta color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintMagenta050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 50% transparency + drawCircleClippedByPolygonalShapeAlphaPaintMagenta(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with magenta color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintMagenta075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 75% transparency + drawCircleClippedByPolygonalShapeAlphaPaintMagenta(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with magenta color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintMagenta100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 100% transparency + drawCircleClippedByPolygonalShapeAlphaPaintMagenta(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** * Check if circle shape could be clipped by a polygonal shape. Circle is * rendered using horizontal gradient paint. * From jvanek at redhat.com Fri May 3 06:33:29 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 03 May 2013 15:33:29 +0200 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <51829C4F.8030300@redhat.com> References: <201305021657.r42GvsCD019580@mail-web02.excite.co.jp> <51829C4F.8030300@redhat.com> Message-ID: <5183BCA9.7090505@redhat.com> On 05/02/2013 07:03 PM, Omair Majid wrote: > On 05/02/2013 12:57 PM, Jacob Wisor wrote: >> "Omair Majid" wrote: >>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: >>>> "Jacob Wisor" wrote: >>>>>> I would like to propose to make the jar file manifest more >>>>>> complete, though I am not sure about the "Implementation-Vendor" >>>>>> attribute's (key) value. >>> >>> I would use "IcedTea" >>> >>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >>> >>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. >> >> Setting IcedTea as vendor and then setting "Implementation-URL" to >> @PACKAGE_URL@ does not compute. How about setting >> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding >> it to the build script, hence "IcedTea" being the default for >> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the >> default for @PACKAGE_URL@? > > That sounds fine to me. I went with @PACKAGE_URL@ since it's already > defined, and used in only a few places, whereas the string IcedTea is > probably present in every file already (along the lines of "This file is > part of IcedTea"). > > I would like to hear what others think about "IcedTea" as the vendor, > before we decide to use it. I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be nicely consistent. Thank you for taking this review! J. From jvanek at icedtea.classpath.org Fri May 3 07:17:08 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 03 May 2013 14:17:08 +0000 Subject: /hg/icedtea-web: Fixed indentation Message-ID: changeset 9f2d8381f5f1 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9f2d8381f5f1 author: Jiri Vanek date: Fri May 03 16:17:08 2013 +0200 Fixed indentation diffstat: netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r e99591814f02 -r 9f2d8381f5f1 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 19:10:46 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 03 16:17:08 2013 +0200 @@ -912,9 +912,9 @@ if (responseCode < 200 || responseCode >= 300) { if (JNLPRuntime.isDebug()) { - System.err.println("For "+resource.toString()+" the server returned " + responseCode + " code for "+requestMethod+" request for " + url.toExternalForm()); + System.err.println("For " + resource.toString() + " the server returned " + responseCode + " code for " + requestMethod + " request for " + url.toExternalForm()); } - }else { + } else { if (JNLPRuntime.isDebug()) { System.err.println("best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod); } From jvanek at redhat.com Fri May 3 07:23:42 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 03 May 2013 16:23:42 +0200 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <51829D56.4060303@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <51801B78.20603@redhat.com> <51823592.9030706@redhat.com> <51829D56.4060303@redhat.com> Message-ID: <5183C86E.6090408@redhat.com> On 05/02/2013 07:07 PM, Omair Majid wrote: > On 05/02/2013 05:44 AM, Jiri Vanek wrote: >> > /* Fully consuming current request helps with connection re-use >> > * Seehttp://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html */ >> >- StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream()); >> >+ HttpUtils.consumeAndCloseConnectionSilently(httpConnection); > Just a nit: the CloseConnection in the name > consumeAndCloseConnectionSilently implies that we are calling > disconnect() or otherwise closing the HttpURLConnection, while we are > not doing that explicitly to reuse connections. > Ouch. I do not wont to rename it any more :( >> >- private URL findBestUrl(Resource resource) { >> >+ URL findBestUrl(Resource resource) { > I guess the method is exposed so some unit test can exercise this > method? How about you make this change when adding that unit test itself? Exactly. And tests went inisde with this :)) And those are loooong, good tests :) > >> >+ if (responseCode < 200 || responseCode >= 300) { >> >+ if (JNLPRuntime.isDebug()) { >> >+ System.err.println("For "+resource.toString()+" the server returned " + responseCode + " code for "+requestMethod+" request for " + url.toExternalForm()); > Please uses spaces between symbols consistently. fixed > >> >+ }else { > Please fix the spacing here: "} else {" fixed > > Cheers, > Omair Tahnk you for watch! J. From adomurad at redhat.com Fri May 3 07:30:38 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 03 May 2013 10:30:38 -0400 Subject: [rfc][icedtea-web] fixfor portalbank.no In-Reply-To: <5183C86E.6090408@redhat.com> References: <517E99DA.2080604@redhat.com> <517E9CA9.9010907@redhat.com> <517FD415.9090905@redhat.com> <51801B78.20603@redhat.com> <51823592.9030706@redhat.com> <51829D56.4060303@redhat.com> <5183C86E.6090408@redhat.com> Message-ID: <5183CA0E.5090508@redhat.com> On 05/03/2013 10:23 AM, Jiri Vanek wrote: > On 05/02/2013 07:07 PM, Omair Majid wrote: >> On 05/02/2013 05:44 AM, Jiri Vanek wrote: >>> > /* Fully consuming current request helps with >>> connection re-use >>> > * >>> Seehttp://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html >>> */ >>> >- >>> StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream()); >>> >+ >>> HttpUtils.consumeAndCloseConnectionSilently(httpConnection); >> Just a nit: the CloseConnection in the name >> consumeAndCloseConnectionSilently implies that we are calling >> disconnect() or otherwise closing the HttpURLConnection, while we are >> not doing that explicitly to reuse connections. >> > > Ouch. I do not wont to rename it any more :( On 05/03/2013 10:23 AM, Jiri Vanek wrote:> On 05/02/2013 07:07 PM, Omair Majid wrote: >> On 05/02/2013 05:44 AM, Jiri Vanek wrote: >>> > /* Fully consuming current request helps with >>> connection re-use >>> > * >>> Seehttp://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html >>> */ >>> >- >>> StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream()); >>> >+ >>> HttpUtils.consumeAndCloseConnectionSilently(httpConnection); >> Just a nit: the CloseConnection in the name >> consumeAndCloseConnectionSilently implies that we are calling >> disconnect() or otherwise closing the HttpURLConnection, while we are >> not doing that explicitly to reuse connections. >> > > Ouch. I do not wont to rename it any more :( I would have to agree with Omair here. I overlooked this originally, but it's a good catch. Happy hacking, -Adam From andrew at icedtea.classpath.org Fri May 3 07:39:57 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 03 May 2013 14:39:57 +0000 Subject: /hg/icedtea6-hg: 29 new changesets Message-ID: changeset 02a65b9914d5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=02a65b9914d5 author: Andrew John Hughes date: Fri Mar 22 14:18:47 2013 +0000 OPENJDK6-4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build Move jvmtiEnv patch to bundled HotSpot build only. changeset 241d297ff5e3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=241d297ff5e3 author: Andrew John Hughes date: Wed Mar 27 21:14:08 2013 +0000 Add langtools backports suggested by Joe Darcy and backport for bundled HotSpot suggested by Xerxes. 2013-03-26 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backports (HotSpot one only to bundled HotSpot build). * patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch: Backport suggested by Xerxes for hs20. * patches/openjdk/6500343-bad_code_from_conditionals.patch, * patches/openjdk/6682380-foreach_crash.patch, * patches/openjdk/6718364-inference_failure.patch, * patches/openjdk/7003595-incompatibleclasschangeerror.patch, * patches/openjdk/7024568-long_method_resolution_oom_error.patch, * patches/openjdk/7046929-fix_t6397104_test_failure.patch: Langtools backports present in the proprietary JDK 6 tree, as listed by Joe Darcy. changeset 3584aac9d62d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3584aac9d62d author: chrisphi date: Fri Apr 05 09:01:48 2013 -0400 Bug 1362: Fedora 19 / rawhide FTBFS SIGILL Summary: Fix reg alloc problem in thumb2.cpp compiler. changeset bcad714e7c48 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bcad714e7c48 author: Andrew John Hughes date: Fri Apr 12 22:06:38 2013 +0100 Add missing NEWS entry and ChangeLog for last commit. 2013-04-12 Andrew John Hughes * NEWS: Add PR1362 from last commit. * ChangeLog: Add missing entry for last commit. changeset 44dda0c0c865 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=44dda0c0c865 author: Andrew John Hughes date: Sun Apr 14 21:05:17 2013 +0100 PR1336: Bootstrap failure on Fedora 17/18 2013-04-12 Andrew John Hughes PR1336: Bootstrap failure on Fedora 17/18 * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLParameters if needed. * configure.ac: Check for javax.net.ssl.SSLParameters. changeset db7918fff199 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=db7918fff199 author: Andrew John Hughes date: Tue Apr 16 17:01:34 2013 +0100 PR1319: Use #if not #ifdef in giflib 5 patch. 2013-04-16 Andrew John Hughes * patches/pr1319-support_giflib_5.patch, Use #if not #ifdef. changeset ef687bd533e2 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ef687bd533e2 author: Andrew John Hughes date: Tue Apr 16 17:08:54 2013 +0100 PR1338: Remove dependence on libXp. 2013-04-16 Andrew John Hughes PR1338: Remove dependence on libXp * configure.ac: Drop check for libXp. changeset f9540cbade1e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f9540cbade1e author: Andrew John Hughes date: Tue Apr 16 17:11:46 2013 +0100 PR1339: Simplify the rewriter, avoiding concurrency. 2013-03-11 Andrew John Hughes PR1339: Simplify the rewriter, avoiding concurrency. * rewriter/com/redhat/rewriter/ClassRewriter.java: Always use the single threaded executor. * NEWS: Updated with this and previous fix. changeset ab418eb1e664 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ab418eb1e664 author: Andrew John Hughes date: Tue Apr 16 18:39:51 2013 +0100 Fix typo in ICEDTEA_PATCHES. 2013-04-16 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add missing backslash (oops!) * patches/openjdk/7024568-long_method_resolution_oom_error.patch: Fix patch that doesn't apply cleanly. changeset fe8749a2c67c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fe8749a2c67c author: Andrew John Hughes date: Wed Apr 17 07:56:18 2013 +0100 PR1380: Add AArch64 support to Zero 2013-04-17 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patch after SH patch. * NEWS: Updated. * AUTHORS: Add Andreas and merge in THANKYOU. * THANKYOU: Removed. 2013-03-22 Andreas Schwab PR1380: Add AArch64 support to Zero * patches/aarch64.patch: Add Zero support for AArch64. changeset 50031cd2f57a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=50031cd2f57a author: Andrew John Hughes date: Wed Apr 17 12:01:42 2013 +0100 Update EXTRA_DIST following merge of THANKYOU into AUTHORS. 2013-04-17 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Remove THANKYOU. changeset ceab4a096b50 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ceab4a096b50 author: Andrew John Hughes date: Mon Apr 22 18:11:11 2013 +0100 PR1336: Bootstrap failure on Fedora 17/18 2013-04-22 Andrew John Hughes PR1336: Bootstrap failure on Fedora 17/18 * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext, SSLEngine, TrustAnchor and KeyStoreBuilderParameters depending on if methods are missing. * NEWS: Updated. * configure.ac: Mention bugs in comments. Add tests for getDefaultSSLParameters/setSSLParameters, new TrustAnchor constructor, TrustAnchor.getCA() and KeyStoreBuilderParameters.getParameters(). changeset ffe30d3918c4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ffe30d3918c4 author: Andrew John Hughes date: Thu Apr 25 15:01:06 2013 +0100 Add backport of 7036559 and ConcurrentHashMap deserialization reliability fix for 8009063. changeset 0396c602f40d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0396c602f40d author: Andrew John Hughes date: Thu Apr 25 15:04:12 2013 +0100 Fix issues with previous commit. 2013-04-12 Andrew John Hughes * Makefile.am: (SECURITY_PATCHES): Correct path to 7036559; not a security patch but a backport to enable one to be applied. * patches/security/20130416/7036559.patch: Moved to... * patches/openjdk/7036559-concurrenthashmap_improvements.patch: ...here. 2013-04-11 Jon VanAlten * Makefile.am: (SECURITY_PATCHES): Add new patches. * patches/security/20130416/7036559.patch: Add backport. * patches/security/20130416/8009063.patch: Add security fix. changeset d5ea2fe9da2d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d5ea2fe9da2d author: Andrew John Hughes date: Thu Apr 25 18:18:04 2013 +0100 Use latest hs23 HEAD, bringing in security fixes and aarch64 patch. 2013-04-25 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move aarch64.patch to original HotSpot only. * hotspot.map: Sync with latest hs23 HEAD. changeset c9be0d1330dc in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c9be0d1330dc author: Andrew John Hughes date: Fri Apr 26 03:06:47 2013 +0100 Add 2013/04/16 security patches. 2013-04-17 Andrew John Hughes * patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch: Reapplied as a security patch pre-requisite. * patches/security/20130201/8001235.patch: Dropped as included in JAXP tarball used. * INSTALL: Remove --with-{jaxp,jaf,jaxws}-drop-zip documentation. * Makefile.am: (JAXWS_DROP_URL): Removed. (JAXWS_DROP_ZIP): Likewise. (JAXWS_DROP_SHA256SUM): Likewise. (JAF_DROP_URL): Likewise. (JAF_DROP_ZIP): Likewise. (JAF_DROP_SHA256SUM): Likewise. (JAF_DROP_URL): Likewise. (JAXP_DROP_URL): Likewise. (JAXP_DROP_ZIP): Likewise. (JAXP_DROP_SHA256SUM): Likewise. (DROP_PATCHES): Add patches providing code previously provided by drop zips. (SECURITY_PATCHES): Updated. (ICEDTEA_PATCHES): Add DROP_PATCHES. Remove 6669869 duplicate. (ICEDTEA_ENV): Remove ALT_DROPS_DIR. (download-jaxp-drop): Removed. (clean-download-jaxp-drop): Likewise. (download-jaf-drop): Likewise. (clean-download-jaf-drop): Likewise. (download-jaxws-drop): Likewise. (clean-download-jaxws-drop): Likewise. (download-drops): Likewise. (clean-drops): Likewise. (download): Don't depend on download-drops. (clean-download): Likewise for clean-drops. * NEWS: Add security issues, backports and mention drop move. * acinclude.m4: (IT_WITH_JAXP_DROP_ZIP): Removed. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. * configure.ac: Don't call removed macros above. * patches/ecj/override.patch: Add new cases introduced by security patches (sigh). * patches/libraries.patch, * patches/nomotif-6706121.patch: Regenerated against security patches. * patches/openjdk/5102804-memory_leak.patch, * patches/openjdk/6501644-icu_sync.patch: Backports for security patches. * patches/openjdk/6633275-shaped_translucent_windows.patch: Remove copyright notice changes broken by 8006790 security patch. * patches/openjdk/6669869-queries_per_appcontext.patch, * patches/openjdk/6886358-layout_update.patch, * patches/openjdk/6963811-deadlock_fix.patch, * patches/openjdk/7017324-kerning_crash.patch, * patches/openjdk/7064279-fixup.patch, * patches/openjdk/7064279-resource_release.patch, * patches/openjdk/8004302-soap_test_failure.patch: More backports for security patches. * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch, * patches/openjdk/jaxp144_05.patch: Add drop zips in patch form. * patches/security/20130416/6657673-fixup.patch, * patches/security/20130416/6657673.patch, * patches/security/20130416/7200507.patch, * patches/security/20130416/8000724.patch, * patches/security/20130416/8001031.patch, * patches/security/20130416/8001040.patch, * patches/security/20130416/8001322.patch, * patches/security/20130416/8001329.patch, * patches/security/20130416/8003335.patch, * patches/security/20130416/8003445.patch, * patches/security/20130416/8003543.patch, * patches/security/20130416/8004261.patch, * patches/security/20130416/8004336.patch, * patches/security/20130416/8004986.patch, * patches/security/20130416/8005432.patch, * patches/security/20130416/8005943.patch, * patches/security/20130416/8006309.patch, * patches/security/20130416/8006435.patch, * patches/security/20130416/8006790.patch, * patches/security/20130416/8006795.patch, * patches/security/20130416/8007406.patch, * patches/security/20130416/8007617.patch, * patches/security/20130416/8009699.patch: Add security patches. * patches/xjc.patch: Regenerate JAXWS patch against sources, not drop system. 2013-04-12 Omair Majid * patches/security/20130416/8007667.patch, * patches/security/20130416/8007918.patch, * patches/security/20130416/8009305.patch, * patches/security/20130416/8009814.patch, * patches/security/20130416/8009857.patch: Add security patches. changeset 0115b40df976 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0115b40df976 author: Andrew John Hughes date: Fri Apr 26 03:10:41 2013 +0100 PR1402: Support glibc < 2.17 with AArch64 patch 2013-04-17 Andrew John Hughes * patches/aarch64.patch: Fix to apply against older HotSpot. 2013-04-17 Andrew John Hughes * patches/aarch64.patch: Define EM_AARCH64 for legacy systems with glibc earlier than 2.17. changeset 13cfe757d5ee in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=13cfe757d5ee author: Andrew John Hughes date: Fri Apr 26 03:15:18 2013 +0100 RH952389: Restrict temp file permissions. 2013-04-17 Andrew John Hughes * ChangeLog: Move Elliott's entry to correct position. * Makefile.am: (ICEDTEA_PATCHES): Fix path to previous patch. * patches/openjdk/jaxws-tempfiles-ioutils-6.patch: Moved from here to... * patches/jaxws-tempfiles-ioutils-6.patch: ...here as not an upstream OpenJDK patch. 2013-04-17 Elliott Baron * patches/openjdk/jaxws-tempfiles-ioutils-6.patch: Restrict temp file permissions. * Makefile.am: (ICEDTEA_PATCHES): Added new patch. changeset 2701f46e49a0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2701f46e49a0 author: Andrew John Hughes date: Fri Apr 26 03:17:57 2013 +0100 Give xalan/xerces access to their own internal packages. 2013-04-18 Elliott Baron * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * patches/object-factory-cl-internal.patch: Patch to give xalan/xerces access to their own internal packages. changeset 0bf8e7d60829 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0bf8e7d60829 author: Andrew John Hughes date: Fri Apr 19 11:38:18 2013 +0100 Fix patch to apply on RHEL 5. 2013-04-19 Jiri Vanek * patches/security/20130416/8007667.patch: Fix patch format to apply on RHEL 5. changeset c483fccf4758 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c483fccf4758 author: Andrew John Hughes date: Fri Apr 26 03:20:56 2013 +0100 Fix Backport from S6657673. 2013-04-19 Elliott Baron * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * patches/security/20130416/6657673.patch: Removed {parser,transform}.FactoryFinder hunks. * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch: Backported {parser,transform}.FactoryFinder fixes from jdk7u-dev changesets: 4a61ac055189 & 38d4d23d167c. changeset 4c03cba06c11 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4c03cba06c11 author: Elliott Baron date: Mon Apr 22 17:13:26 2013 -0400 Split 6657673-jaxp-backport-factoryfinder patch into two. 2013-04-22 Elliott Baron * Makefile.am: (ICEDTEA_PATCHES): Removed one patch, split it into two. * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch: Removed. Split into patches below. * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch: First part of removed patch. * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch: Second part of removed patch. changeset 797c2d24d89f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=797c2d24d89f author: Andrew John Hughes date: Fri Apr 26 03:31:01 2013 +0100 Cleanup from previous commit. 2013-04-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Rename patches. * NEWS: List backports in previous change correctly. * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch: Moved to... * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch: ...this. * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch: Moved to.. * patches/security/20130416/6657673-factory_finder.patch: ...this. changeset 3e701dcab7d4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3e701dcab7d4 author: Andrew John Hughes date: Fri Apr 26 03:32:15 2013 +0100 S8009530: ICU Kern table support broken 2013-04-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * patches/openjdk/8009530-icu_kern_table_support_broken.patch: Backported from 7u. changeset b08a2c95d268 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b08a2c95d268 author: Andrew John Hughes date: Fri Apr 26 13:13:40 2013 +0100 Update NEWS following latest releases. 2013-04-26 Andrew John Hughes * NEWS: Add release notes for 1.11.10, 1.11.11 and 1.12.5 and remove features listed under 1.13.0 that were provided in those releases. changeset 485b2d3dfd09 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=485b2d3dfd09 author: Andrew John Hughes date: Fri Apr 26 15:39:35 2013 +0100 S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) 2013-04-26 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Fix naming of aarch64 patch and add new one. * NEWS: Updated. * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch: Backport fix to make Zero build work following 6840152. * patches/aarch64.patch: Moved to... * patches/hotspot/original/aarch64.patch: ...here. changeset 11353b3c2109 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=11353b3c2109 author: Pavel Tisnovsky date: Mon Apr 29 13:27:32 2013 +0200 Added two JTreg tests for checking TextLayout class behaviour. changeset 3b76dff83564 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3b76dff83564 author: Pavel Tisnovsky date: Tue Apr 30 13:18:33 2013 +0200 Added patch containing three new JTreg tests ComponentOrientationTest.java, ComponentPlacementTest.java and ComponentSizeTest.java. changeset 635d03c5e2dc in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=635d03c5e2dc author: Andrew John Hughes date: Fri May 03 15:38:08 2013 +0100 Merge diffstat: AUTHORS | 4 + ChangeLog | 411 + INSTALL | 3 - Makefile.am | 256 +- NEWS | 129 +- THANKYOU | 10 - acinclude.m4 | 63 - arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 30 +- configure.ac | 59 +- hotspot.map | 2 +- patches/componentOrientationTests.patch | 246 + patches/copy_memory.patch | 36 + patches/ecj/override.patch | 110 + patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch | 32 + patches/hotspot/original/7022999-fastlocking_compiler1_only.patch | 25 + patches/hotspot/original/aarch64.patch | 34 + patches/hotspot/original/jvmtiEnv.patch | 12 + patches/jaxws-tempfiles-ioutils-6.patch | 176 + patches/jvmtiEnv.patch | 12 - patches/libraries.patch | 252 +- patches/nomotif-6706121.patch | 218 +- patches/object-factory-cl-internal.patch | 384 + patches/openjdk/5102804-memory_leak.patch | 429 + patches/openjdk/6500343-bad_code_from_conditionals.patch | 129 + patches/openjdk/6501644-icu_sync.patch | 8066 + patches/openjdk/6633275-shaped_translucent_windows.patch | 49 - patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch | 346 - patches/openjdk/6669869-queries_per_appcontext.patch | 355 + patches/openjdk/6682380-foreach_crash.patch | 97 + patches/openjdk/6718364-inference_failure.patch | 76 + patches/openjdk/6886358-layout_update.patch | 13847 + patches/openjdk/6963811-deadlock_fix.patch | 42 + patches/openjdk/7003595-incompatibleclasschangeerror.patch | 351 + patches/openjdk/7017324-kerning_crash.patch | 101 + patches/openjdk/7024568-long_method_resolution_oom_error.patch | 102 + patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 + patches/openjdk/7046929-fix_t6397104_test_failure.patch | 42 + patches/openjdk/7064279-fixup.patch | 71 + patches/openjdk/7064279-resource_release.patch | 436 + patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 + patches/openjdk/8004302-soap_test_failure.patch | 75 + patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009530-icu_kern_table_support_broken.patch | 332 + patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 +++++++ patches/openjdk/jaxp144_05.patch | 595585 ++++++++++ patches/pr1319-support_giflib_5.patch | 2 +- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001235.patch | 37 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673-factory_finder.patch | 54 + patches/security/20130416/6657673-fixup.patch | 229 + patches/security/20130416/6657673.patch | 9494 + patches/security/20130416/7200507.patch | 230 + patches/security/20130416/8000724.patch | 1368 + patches/security/20130416/8001031.patch | 5457 + patches/security/20130416/8001040.patch | 113 + patches/security/20130416/8001322.patch | 61 + patches/security/20130416/8001329.patch | 32 + patches/security/20130416/8003335.patch | 63 + patches/security/20130416/8003445.patch | 77 + patches/security/20130416/8003543.patch | 236 + patches/security/20130416/8004261.patch | 142 + patches/security/20130416/8004336.patch | 29 + patches/security/20130416/8004986.patch | 374 + patches/security/20130416/8005432.patch | 518 + patches/security/20130416/8005943.patch | 202 + patches/security/20130416/8006309.patch | 22 + patches/security/20130416/8006435.patch | 76 + patches/security/20130416/8006790.patch | 166 + patches/security/20130416/8006795.patch | 35 + patches/security/20130416/8007406.patch | 31 + patches/security/20130416/8007617.patch | 376 + patches/security/20130416/8007667.patch | 579 + patches/security/20130416/8007918.patch | 357 + patches/security/20130416/8009063.patch | 67 + patches/security/20130416/8009305.patch | 68 + patches/security/20130416/8009699.patch | 25 + patches/security/20130416/8009814.patch | 27 + patches/security/20130416/8009857.patch | 66 + patches/textLayoutGetCharacterCount.patch | 54 + patches/textLayoutLimits.patch | 49 + patches/xjc.patch | 56 +- rewriter/com/redhat/rewriter/ClassRewriter.java | 6 +- 118 files changed, 1093780 insertions(+), 24758 deletions(-) diffs (truncated from 1120721 to 500 lines): diff -r 18b6e9eaf3e8 -r 635d03c5e2dc AUTHORS --- a/AUTHORS Mon Mar 18 21:34:40 2013 +0000 +++ b/AUTHORS Fri May 03 15:38:08 2013 +0100 @@ -2,6 +2,7 @@ Please keep this list in alphabetical order. Lillian Angel +Alexis Ballier Alon Bar-Lev Gary Benson Tania Bento @@ -18,6 +19,7 @@ Andrew John Hughes Tomas Hurka Ioana Ivan +C. K. Jester-Young (cky944 at gmail.com) Matthias Klose Francis Kung Denis Lila @@ -32,6 +34,7 @@ Mark Reinhold Bernhard Rosenkr??nzer Marc Schoenefeld +Andreas Schwab Keith Seitz Andrew Su Joshua Sumali @@ -39,6 +42,7 @@ Christian Thalinger Dalibor Topic Arnaud Vandyck +Torsten Werner (mail.twerner at googlemail.com) Mark Wielaard Yi Zhan diff -r 18b6e9eaf3e8 -r 635d03c5e2dc ChangeLog --- a/ChangeLog Mon Mar 18 21:34:40 2013 +0000 +++ b/ChangeLog Fri May 03 15:38:08 2013 +0100 @@ -1,3 +1,409 @@ +2013-04-30 Pavel Tisnovsky + + * Makefile.am: + (ICEDTEA_PATCHES): Added new patch. + * patches/componentOrientationTests.patch: + Patch containing three new JTreg tests ComponentOrientationTest.java, + ComponentPlacementTest.java and ComponentSizeTest.java. These tests + check if ComponentOrientation subsystem behaviour is correct even + when right-to-left orientation is used. + +2013-04-29 Pavel Tisnovsky + + * Makefile.am: + (ICEDTEA_PATCHES): Add two new patches. + * patches/textLayoutGetCharacterCount.patch: + * patches/textLayoutLimits.patch: + Two JTreg tests for checking TextLayout class behaviour. + +2013-04-26 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Fix naming of aarch64 patch + and add new one. + * NEWS: Updated. + * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch: + Backport fix to make Zero build work following + 6840152. + * patches/aarch64.patch: Moved to... + * patches/hotspot/original/aarch64.patch: ...here. + +2013-04-26 Andrew John Hughes + + * NEWS: Add release notes for 1.11.10, 1.11.11 + and 1.12.5 and remove features listed under 1.13.0 + that were provided in those releases. + +2013-04-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * patches/openjdk/8009530-icu_kern_table_support_broken.patch: + Backported from 7u. + +2013-04-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Rename patches. + correctly. + * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch: + Moved to... + * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch: + ...this. + * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch: + Moved to.. + * patches/security/20130416/6657673-factory_finder.patch: + ...this. + +2013-04-22 Elliott Baron + + * Makefile.am: + (ICEDTEA_PATCHES): Removed one patch, split it into two. + * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch: + Removed. Split into patches below. + * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch: + First part of removed patch. + * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch: + Second part of removed patch. + +2013-04-19 Elliott Baron + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * patches/security/20130416/6657673.patch: + Removed {parser,transform}.FactoryFinder hunks. + * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch: + Backported {parser,transform}.FactoryFinder fixes + from jdk7u-dev changesets: 4a61ac055189 & 38d4d23d167c. + +2013-04-19 Jiri Vanek + + * patches/security/20130416/8007667.patch: + Fix patch format to apply on RHEL 5. + +2013-04-18 Elliott Baron + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * patches/object-factory-cl-internal.patch: + Patch to give xalan/xerces access to their own internal + packages. + +2013-04-17 Andrew John Hughes + + * ChangeLog: + Move Elliott's entry to correct position. + * Makefile.am: + (ICEDTEA_PATCHES): Fix path to previous patch. + * patches/openjdk/jaxws-tempfiles-ioutils-6.patch: + Moved from here to... + * patches/jaxws-tempfiles-ioutils-6.patch: + ...here as not an upstream OpenJDK patch. + +2013-04-17 Elliott Baron + + * patches/openjdk/jaxws-tempfiles-ioutils-6.patch: + Restrict temp file permissions. + * Makefile.am: + (ICEDTEA_PATCHES): Added new patch. + +2013-04-17 Andrew John Hughes + + * patches/aarch64.patch: + Fix to apply against older HotSpot. + +2013-04-17 Andrew John Hughes + + PR1402: Support glibc < 2.17 with AArch64 patch + * patches/aarch64.patch: + Define EM_AARCH64 for legacy systems + with glibc earlier than 2.17. + +2013-04-17 Andrew John Hughes + + * patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch: + Reapplied as a security patch pre-requisite. + * patches/security/20130201/8001235.patch: + Dropped as included in JAXP tarball used. + * INSTALL: Remove --with-{jaxp,jaf,jaxws}-drop-zip documentation. + * Makefile.am: + (JAXWS_DROP_URL): Removed. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Likewise. + (JAF_DROP_ZIP): Likewise. + (JAF_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Likewise. + (JAXP_DROP_URL): Likewise. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (DROP_PATCHES): Add patches providing code + previously provided by drop zips. + (SECURITY_PATCHES): Updated. + (ICEDTEA_PATCHES): Add DROP_PATCHES. Remove + 6669869 duplicate. + (ICEDTEA_ENV): Remove ALT_DROPS_DIR. + (download-jaxp-drop): Removed. + (clean-download-jaxp-drop): Likewise. + (download-jaf-drop): Likewise. + (clean-download-jaf-drop): Likewise. + (download-jaxws-drop): Likewise. + (clean-download-jaxws-drop): Likewise. + (download-drops): Likewise. + (clean-drops): Likewise. + (download): Don't depend on download-drops. + (clean-download): Likewise for clean-drops. + * acinclude.m4: + (IT_WITH_JAXP_DROP_ZIP): Removed. + (IT_WITH_JAF_DROP_ZIP): Likewise. + (IT_WITH_JAXWS_DROP_ZIP): Likewise. + * configure.ac: Don't call removed macros above. + * patches/ecj/override.patch: Add new cases introduced + by security patches (sigh). + * patches/libraries.patch, + * patches/nomotif-6706121.patch: + Regenerated against security patches. + * patches/openjdk/5102804-memory_leak.patch, + * patches/openjdk/6501644-icu_sync.patch: + Backports for security patches. + * patches/openjdk/6633275-shaped_translucent_windows.patch: + Remove copyright notice changes broken by 8006790 security patch. + * patches/openjdk/6669869-queries_per_appcontext.patch, + * patches/openjdk/6886358-layout_update.patch, + * patches/openjdk/6963811-deadlock_fix.patch, + * patches/openjdk/7017324-kerning_crash.patch, + * patches/openjdk/7064279-fixup.patch, + * patches/openjdk/7064279-resource_release.patch, + * patches/openjdk/8004302-soap_test_failure.patch: + More backports for security patches. + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch, + * patches/openjdk/jaxp144_05.patch: + Add drop zips in patch form. + * patches/security/20130416/6657673-fixup.patch, + * patches/security/20130416/6657673.patch, + * patches/security/20130416/7200507.patch, + * patches/security/20130416/8000724.patch, + * patches/security/20130416/8001031.patch, + * patches/security/20130416/8001040.patch, + * patches/security/20130416/8001322.patch, + * patches/security/20130416/8001329.patch, + * patches/security/20130416/8003335.patch, + * patches/security/20130416/8003445.patch, + * patches/security/20130416/8003543.patch, + * patches/security/20130416/8004261.patch, + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8004986.patch, + * patches/security/20130416/8005432.patch, + * patches/security/20130416/8005943.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8006435.patch, + * patches/security/20130416/8006790.patch, + * patches/security/20130416/8006795.patch, + * patches/security/20130416/8007406.patch, + * patches/security/20130416/8007617.patch, + * patches/security/20130416/8009699.patch: + Add security patches. + * patches/xjc.patch: + Regenerate JAXWS patch against sources, not + drop system. + +2013-04-12 Omair Majid + + * patches/security/20130416/8007667.patch, + * patches/security/20130416/8007918.patch, + * patches/security/20130416/8009305.patch, + * patches/security/20130416/8009814.patch, + * patches/security/20130416/8009857.patch: + Add security patches. + +2013-04-25 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Move aarch64.patch to original + HotSpot only. + * hotspot.map: Sync with latest hs23 HEAD. + +2013-04-12 Andrew John Hughes + + * Makefile.am: + (SECURITY_PATCHES): Correct path to 7036559; not + a security patch but a backport to enable one to + be applied. + * patches/security/20130416/7036559.patch: Moved to... + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + ...here. + +2013-04-11 Jon VanAlten + + * Makefile.am: + (SECURITY_PATCHES): Add new patches. + * patches/security/20130416/7036559.patch: Add backport. + * patches/security/20130416/8009063.patch: Add security fix. + +2013-04-22 Andrew John Hughes + + PR1336: Bootstrap failure on Fedora 17/18 + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext, + SSLEngine, TrustAnchor and KeyStoreBuilderParameters + depending on if methods are missing. + * NEWS: Updated. + * configure.ac: Mention bugs in comments. + Add tests for getDefaultSSLParameters/setSSLParameters, + new TrustAnchor constructor, TrustAnchor.getCA() and + KeyStoreBuilderParameters.getParameters(). + +2013-04-17 Andrew John Hughes + + * Makefile.am: + (EXTRA_DIST): Remove THANKYOU. + +2013-04-17 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patch after SH patch. + * NEWS: Updated. + * AUTHORS: Add Andreas and merge in THANKYOU. + * THANKYOU: Removed. + +2013-03-22 Andreas Schwab + + PR1380: Add AArch64 support to Zero + * patches/aarch64.patch: + Add Zero support for AArch64. + +2013-04-16 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add missing backslash (oops!) + * patches/openjdk/7024568-long_method_resolution_oom_error.patch: + Fix patch that doesn't apply cleanly. + +2013-03-11 Andrew John Hughes + + PR1339: Simplify the rewriter, avoiding concurrency. + * rewriter/com/redhat/rewriter/ClassRewriter.java: + Always use the single threaded executor. + * NEWS: Updated with this and previous fix. + +2013-04-16 Andrew John Hughes + + PR1338: Remove dependence on libXp + * configure.ac: Drop check for libXp. + +2013-04-16 Andrew John Hughes + + * patches/pr1319-support_giflib_5.patch, + Use #if not #ifdef. + +2013-04-12 Andrew John Hughes + + PR1336: Bootstrap failure on Fedora 17/18 + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLParameters + if needed. + * configure.ac: Check for javax.net.ssl.SSLParameters. + +2013-04-12 Andrew John Hughes + + * NEWS: Add PR1362 from last commit. + * ChangeLog: Add missing entry for last + commit. + +2013-04-05 Chris Phillips + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: + Fix failure in the register allocation logic, + diagnosed by Andrew Haley to be an issue with + PUSH/POP macro's and assumption of order of + evaluation of arguments. The fix includes + detection of the condition and bailing from the + compilation if a similar failure is detected. + +2013-03-26 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backports (HotSpot + one only to bundled HotSpot build). + * patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch: + Backport suggested by Xerxes for hs20. + * patches/openjdk/6500343-bad_code_from_conditionals.patch, + * patches/openjdk/6682380-foreach_crash.patch, + * patches/openjdk/6718364-inference_failure.patch, + * patches/openjdk/7003595-incompatibleclasschangeerror.patch, + * patches/openjdk/7024568-long_method_resolution_oom_error.patch, + * patches/openjdk/7046929-fix_t6397104_test_failure.patch: + Langtools backports present in the proprietary JDK 6 tree, + as listed by Joe Darcy. + +2013-03-22 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. Move + jvmtiEnv.patch to bundled HotSpot build only. + * NEWS: Update with new patch, add OpenJDK 6 + JIRA URLs. + * patches/copy_memory.patch: New patch to + add sun.misc.Unsafe.copyMemory method from 7. + * patches/jvmtiEnv.patch: Moved to... + * patches/hotspot/original/jvmtiEnv.patch: here. + +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -599,6 +1005,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r 18b6e9eaf3e8 -r 635d03c5e2dc INSTALL --- a/INSTALL Mon Mar 18 21:34:40 2013 +0000 +++ b/INSTALL Fri May 03 15:38:08 2013 +0100 @@ -145,9 +145,6 @@ * --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading. * --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading. * --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built. -* --with-jaxp-drop-zip: Specify the location of the JAXP source drop zip file to avoid downloading. -* --with-jaf-drop-zip: Specify the location of the JAF source drop zip file to avoid downloading. -* --with-jaxws-drop-zip: Specify the location of the JAXWS source drop zip file to avoid downloading. * --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading and building one. * --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading. diff -r 18b6e9eaf3e8 -r 635d03c5e2dc Makefile.am --- a/Makefile.am Mon Mar 18 21:34:40 2013 +0000 +++ b/Makefile.am Fri May 03 15:38:08 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -17,15 +17,6 @@ JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz -JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops -JAXWS_DROP_ZIP = jdk6-jaxws2_1_6-2011_06_13.zip -JAXWS_DROP_SHA256SUM = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 -JAF_DROP_URL = http://icedtea.classpath.org/download/drops -JAF_DROP_ZIP = jdk6-jaf-b20.zip -JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 -JAXP_DROP_URL = http://icedtea.classpath.org/download/drops -JAXP_DROP_ZIP = jaxp144_04.zip -JAXP_DROP_SHA256SUM = 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 From jvanek at icedtea.classpath.org Fri May 3 12:17:58 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 03 May 2013 19:17:58 +0000 Subject: /hg/release/icedtea-web-1.4: 3 new changesets Message-ID: changeset 7417aafce17f in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=7417aafce17f author: Jiri Vanek date: Fri May 03 21:17:01 2013 +0200 Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch changeset 35aa1ba34610 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=35aa1ba34610 author: Jiri Vanek date: Fri May 03 21:19:42 2013 +0200 Removed tag icedtea-web-1.4 changeset ee842a825870 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=ee842a825870 author: Jiri Vanek date: Fri May 03 21:19:44 2013 +0200 Added tag icedtea-web-1.4 for changeset 7417aafce17f diffstat: .hgtags | 4 ++++ ChangeLog | 8 ++++++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 6 +++++- 3 files changed, 17 insertions(+), 1 deletions(-) diffs (42 lines): diff -r a2b168188cbe -r ee842a825870 .hgtags --- a/.hgtags Thu May 02 19:53:33 2013 +0200 +++ b/.hgtags Fri May 03 21:19:44 2013 +0200 @@ -3,3 +3,7 @@ 41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint 0d6213db4fc7ec58ad8165278f672ed5cc201822 icedtea-web-1.4-branch 65b9cfc864d47fa29aeea90c5abbca71c869e05b icedtea-web-1.4 +65b9cfc864d47fa29aeea90c5abbca71c869e05b icedtea-web-1.4 +0000000000000000000000000000000000000000 icedtea-web-1.4 +0000000000000000000000000000000000000000 icedtea-web-1.4 +7417aafce17fc2d1d11895b190a8f9a09abf228d icedtea-web-1.4 diff -r a2b168188cbe -r ee842a825870 ChangeLog --- a/ChangeLog Thu May 02 19:53:33 2013 +0200 +++ b/ChangeLog Fri May 03 21:19:44 2013 +0200 @@ -1,3 +1,11 @@ +2013-05-03 Jiri Vanek + + Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch + * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) + return type set-up by dependency on defined LEGACY_XULRUNNERAPI. + This one is set by IT_CHECK_XULRUNNER_API_VERSION during configure. + if defined, then old char* is used. New const char* is used otherwise. + 2013-05-02 Jana Fabrikova * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html: diff -r a2b168188cbe -r ee842a825870 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu May 02 19:53:33 2013 +0200 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 03 21:19:44 2013 +0200 @@ -1995,7 +1995,11 @@ // Returns a string describing the MIME type that this plugin // handles. __attribute__ ((visibility ("default"))) -const char* +#ifdef LEGACY_XULRUNNERAPI + char* +#else + const char* +#endif NP_GetMIMEDescription () { PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); From jvanek at redhat.com Sat May 4 03:49:51 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 04 May 2013 12:49:51 +0200 Subject: IcedTea-Web 1.4 released! Message-ID: <5184E7CF.50502@redhat.com> Hi all! After long and furious development, I'm finally proud to announce release of icedtea-web 1.4. http://icedtea.wildebeest.org/download/source/icedtea-web-1.4.tar.gz 97c1d5f02f9a4ab19812a216f39e401a icedtea-web-1.4.tar.gz How we were dealing and what we plan to do, can be checked on wiki: http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.4 http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 New in IcedTea-Web 1.4 * Numerous improvements and enhancements in core and system of classloaders * Added cs localization * Added de localization * Added pl localization * Splash screen for javaws and plugin * Better error reporting for plugin via Error-splash-screen * All IcedTea-Web dialogues are centered to middle of active screen * Download indicator made compact for more then one jar * User can select its own JVM via itw-settings and deploy.properties. * Added extended applets security settings and dialogue * Security updates - CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path. - CVE-2013-1927, RH884705: fixed gifar vulnerabilit - CVE-2012-3422, RH840592: Potential read from an uninitialized memory location - CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings * NetX - PR1027: DownloadService is not supported by IcedTea-Web - PR725: JNLP applications will prompt for creating desktop shortcuts every time they are run - PR1292: Javaws does not resolve versioned jar names with periods correctly * Plugin - PR1106: Buffer overflow in plugin table- - PR1166: Embedded JNLP File is not supported in applet tag - PR1217: Add command line arguments for plugins - PR1189: Icedtea-plugin requires code attribute when using jnlp_href - PR1198: JSObject is not passed to javascript correctly - PR1260: IcedTea-Web should not rely on GTK - PR1157: Applets can hang browser after fatal exception - PR580: http://www.horaoficial.cl/ loads improperly * Common - PR1049: Extension jnlp's signed jar with the content of only META-INF/* is considered - PR955: regression: SweetHome3D fails to run - PR1145: IcedTea-Web can cause ClassCircularityError - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 - PR822: Applets fail to load if jars have different signers - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null - PR909: The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails - PR1299: WebStart doesn't read socket proxy settings from firefox correctly People who helped with this release (If I forgot somebody, please let me know!): Deepak Bhole Danesh Dadachanji Adam Domurad Jana Fabrikova Peter Hatina Andrew John Hughes Matthias Klose Alexandr Kolouch Jan Kmetko Omair Majid Thomas Meyer Saad Mohammad Martin Olsson Pavel Tisnovsky Jiri Vanek Jacob Wisor Special thanks to: * Adam Domurad - for deep investigations and fixes in core, and in numerous classloaders or otherwise complicated bugs * Jan Kmetko - for initial design of splashscreen * Deepak Bhole and Omair Majid - for ever keeping an watchful eye on patches * to community - namely: - Jacob Wisor and Alexandr Kolouch - who voluntary offered and delivered Pl+De and Cz translation And not finally to all who tested the pre and final versions for regressions Best regards J. From jvanek at icedtea.classpath.org Sat May 4 04:06:47 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Sat, 04 May 2013 11:06:47 +0000 Subject: /hg/release/icedtea-web-1.4: Prepared for 1.4.1 Message-ID: changeset 05e9ef808ffa in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=05e9ef808ffa author: Jiri Vanek date: Sat May 04 13:10:05 2013 +0200 Prepared for 1.4.1 NEWS: added header for 1.4.1 configure.ac: (AC_INIT) bumped to 1.4.1pre diffstat: ChangeLog | 6 ++++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 9 insertions(+), 1 deletions(-) diffs (34 lines): diff -r ee842a825870 -r 05e9ef808ffa ChangeLog --- a/ChangeLog Fri May 03 21:19:44 2013 +0200 +++ b/ChangeLog Sat May 04 13:10:05 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-04 Jiri Vanek + + Prepared for 1.4.1 + * NEWS: added header for 1.4.1 + * configure.ac: (AC_INIT) bumped to 1.4.1pre + 2013-05-03 Jiri Vanek Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch diff -r ee842a825870 -r 05e9ef808ffa NEWS --- a/NEWS Fri May 03 21:19:44 2013 +0200 +++ b/NEWS Sat May 04 13:10:05 2013 +0200 @@ -8,6 +8,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.4.1 (2013-XX-YY): + New in release 1.4 (2013-05-02): * Added cs localization * Added de localization diff -r ee842a825870 -r 05e9ef808ffa configure.ac --- a/configure.ac Fri May 03 21:19:44 2013 +0200 +++ b/configure.ac Sat May 04 13:10:05 2013 +0200 @@ -1,4 +1,4 @@ -AC_INIT([icedtea-web],[1.4],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) +AC_INIT([icedtea-web],[1.4.1pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile netx.manifest]) From jvanek at redhat.com Sat May 4 04:11:33 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 04 May 2013 13:11:33 +0200 Subject: Upcoming releases of IcedTea-Web 1.2, 1.3, 1.4 In-Reply-To: <5182A1F0.7010709@redhat.com> References: <515E921C.2030207@redhat.com> <51659134.8050509@redhat.com> <516E6419.5050409@redhat.com> <517AC48C.6060006@redhat.com> <5182A1F0.7010709@redhat.com> Message-ID: <5184ECE5.1060802@redhat.com> The sin is done, consider http://icedtea.classpath.org/hg/release/icedtea-web-1.4 as unfrozen. J. > > J. >> >> Hi all! >> >> Although feature and enhancement list for icedtea-web-1.4 (from users point of view) is compelte, >> release itself can be a bit delayed because of several issues caused by core improvements and by few >> missing tests. >> I'm sorry for troubles but meanwhile I'm offering pre-release tarball for playing and testing:) >> >> http://icedtea.wildebeest.org/download/source/icedtea-web-1.4pre1.tar.gz >> >> >> I hope that "regressions" or how to call those issues will be fixed asap. >> >> Sorry and thank you >> J. >> >> New in IcedTea-Web 1.4 >> >> * Numerous improvements and enhancements in core and system of classloaders >> * Added cs_CZ localization >> * Added de localization >> * Splash screen for javaws and plugin >> * Better error reporting for plugin via Error-splash-screen >> * All IcedTea-Web dialogues are centered to middle of active screen >> * Download indicator made compact for more then one jar >> * User can select its own JVM via itw-settings and deploy.properties. >> * Added extended applets security settings and dialogue >> * Security updates >> - CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path. >> - CVE-2013-1927, RH884705: fixed gifar vulnerabilit >> - CVE-2012-3422, RH840592: Potential read from an uninitialized memory location >> - CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings >> * NetX >> - PR1027: DownloadService is not supported by IcedTea-Web >> - PR725: JNLP applications will prompt for creating desktop shortcuts every time they are run >> - PR1292: Javaws does not resolve versioned jar names with periods correctly >> * Plugin >> - PR1106: Buffer overflow in plugin table- >> - PR1166: Embedded JNLP File is not supported in applet tag >> - PR1217: Add command line arguments for plugins >> - PR1189: Icedtea-plugin requires code attribute when using jnlp_href >> - PR1198: JSObject is not passed to javascript correctly >> - PR1260: IcedTea-Web should not rely on GTK >> - PR1157: Applets can hang browser after fatal exception >> - PR580: http://www.horaoficial.cl/ loads improperly >> * Common >> - PR1049: Extension jnlp's signed jar with the content of only META-INF/* is considered >> - PR955: regression: SweetHome3D fails to run >> - PR1145: IcedTea-Web can cause ClassCircularityError >> - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 >> - PR822: Applets fail to load if jars have different signers >> - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null >> - PR909: The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails >> - PR1299: WebStart doesn't read socket proxy settings from firefox correctly >> >> >> >> People who helped with this release (If I forgot somebody, please let me know!): >> >> >> Deepak Bhole >> Danesh Dadachanji >> Adam Domurad >> Jana Fabrikova >> Peter Hatina >> Andrew John Hughes >> Matthias Klose >> Alexandr Kolouch >> Jan Kmetko >> Omair Majid >> Thomas Meyer >> Saad Mohammad >> Martin Olsson >> Pavel Tisnovsky >> Jiri Vanek >> Jacob Wisor >> >> >> Special thanks to: >> >> * Adam Domurad - for deep investigations and fixes in core, and in numerous classloaders or >> otherwise complicated bugs >> * Jan Kmetko - for initial design of splashscreen >> * Deepak Bhole and Omair Majid - for ever keeping an watchful eye on patches >> * to community - namely: >> - Jacob Wisor and Alexandr Kolouch - who voluntary offered and delivered Pl and Cz translation >> > From andrew at icedtea.classpath.org Sat May 4 09:07:15 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 04 May 2013 16:07:15 +0000 Subject: /hg/icedtea7: Forwardport regeneration of diamond patch, followi... Message-ID: changeset 0b68075bb95a in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0b68075bb95a author: Andrew John Hughes date: Sat May 04 17:07:06 2013 +0100 Forwardport regeneration of diamond patch, following April security update. 2013-04-17 Andrew John Hughes * patches/boot/ecj-diamond.patch: Regenerate due to security patches. diffstat: ChangeLog | 5 +++++ patches/boot/ecj-diamond.patch | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (26 lines): diff -r e562523c5037 -r 0b68075bb95a ChangeLog --- a/ChangeLog Wed Apr 24 13:38:48 2013 +0100 +++ b/ChangeLog Sat May 04 17:07:06 2013 +0100 @@ -1,3 +1,8 @@ +2013-04-17 Andrew John Hughes + + * patches/boot/ecj-diamond.patch: + Regenerate due to security patches. + 2013-04-24 Andrew John Hughes * patches/cacao/jsig.patch: diff -r e562523c5037 -r 0b68075bb95a patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Wed Apr 24 13:38:48 2013 +0100 +++ b/patches/boot/ecj-diamond.patch Sat May 04 17:07:06 2013 +0100 @@ -1024,8 +1024,8 @@ */ final class ThreadGroupContext { -- private static final Map contexts = new WeakHashMap<>(); -+ private static final Map contexts = new WeakHashMap(); +- private static final WeakIdentityMap contexts = new WeakIdentityMap<>(); ++ private static final WeakIdentityMap contexts = new WeakIdentityMap(); /** * Returns the appropriate {@code AppContext} for the caller, From bugzilla-daemon at icedtea.classpath.org Tue May 7 04:04:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 07 May 2013 11:04:25 +0000 Subject: [Bug 1427] New: A fatal error has been detected by the Java Runtime Environment Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1427 Bug ID: 1427 Summary: A fatal error has been detected by the Java Runtime Environment Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: e2937278 at rmqkr.net CC: unassigned at icedtea.classpath.org Created attachment 866 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=866&action=edit This is the file with all the info detected -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130507/7674dddd/attachment.html From xranby at icedtea.classpath.org Tue May 7 04:08:59 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 07 May 2013 11:08:59 +0000 Subject: /hg/icedtea: JamVM: Update to 2013-05-06 revision. Message-ID: changeset 2e8f301c5848 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2e8f301c5848 author: Xerxes Ranby date: Tue May 07 15:37:42 2013 +0200 JamVM: Update to 2013-05-06 revision. 2013-05-07 Xerxes R?nby JamVM - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 10 ++++++++++ Makefile.am | 4 ++-- NEWS | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diffs (43 lines): diff -r c9942e43a65a -r 2e8f301c5848 ChangeLog --- a/ChangeLog Tue Apr 30 18:49:27 2013 +0200 +++ b/ChangeLog Tue May 07 15:37:42 2013 +0200 @@ -1,3 +1,13 @@ +2013-05-07 Xerxes R??nby + + JamVM + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. + (JAMVM_SHA256SUM): Updated. + 2013-04-30 Xerxes R??nby JamVM diff -r c9942e43a65a -r 2e8f301c5848 Makefile.am --- a/Makefile.am Tue Apr 30 18:49:27 2013 +0200 +++ b/Makefile.am Tue May 07 15:37:42 2013 +0200 @@ -26,8 +26,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 938504fb92e8fd2a91276a54b0a0c7be25731c19 -JAMVM_SHA256SUM = b56563270af85eefc7e2d95837b6c94f1c0d2720c579c74e5b3842357988a096 +JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 +JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 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 c9942e43a65a -r 2e8f301c5848 NEWS --- a/NEWS Tue Apr 30 18:49:27 2013 +0200 +++ b/NEWS Tue May 07 15:37:42 2013 +0200 @@ -19,6 +19,8 @@ - JSR 901: VM support for method parameter reflection - JEP 171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code - Do not free unprepared Miranda method code data - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub From xranby at icedtea.classpath.org Tue May 7 04:09:15 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 07 May 2013 11:09:15 +0000 Subject: /hg/icedtea7: JamVM: Update to 2013-05-06 revision. Message-ID: changeset 933d082ec889 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=933d082ec889 author: Xerxes Ranby date: Tue May 07 15:59:03 2013 +0200 JamVM: Update to 2013-05-06 revision. 2013-05-07 Xerxes R?nby JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code - Do not free unprepared Miranda method code data - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives * NEWS: Updated. * patches/jamvm/remove-sun.misc.Perf-debug-code.patch: Removed. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. (JAMVM_SHA256SUM): Updated. (ICEDTEA_PATCHES): Drop unneeded sun.misc.Perf patch. diffstat: ChangeLog | 19 ++++++++ Makefile.am | 9 +--- NEWS | 10 ++++ patches/jamvm/remove-sun.misc.Perf-debug-code.patch | 47 --------------------- 4 files changed, 31 insertions(+), 54 deletions(-) diffs (123 lines): diff -r 0b68075bb95a -r 933d082ec889 ChangeLog --- a/ChangeLog Sat May 04 17:07:06 2013 +0100 +++ b/ChangeLog Tue May 07 15:59:03 2013 +0200 @@ -1,3 +1,22 @@ +2013-05-07 Xerxes R??nby + + JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives + * NEWS: Updated. + * patches/jamvm/remove-sun.misc.Perf-debug-code.patch: Removed. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. + (JAMVM_SHA256SUM): Updated. + (ICEDTEA_PATCHES): Drop unneeded sun.misc.Perf patch. + 2013-04-17 Andrew John Hughes * patches/boot/ecj-diamond.patch: diff -r 0b68075bb95a -r 933d082ec889 Makefile.am --- a/Makefile.am Sat May 04 17:07:06 2013 +0100 +++ b/Makefile.am Tue May 07 15:59:03 2013 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82 -JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 +JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 +JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 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 @@ -279,11 +279,6 @@ patches/cacao/ignore-tests.patch endif -if BUILD_JAMVM -ICEDTEA_PATCHES += \ - patches/jamvm/remove-sun.misc.Perf-debug-code.patch -endif - if ENABLE_PULSE_JAVA ICEDTEA_PATCHES += \ patches/pulse-soundproperties.patch diff -r 0b68075bb95a -r 933d082ec889 NEWS --- a/NEWS Sat May 04 17:07:06 2013 +0100 +++ b/NEWS Tue May 07 15:59:03 2013 +0200 @@ -715,6 +715,16 @@ - Clang fix for the i386 backend - Fix rt-timing - Moved rt-timing.{c,h} to C++ +* JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives New in release 2.3.8 (2013-03-11): diff -r 0b68075bb95a -r 933d082ec889 patches/jamvm/remove-sun.misc.Perf-debug-code.patch --- a/patches/jamvm/remove-sun.misc.Perf-debug-code.patch Sat May 04 17:07:06 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java -=================================================================== ---- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-13 16:58:42.000000000 +0200 -+++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-28 18:43:50.114802612 +0200 -@@ -438,14 +438,12 @@ - // Use (direct) ByteBuffer: - CodeSigner[] signers = res.getCodeSigners(); - CodeSource cs = new CodeSource(url, signers); -- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0); - return defineClass(name, bb, cs); - } else { - byte[] b = res.getBytes(); - // must read certificates AFTER reading bytes. - CodeSigner[] signers = res.getCodeSigners(); - CodeSource cs = new CodeSource(url, signers); -- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0); - return defineClass(name, b, 0, b.length, cs); - } - } -Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java -=================================================================== ---- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-13 16:58:42.000000000 +0200 -+++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-28 18:43:50.142802778 +0200 -@@ -422,10 +422,6 @@ - long t1 = System.nanoTime(); - c = findClass(name); - -- // this is the defining class loader; record the stats -- sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0); -- sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1); -- sun.misc.PerfCounter.getFindClasses().increment(); - } - } - if (resolve) { -Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java -=================================================================== ---- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-28 18:56:56.994704556 +0200 -+++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-28 18:57:11.514776567 +0200 -@@ -212,8 +212,6 @@ - this.zc = ZipCoder.get(charset); - long t0 = System.nanoTime(); - jzfile = open(name, mode, file.lastModified(), usemmap); -- sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0); -- sun.misc.PerfCounter.getZipFileCount().increment(); - this.name = name; - this.total = getTotal(jzfile); - } From xranby at icedtea.classpath.org Tue May 7 04:09:35 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 07 May 2013 11:09:35 +0000 Subject: /hg/icedtea6: JamVM: Update to 2013-05-06 revision. Message-ID: changeset c23f233213f4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c23f233213f4 author: Xerxes Ranby date: Tue May 07 16:09:51 2013 +0200 JamVM: Update to 2013-05-06 revision. 2013-05-07 Xerxes R?nby JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code - Do not free unprepared Miranda method code data - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 17 +++++++++++++++++ Makefile.am | 4 ++-- NEWS | 10 ++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diffs (58 lines): diff -r 3b76dff83564 -r c23f233213f4 ChangeLog --- a/ChangeLog Tue Apr 30 13:18:33 2013 +0200 +++ b/ChangeLog Tue May 07 16:09:51 2013 +0200 @@ -1,3 +1,20 @@ +2013-05-07 Xerxes R??nby + + JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. + (JAMVM_SHA256SUM): Updated. + 2013-04-30 Pavel Tisnovsky * Makefile.am: diff -r 3b76dff83564 -r c23f233213f4 Makefile.am --- a/Makefile.am Tue Apr 30 13:18:33 2013 +0200 +++ b/Makefile.am Tue May 07 16:09:51 2013 +0200 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82 -JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 +JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 +JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 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 3b76dff83564 -r c23f233213f4 NEWS --- a/NEWS Tue Apr 30 13:18:33 2013 +0200 +++ b/NEWS Tue May 07 16:09:51 2013 +0200 @@ -22,6 +22,16 @@ * Bug fixes - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only) +* JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives New in release 1.12.5 (2013-04-24): From xerxes at zafena.se Tue May 7 04:29:57 2013 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 07 May 2013 13:29:57 +0200 Subject: FYI: JamVM: Update to 2013-05-06 revision; IcedTea 1, 2 & 3 are now in sync. Message-ID: <5188E5B5.6060009@zafena.se> I have updated IcedTea 1, 2 & 3 to now use the same JamVM 2013-05-06 revision: http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=7c8dceb90880616b7dd670f257961a1f5f371ec3 The IcedTea 1, 2 & 3 update is now committed here: http://icedtea.classpath.org/hg/icedtea/rev/2e8f301c5848 http://icedtea.classpath.org/hg/icedtea7/rev/933d082ec889 http://icedtea.classpath.org/hg/icedtea6/rev/c23f233213f4 Unlike hotspot, the same JamVM codebase supports OpenJDK 6, 7 and 8 (and GNU Classpath): JamVM features depending on the version of OpenJDK it is compiled against therefore JSR 292 and JSR 901 is only supported for OpenJDK 8 builds. I have taken care to make the NEWS reflect which JamVM features are enabled in each IcedTea release. According to Robert; IcedTea 2 & OpenJDK 7 may get JSR 292 if the JSR 292 LambdaForms implementation now found in OpenJDK 8 gets back-ported. http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=158d02c05e0850dcf62cb156e40f5661e3262017 Cheers Xerxes From ChrisPhi at LGonQn.Org Tue May 7 05:26:04 2013 From: ChrisPhi at LGonQn.Org (Chris Phillips @ T O) Date: Tue, 07 May 2013 08:26:04 -0400 Subject: FYI: JamVM: Update to 2013-05-06 revision; IcedTea 1, 2 & 3 are now in sync. In-Reply-To: <5188E5B5.6060009@zafena.se> References: <5188E5B5.6060009@zafena.se> Message-ID: <5188F2DC.4000906@LGonQn.Org> Hi Xerxes Great work.. (both you and Robert)! On 07/05/13 07:29 AM, Xerxes R?nby wrote: > I have updated IcedTea 1, 2 & 3 to now use the same JamVM 2013-05-06 revision: > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=7c8dceb90880616b7dd670f257961a1f5f371ec3 > > The IcedTea 1, 2 & 3 update is now committed here: > http://icedtea.classpath.org/hg/icedtea/rev/2e8f301c5848 > http://icedtea.classpath.org/hg/icedtea7/rev/933d082ec889 > http://icedtea.classpath.org/hg/icedtea6/rev/c23f233213f4 > > Unlike hotspot, the same JamVM codebase supports OpenJDK 6, 7 and 8 (and GNU Classpath): > JamVM features depending on the version of OpenJDK it is compiled against therefore JSR 292 and JSR 901 is only supported for OpenJDK 8 builds. > I have taken care to make the NEWS reflect which JamVM features are enabled in each IcedTea release. > > According to Robert; IcedTea 2 & OpenJDK 7 may get JSR 292 if the JSR 292 LambdaForms implementation now found in OpenJDK 8 gets back-ported. Just an FYI: This feature is in jdk7u (hsx24) and should be supported in icedtea7-head. > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=158d02c05e0850dcf62cb156e40f5661e3262017 > > > Cheers > Xerxes Chris From gitne at excite.co.jp Tue May 7 08:46:57 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 8 May 2013 00:46:57 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIEZpeCBvZiBiYWNrdXAgb2YgZGVwbG95bWVudC5wcm9wZXJ0aWVzIG9uIHNvbWUgT1Nz?= Message-ID: <201305071546.r47FkvO7021612@mail-web01.excite.co.jp> Hello! Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. Happy reviewing! Jacob From gitne at excite.co.jp Tue May 7 08:50:54 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 8 May 2013 00:50:54 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBGaXggb2YgYmFja3VwIG9mIGRlcGxveW1lbnQucHJvcGVydGllcyBvbiBzb21lIE9Tcw==?= Message-ID: <201305071550.r47FosjD016144@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > Hello! > > Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. > > Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. > > Happy reviewing! > Jacob Sorry, the webmailer keeps dropping attachements at random... -------------- next part -------------- A non-text attachment was scrubbed... Name: Fix of backup of deployment.properties on some OSs.patch Type: text/x-patch Size: 7335 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130508/9a809ea7/ISO-2022-JPBRml4IG9mIGJhY2t1cCBvZiBkZXBsb3ltZW50LnByb3BlcnRpZXMgb24gc29tZSBPU3MucGF0Y2g.patch From bugzilla-daemon at icedtea.classpath.org Tue May 7 14:22:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 07 May 2013 21:22:42 +0000 Subject: [Bug 1429] New: Problem with Java run time environment Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1429 Bug ID: 1429 Summary: Problem with Java run time environment Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: baptistecambondelavalette at yahoo.fr CC: unassigned at icedtea.classpath.org Created attachment 868 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=868&action=edit An error report file with more information is saved as: # /home/baptiste/hs_err_pid4846.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and vis root at bureau:/home/baptiste# freemind Checking Java Version... java.io.FileNotFoundException: /root/.freemind/auto.properties (No such file or directory) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:137) at freemind.main.FreeMindStarter.readUsersPreferences(FreeMindStarter.java:136) at freemind.main.FreeMindStarter.main(FreeMindStarter.java:56) Panic! Error while loading default properties. # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0xb70f6636, pid=4846, tid=3067640688 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Client VM (14.0-b16 mixed mode, sharing linux-x86 ) # Derivative: IcedTea6 1.8.13 # Distribution: Debian GNU/Linux 6.0.4 (squeeze), package 6b18-1.8.13-0+squeeze2 # Problematic frame: # V [libjvm.so+0x348636] # # An error report file with more information is saved as: # /home/baptiste/hs_err_pid4846.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # Aborted -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130507/466f6205/attachment.html From gnu.andrew at redhat.com Wed May 8 07:35:41 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 8 May 2013 10:35:41 -0400 (EDT) Subject: [SECURITY] IcedTea 2.1.8 for OpenJDK 7 Released! In-Reply-To: <201305022238.r42McVM9029435@mail-web02.excite.co.jp> References: <201305022238.r42McVM9029435@mail-web02.excite.co.jp> Message-ID: <1419712607.8787583.1368023740999.JavaMail.root@redhat.com> ----- Original Message ----- > "Andrew Hughes" wrote: > > ----- Original Message ----- > > > On 05/02/2013 01:02 PM, Jacob Wisor wrote: > > > > "Andrew John Hughes" wrote: > > > > [...] > > > >> In addition, IcedTea includes the usual IcedTea patches to allow > > > >> builds against system libraries and to support more esoteric > > > >> architectures. > > > > You probably mean "exotic architectures"... How could an architecture > > > > be > > > > esoteric??? :D Well, maybe those with positive vibrations? > > > > > > > > [...] > > > > > > > > Have a nice day! > > > > Jacob > > > > > > It's a colourful term, but it makes sense to me. Eg, knowing how to > > > support exotic architectures would require knowledge that could be > > > described as esoteric, so they can themselves be described as esoteric. > > > > > > > The use of "exotic" is equally odd to me. It implies "foreign" and makes > > me think more of exotic fruits than architectures with small userbases. > > > > Interesting that people should pick up on this now. I think it's been in > > countless release announcements ;) > > I am sorry, should I have upset you. My intention was not to be picky. No, not at all; it takes a lot to upset me ;) It's interesting, that's all I was saying. > The > term just seems funny to me, since it reminds me of people with beliefs in > esoterism that simply is incompatible with computer science (which infact is > a science) or meta-physics, that bothers about some kind of non-existent > architecture that still abides by logic. As for the announcement itself, I > do not want to impose anything. > That is indeed where the word comes from, but we use it in a general sense of architectures used by a small number of people with specialist use cases. > Have fun! :) > Jacob > You too! :) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From ptisnovs at icedtea.classpath.org Thu May 9 00:36:36 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 09 May 2013 07:36:36 +0000 Subject: /hg/rhino-tests: Updated four tests in SimpleBindingsClassTest f... Message-ID: changeset bdda58cfb157 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=bdda58cfb157 author: Pavel Tisnovsky date: Thu May 09 09:40:02 2013 +0200 Updated four tests in SimpleBindingsClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/SimpleBindingsClassTest.java | 64 +++++++++++++++++++++++- 2 files changed, 66 insertions(+), 4 deletions(-) diffs (115 lines): diff -r 32315f7a8cb8 -r bdda58cfb157 ChangeLog --- a/ChangeLog Fri May 03 09:30:03 2013 +0200 +++ b/ChangeLog Thu May 09 09:40:02 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-09 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Updated four tests in SimpleBindingsClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-03 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r 32315f7a8cb8 -r bdda58cfb157 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Fri May 03 09:30:03 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Thu May 09 09:40:02 2013 +0200 @@ -481,9 +481,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.simpleBindingsClass.getFields(); @@ -510,10 +523,24 @@ final String[] declaredFieldsThatShouldExist_jdk7 = { "private java.util.Map javax.script.SimpleBindings.map", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "private java.util.Map javax.script.SimpleBindings.map", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.simpleBindingsClass.getDeclaredFields(); @@ -538,8 +565,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -567,8 +607,24 @@ final String[] declaredFieldsThatShouldExist_jdk7 = { "map", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "map", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From ptisnovs at icedtea.classpath.org Thu May 9 01:14:06 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 09 May 2013 08:14:06 +0000 Subject: /hg/gfx-test: New tests added into BitBltBasicTests test suite. Message-ID: changeset 4c38f4765fc6 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4c38f4765fc6 author: Pavel Tisnovsky date: Thu May 09 10:17:32 2013 +0200 New tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 7 +- src/org/gfxtest/testsuites/BitBltBasicTests.java | 106 +++++++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletions(-) diffs (133 lines): diff -r 1f651f68bc2f -r 4c38f4765fc6 ChangeLog --- a/ChangeLog Fri May 03 09:44:22 2013 +0200 +++ b/ChangeLog Thu May 09 10:17:32 2013 +0200 @@ -1,7 +1,12 @@ +2013-05-09 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + New tests added into BitBltBasicTests test suite. + 2013-05-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java: - Ten new tests added into ClippingCircleByConvexPolygonalShape.. + Ten new tests added into ClippingCircleByConvexPolygonalShape. 2013-05-02 Pavel Tisnovsky diff -r 1f651f68bc2f -r 4c38f4765fc6 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri May 03 09:44:22 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu May 09 10:17:32 2013 +0200 @@ -3868,6 +3868,112 @@ } /** + * Test basic BitBlt operation for horizontal blue gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** * Test basic BitBlt operation for vertical blue gradient buffered image * with type TYPE_BYTE_BINARY. * From jvanek at redhat.com Thu May 9 01:59:11 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 09 May 2013 10:59:11 +0200 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties on some OSs In-Reply-To: <201305071550.r47FosjD016144@mail-web03.excite.co.jp> References: <201305071550.r47FosjD016144@mail-web03.excite.co.jp> Message-ID: <518B655F.8090609@redhat.com> On 05/07/2013 05:50 PM, Jacob Wisor wrote: > "Jacob Wisor" wrote: >> Hello! >> >> Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. >> >> Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just agree >> redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. >> >> Happy reviewing! >> Jacob > > Sorry, the webmailer keeps dropping attachements at random... > Hi! The patch looks ok, however I'm in doubts whether this quite complex solution is necessary. What I have in mind is: 1) Does .old file exists? If yes, delete it. (if it is directory then... ??? :)) I think we can ignore this case. If Deletion failed, warn user and log exception(if none, then jsut some stderr stuff) (there would be nice some better error reporting - in comamndline mode[1] just print exception, whether in gui[2] mode also show dialogue, but do not throw exception out - but it is probably work for different changeset) 2)Rename current properties to .old - if it failed - again warn, but do not fail - maybe ask the user to continue - not continue (in gui mode). 3) save new properties - if this failed - then this is the only reason for fatal exception imho. What do you think? If you agree, then for now only the parts without the "user interactions" are worthy. But of course if you are wiling to fix also the interaction then we will be more then happy (but please as different changeset) Thank you for checking this! J. [1] http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java [2] http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java From bugzilla-daemon at icedtea.classpath.org Thu May 9 13:47:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 09 May 2013 20:47:37 +0000 Subject: [Bug 1432] New: Runescape updater gets stuck at 2 percent Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1432 Bug ID: 1432 Summary: Runescape updater gets stuck at 2 percent Classification: Unclassified Product: IcedTea Version: 2.3.8 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: romulasry at yahoo.com CC: unassigned at icedtea.classpath.org Here is the error I get in console: ICEDTEA_DEBUG=true firefox java version "1.7.0_17" OpenJDK Runtime Environment (IcedTea7 2.3.8) (suse-8.8.1-x86_64) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) /home/abuild/rpmbuild/BUILD/icedtea-web-1.3.2/plugin/icedteanp/IcedTeaNPPlugin.cc:684: thread 0x7fbd1e90ef40: Error: Unknown plugin value requested. sun.awt.image.ImageFormatException: Unsupported color conversion request at sun.awt.image.JPEGImageDecoder.readImage(Native Method) at sun.awt.image.JPEGImageDecoder.produceImage(JPEGImageDecoder.java:136) at sun.awt.image.InputStreamImageSource.doFetch(InputStreamImageSource.java:269) at sun.awt.image.ImageFetcher.fetchloop(ImageFetcher.java:205) at sun.awt.image.ImageFetcher.run(ImageFetcher.java:169) This is not the same as when I when I rune the native Java in Windows, I do not get this behavior. I believe if I run the closed source version in Linux that I would not have this, I believe. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130509/bab0bc6d/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 9 13:48:14 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 09 May 2013 20:48:14 +0000 Subject: [Bug 1432] Runescape updater gets stuck at 2 percent In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1432 --- Comment #1 from romulasry at yahoo.com --- Created attachment 871 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=871&action=edit Image showing it getting stuck at 2 percent -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130509/e97078b5/attachment.html From ptisnovs at icedtea.classpath.org Fri May 10 02:09:27 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 10 May 2013 09:09:27 +0000 Subject: /hg/rhino-tests: Updated four new tests in AbstractScriptEngineC... Message-ID: changeset c34799b2f593 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c34799b2f593 author: Pavel Tisnovsky date: Fri May 10 11:12:17 2013 +0200 Updated four new tests in AbstractScriptEngineClassTest for (Open)JDK8. diffstat: ChangeLog | 6 + src/org/RhinoTests/AbstractScriptEngineClassTest.java | 134 +++++++++++++++++- 2 files changed, 136 insertions(+), 4 deletions(-) diffs (192 lines): diff -r bdda58cfb157 -r c34799b2f593 ChangeLog --- a/ChangeLog Thu May 09 09:40:02 2013 +0200 +++ b/ChangeLog Fri May 10 11:12:17 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-10 Pavel Tisnovsky + + * src/org/RhinoTests/AbstractScriptEngineClassTest.java: + Updated four new tests in AbstractScriptEngineClassTest for + (Open)JDK8. + 2013-05-09 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r bdda58cfb157 -r c34799b2f593 src/org/RhinoTests/AbstractScriptEngineClassTest.java --- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java Thu May 09 09:40:02 2013 +0200 +++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java Fri May 10 11:12:17 2013 +0200 @@ -740,6 +740,32 @@ "public void javax.script.AbstractScriptEngine.setContext(javax.script.ScriptContext)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract javax.script.Bindings javax.script.ScriptEngine.createBindings()", + "public abstract javax.script.ScriptEngineFactory javax.script.ScriptEngine.getFactory()", + "public boolean java.lang.Object.equals(java.lang.Object)", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.lang.String) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.get(java.lang.String)", + "public java.lang.String java.lang.Object.toString()", + "public javax.script.Bindings javax.script.AbstractScriptEngine.getBindings(int)", + "public javax.script.ScriptContext javax.script.AbstractScriptEngine.getContext()", + "public native int java.lang.Object.hashCode()", + "public void javax.script.AbstractScriptEngine.put(java.lang.String,java.lang.Object)", + "public void javax.script.AbstractScriptEngine.setBindings(javax.script.Bindings,int)", + "public void javax.script.AbstractScriptEngine.setContext(javax.script.ScriptContext)", + }; + // get all inherited methods Method[] methods = this.abstractScriptEngineClass.getMethods(); // and transform the array into a list of method names @@ -747,7 +773,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -788,6 +827,20 @@ "public void javax.script.AbstractScriptEngine.setContext(javax.script.ScriptContext)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "protected javax.script.ScriptContext javax.script.AbstractScriptEngine.getScriptContext(javax.script.Bindings)", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.lang.String) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException", + "public java.lang.Object javax.script.AbstractScriptEngine.get(java.lang.String)", + "public javax.script.Bindings javax.script.AbstractScriptEngine.getBindings(int)", + "public javax.script.ScriptContext javax.script.AbstractScriptEngine.getContext()", + "public void javax.script.AbstractScriptEngine.put(java.lang.String,java.lang.Object)", + "public void javax.script.AbstractScriptEngine.setBindings(javax.script.Bindings,int)", + "public void javax.script.AbstractScriptEngine.setContext(javax.script.ScriptContext)", + }; + // get all declared methods Method[] declaredMethods = this.abstractScriptEngineClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -795,7 +848,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -858,7 +924,43 @@ methodsThatShouldExist_jdk7.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class}); methodsThatShouldExist_jdk7.put("createBindings", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("getContext", new Class[] {}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("createBindings", new Class[] {}); + methodsThatShouldExist_jdk8.put("getFactory", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -910,7 +1012,31 @@ methodsThatShouldExist_jdk7.put("setContext", new Class[] {javax.script.ScriptContext.class}); methodsThatShouldExist_jdk7.put("getScriptContext", new Class[] {javax.script.Bindings.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("getScriptContext", new Class[] {javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("getContext", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From ptisnovs at icedtea.classpath.org Fri May 10 02:33:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 10 May 2013 09:33:42 +0000 Subject: /hg/gfx-test: Five new helper methods added into BitBltAffineTra... Message-ID: changeset 38588fcd1665 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=38588fcd1665 author: Pavel Tisnovsky date: Fri May 10 11:37:06 2013 +0200 Five new helper methods added into BitBltAffineTransformOp. Test annotations added too. diffstat: ChangeLog | 8 + src/org/gfxtest/framework/annotations/Transformations.java | 5 + src/org/gfxtest/testsuites/BitBltAffineTransformOp.java | 125 +++++++++++++ 3 files changed, 138 insertions(+), 0 deletions(-) diffs (167 lines): diff -r 4c38f4765fc6 -r 38588fcd1665 ChangeLog --- a/ChangeLog Thu May 09 10:17:32 2013 +0200 +++ b/ChangeLog Fri May 10 11:37:06 2013 +0200 @@ -1,3 +1,11 @@ +2013-05-10 Pavel Tisnovsky + + * src/org/gfxtest/framework/annotations/Transformations.java: + New value for 'Transformation' annotation. + * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java: + Five new helper methods added into BitBltAffineTransformOp. + Test annotations added too. + 2013-05-09 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 4c38f4765fc6 -r 38588fcd1665 src/org/gfxtest/framework/annotations/Transformations.java --- a/src/org/gfxtest/framework/annotations/Transformations.java Thu May 09 10:17:32 2013 +0200 +++ b/src/org/gfxtest/framework/annotations/Transformations.java Fri May 10 11:37:06 2013 +0200 @@ -74,4 +74,9 @@ * Skew linear transformation is used. */ SKEW, + + /** + * Various linear transformation is used. + */ + VARIOUS, } diff -r 4c38f4765fc6 -r 38588fcd1665 src/org/gfxtest/testsuites/BitBltAffineTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Thu May 09 10:17:32 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Fri May 10 11:37:06 2013 +0200 @@ -40,10 +40,135 @@ package org.gfxtest.testsuites; +import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; +import java.awt.image.AffineTransformOp; +import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; + + + +import org.gfxtest.framework.CommonBitmapOperations; import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.TestImage; +import org.gfxtest.framework.TestResult; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.VARIOUS) + at Zoom(1) public class BitBltAffineTransformOp extends GfxTest { + private static final AffineTransform IdentifyTransformation = new AffineTransform(); + + private static final AffineTransformOp IdentifyTranspormationOp1 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_NEAREST_NEIGHBOR); + private static final AffineTransformOp IdentifyTranspormationOp2 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BILINEAR); + private static final AffineTransformOp IdentifyTranspormationOp3 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BICUBIC); + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing checker pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing diagonal checker pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image containing diagonal grid pattern + * with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + /** * Entry point to the test suite. From bugzilla-daemon at icedtea.classpath.org Fri May 10 07:15:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 10 May 2013 14:15:12 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 dietmar at proxmox.com changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dietmar at proxmox.com --- Comment #3 from dietmar at proxmox.com --- I can also observe this bug on new Debian Wheezy installation with iceweasel amd64. We also get many reports from our users that the tigervnc applet trigger this bug with our GUI (pve.proxmox.com). Any plan to fix that? The bug is known for more that one year now, and can be reproduced quite easily. Or can't you reproduce it? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130510/3d6094c5/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 10 09:59:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 10 May 2013 16:59:39 +0000 Subject: [Bug 1368] [IcedTea8] Ensure debug data is available for all libraries and binaries without redundant files In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1368 --- Comment #3 from Andrew John Hughes --- http://hg.openjdk.java.net/jdk8/build/jdk/rev/88125d32eb06 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130510/50ce5970/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 10 10:16:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 10 May 2013 17:16:12 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 mir at miras.org changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mir at miras.org --- Comment #4 from mir at miras.org --- The same applies to newest version in Debian Sid. apt-cache show icedtea-7-plugin Package: icedtea-7-plugin Source: icedtea-web Version: 1.4-1 Installed-Size: 256 Maintainer: OpenJDK Team Architecture: amd64 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130510/c613522c/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 10 10:25:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 10 May 2013 17:25:12 +0000 Subject: [Bug 1410] Icedtea 2.3.9 fails to build using icedtea 1.12.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1410 --- Comment #2 from Andrew John Hughes --- It should be noted that this is a no-bootstrap build. The bootstrap build with IcedTea6 is known to be broken with 2.3.x and before: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130510/85541b08/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 10 11:17:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 10 May 2013 18:17:51 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 --- Comment #5 from Adam Domurad --- I will look into it, thanks. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130510/01214852/attachment.html From andrew at icedtea.classpath.org Fri May 10 13:14:57 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 10 May 2013 20:14:57 +0000 Subject: /hg/release/icedtea7-2.1: Start 2.1.9 release cycle. Message-ID: changeset 611d74f7a36c in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=611d74f7a36c author: Andrew John Hughes date: Fri May 10 21:14:46 2013 +0100 Start 2.1.9 release cycle. 2013-05-10 Andrew John Hughes * configure.ac: Bump to 2.1.9pre. * NEWS: Add section for 2.1.9. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r bda6f93d4927 -r 611d74f7a36c ChangeLog --- a/ChangeLog Thu May 02 17:56:53 2013 +0100 +++ b/ChangeLog Fri May 10 21:14:46 2013 +0100 @@ -1,3 +1,8 @@ +2013-05-10 Andrew John Hughes + + * configure.ac: Bump to 2.1.9pre. + * NEWS: Add section for 2.1.9. + 2013-05-02 Andrew John Hughes * Makefile.am: diff -r bda6f93d4927 -r 611d74f7a36c NEWS --- a/NEWS Thu May 02 17:56:53 2013 +0100 +++ b/NEWS Fri May 10 21:14:46 2013 +0100 @@ -10,6 +10,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.1.9 (2013-06-02): + New in release 2.1.8 (2013-05-02): * Security fixes diff -r bda6f93d4927 -r 611d74f7a36c configure.ac --- a/configure.ac Thu May 02 17:56:53 2013 +0100 +++ b/configure.ac Fri May 10 21:14:46 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.1.8], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.1.9pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From jvanek at redhat.com Mon May 13 00:10:50 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 13 May 2013 09:10:50 +0200 Subject: [fyi] [icedtea-web] fixing not-escaped delimiter Message-ID: <519091FA.5040103@redhat.com> Hi All Adam have noted wrong properties message: http://i.imgur.com/SyFaxDV.png Which is caused by not escaped character. Here is simple fix for this. Applicable for head and 1.4 Sorry for this J. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: fixUnescapedDelimiter Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130513/d03a312e/fixUnescapedDelimiter.ksh From ptisnovs at icedtea.classpath.org Mon May 13 00:35:32 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 13 May 2013 07:35:32 +0000 Subject: /hg/rhino-tests: Updated four tests in BindingsClassTest for (Op... Message-ID: changeset a572cad21e85 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a572cad21e85 author: Pavel Tisnovsky date: Mon May 13 09:38:58 2013 +0200 Updated four tests in BindingsClassTest for (Open)JDK8 API: getMethod, getDeclaredMethod, getMethods and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/BindingsClassTest.java | 106 ++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 4 deletions(-) diffs (164 lines): diff -r c34799b2f593 -r a572cad21e85 ChangeLog --- a/ChangeLog Fri May 10 11:12:17 2013 +0200 +++ b/ChangeLog Mon May 13 09:38:58 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-13 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Updated four tests in BindingsClassTest for (Open)JDK8 API: + getMethod, getDeclaredMethod, getMethods and getDeclaredMethods. + 2013-05-10 Pavel Tisnovsky * src/org/RhinoTests/AbstractScriptEngineClassTest.java: diff -r c34799b2f593 -r a572cad21e85 src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Fri May 10 11:12:17 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Mon May 13 09:38:58 2013 +0200 @@ -635,6 +635,24 @@ "public abstract void javax.script.Bindings.putAll(java.util.Map)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract boolean java.util.Map.containsValue(java.lang.Object)", + "public abstract boolean java.util.Map.equals(java.lang.Object)", + "public abstract boolean java.util.Map.isEmpty()", + "public abstract boolean javax.script.Bindings.containsKey(java.lang.Object)", + "public abstract int java.util.Map.hashCode()", + "public abstract int java.util.Map.size()", + "public abstract java.lang.Object java.util.Map.put(java.lang.Object,java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.get(java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.put(java.lang.String,java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.remove(java.lang.Object)", + "public abstract java.util.Collection java.util.Map.values()", + "public abstract java.util.Set java.util.Map.entrySet()", + "public abstract java.util.Set java.util.Map.keySet()", + "public abstract void java.util.Map.clear()", + "public abstract void javax.script.Bindings.putAll(java.util.Map)", + }; + // get all inherited methods Method[] methods = this.bindingsClass.getMethods(); // and transform the array into a list of method names @@ -642,7 +660,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -671,6 +702,14 @@ "public abstract void javax.script.Bindings.putAll(java.util.Map)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract boolean javax.script.Bindings.containsKey(java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.get(java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.put(java.lang.String,java.lang.Object)", + "public abstract java.lang.Object javax.script.Bindings.remove(java.lang.Object)", + "public abstract void javax.script.Bindings.putAll(java.util.Map)", + }; + // get all declared methods Method[] declaredMethods = this.bindingsClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -678,7 +717,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -725,7 +777,35 @@ methodsThatShouldExist_jdk7.put("keySet", new Class[] {}); methodsThatShouldExist_jdk7.put("containsValue", new Class[] {java.lang.Object.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class}); + methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.Object.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("values", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("clear", new Class[] {}); + methodsThatShouldExist_jdk8.put("isEmpty", new Class[] {}); + methodsThatShouldExist_jdk8.put("size", new Class[] {}); + methodsThatShouldExist_jdk8.put("entrySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("keySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("containsValue", new Class[] {java.lang.Object.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -765,7 +845,25 @@ methodsThatShouldExist_jdk7.put("putAll", new Class[] {java.util.Map.class}); methodsThatShouldExist_jdk7.put("containsKey", new Class[] {java.lang.Object.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class}); + methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From ptisnovs at icedtea.classpath.org Mon May 13 00:51:28 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 13 May 2013 07:51:28 +0000 Subject: /hg/gfx-test: Added two new kernels and ROPs associated with tho... Message-ID: changeset 57c4b42782cb in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=57c4b42782cb author: Pavel Tisnovsky date: Mon May 13 09:54:53 2013 +0200 Added two new kernels and ROPs associated with those kernels. Four new tests added into BitBltConvolveOp test suite. diffstat: ChangeLog | 6 ++ src/org/gfxtest/testsuites/BitBltConvolveOp.java | 71 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 0 deletions(-) diffs (115 lines): diff -r 38588fcd1665 -r 57c4b42782cb ChangeLog --- a/ChangeLog Fri May 10 11:37:06 2013 +0200 +++ b/ChangeLog Mon May 13 09:54:53 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + Added two new kernels and ROPs associated with those kernels. + Four new tests added into BitBltConvolveOp test suite. + 2013-05-10 Pavel Tisnovsky * src/org/gfxtest/framework/annotations/Transformations.java: diff -r 38588fcd1665 -r 57c4b42782cb src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Fri May 10 11:37:06 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Mon May 13 09:54:53 2013 +0200 @@ -109,6 +109,18 @@ 1/25f, 1/25f, 1/25f, 1/25f, 1/25f, }); + private static final Kernel SobelOperatorGx = new Kernel(3, 3, new float[] { + 1f, 0f, -1f, + 2f, 0f, -2f, + 1f, 0f, -1f + }); + + private static final Kernel SobelOperatorGy = new Kernel(3, 3, new float[] { + 1f, 2f, 1f, + 0f, 0f, 0f, + -1f, -2f, -1f + }); + private static final ConvolveOp noopKernel1x1ROP = new ConvolveOp(NoOpKernel1x1); private static final ConvolveOp noopKernel3x3ROP = new ConvolveOp(NoOpKernel3x3); private static final ConvolveOp noopKernel5x5ROP = new ConvolveOp(NoOpKernel5x5); @@ -117,6 +129,9 @@ private static final ConvolveOp smoothingKernel3x3ROP = new ConvolveOp(SmoothingKernel3x3); private static final ConvolveOp smoothingKernel5x5ROP = new ConvolveOp(SmoothingKernel5x5); + private static final ConvolveOp sobelOperatorGxROP = new ConvolveOp(SobelOperatorGx); + private static final ConvolveOp sobelOperatorGyROP = new ConvolveOp(SobelOperatorGy); + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR * @@ -291,6 +306,34 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -375,6 +418,34 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. * * @param image From gitne at excite.co.jp Mon May 13 10:17:33 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 14 May 2013 02:17:33 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtmeWldIFtpY2VkdGVhLXdlYl0gZml4aW5nIG5vdC1lc2NhcGVkIGRlbGltaXRlcg==?= Message-ID: <201305131717.r4DHHX89008158@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > Hi All > > Adam have noted wrong properties message: http://i.imgur.com/SyFaxDV.png > Which is caused by not escaped character. Here is simple fix for this. > > Applicable for head and 1.4 > > Sorry for this > J. I would rather propose this. -------------- next part -------------- A non-text attachment was scrubbed... Name: Messages.patch Type: text/x-patch Size: 725 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130514/5be0e47b/ISO-2022-JPBTWVzc2FnZXMucGF0Y2g.patch From jvanek at redhat.com Mon May 13 10:39:08 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 13 May 2013 19:39:08 +0200 Subject: [fyi] [icedtea-web] fixing not-escaped delimiter In-Reply-To: <201305131717.r4DHHX89008158@mail-web03.excite.co.jp> References: <201305131717.r4DHHX89008158@mail-web03.excite.co.jp> Message-ID: <5191253C.7090007@redhat.com> On 05/13/2013 07:17 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> Hi All >> >> Adam have noted wrong properties message: http://i.imgur.com/SyFaxDV.png >> Which is caused by not escaped character. Here is simple fix for this. >> >> Applicable for head and 1.4 >> >> Sorry for this >> J. > > I would rather propose this. I do not see the difference between those two chars :) Feel free to push! J. From gitne at excite.co.jp Mon May 13 11:36:48 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 14 May 2013 03:36:48 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtmeWldIFtpY2VkdGVhLXdlYl0gZml4aW5nIG5vdC1lc2NhcGVkIGRlbGltaXRlcg==?= Message-ID: <201305131836.r4DIamA9010403@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 05/13/2013 07:17 PM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> Hi All > >> > >> Adam have noted wrong properties message: http://i.imgur.com/SyFaxDV.png > >> Which is caused by not escaped character. Here is simple fix for this. > >> > >> Applicable for head and 1.4 > >> > >> Sorry for this > >> J. > > > > I would rather propose this. > > I do not see the difference between those two chars :) The difference is that - is a hyphen minus and is reserved for arithmetic operations, whereas \u2014 is an Em dash and is reserved for flowing text. The hyphen minus The En dash (\u2013) can be ruled out, because its primary use is to denote ranges. > Feel free to push! Could you do it, please? I have not had the time for bothering with keys and revision repository access yet. Thank you! Jacob From gitne at excite.co.jp Mon May 13 14:34:18 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 14 May 2013 06:34:18 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBGaXggb2YgYmFja3VwIG9mIGRlcGxveW1lbnQucHJvcGVydGllcyBvbnNvbWUgT1Nz?= Message-ID: <201305132134.r4DLYIeR010093@mail-web02.excite.co.jp> "Jiri Vanek" wrote: > On 05/07/2013 05:50 PM, Jacob Wisor wrote: > > "Jacob Wisor" wrote: > >> Hello! > >> > >> Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. > >> > >> Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just > > agree > > >> redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. > >> > >> Happy reviewing! > >> Jacob > > > > Sorry, the webmailer keeps dropping attachements at random... > > > Hi! The patch looks ok, however I'm in doubts whether this quite complex solution is necessary. > What I have in mind is: > 1) Does .old file exists? If yes, delete it. (if it is directory then... ??? :)) I think we can > ignore this case. If Deletion failed, warn user and log exception(if none, then jsut some stderr > stuff) (there would be nice some better error reporting - in comamndline mode[1] just print > exception, whether in gui[2] mode also show dialogue, but do not throw exception out - but it is > probably work for different changeset) Right, deployment.properties.old can be deleted right away. I wanted to make sure that the backup file is also safe until the "renaming operation" is complete. This kind of mimiks the renaming semantics as originally intended. > 2)Rename current properties to .old - if it failed - again warn, but do not fail - maybe ask the > user to continue - not continue (in gui mode). > 3) save new properties - if this failed - then this is the only reason for fatal exception imho. I am not sure whether I understand you correctly. The proposed solution only fails when the properties file can not be backed up and though the application keeps on running, the settings do not get saved. Yeah, there probably should be just a notice on stderr or the UI. In any case, the application should keep on running as this seems to me to be the expected intuitive behavior. So, I would rather keep the user unbothered, since he/she can close the application at any time or keep on running anyway. > What do you think? > > If you agree, then for now only the parts without the "user interactions" are worthy. But of course > if you are wiling to fix also the interaction then we will be more then happy (but please as > different changeset) > > Thank you for checking this! > > J. > > > [1] > http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java > [2] > http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thank you for the guiding references. Jacob From ptisnovs at icedtea.classpath.org Tue May 14 01:46:22 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 14 May 2013 08:46:22 +0000 Subject: /hg/gfx-test: Added new tests into test cases ClippingCircleByCo... Message-ID: changeset 16cbf1722b43 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=16cbf1722b43 author: Pavel Tisnovsky date: Tue May 14 10:49:47 2013 +0200 Added new tests into test cases ClippingCircleByConcavePolygonalShape and ClippingCircleByConvexPolygonalShape. diffstat: ChangeLog | 7 + src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java | 66 +++++++ src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java | 90 ++++++++++ 3 files changed, 163 insertions(+), 0 deletions(-) diffs (190 lines): diff -r 57c4b42782cb -r 16cbf1722b43 ChangeLog --- a/ChangeLog Mon May 13 09:54:53 2013 +0200 +++ b/ChangeLog Tue May 14 10:49:47 2013 +0200 @@ -1,3 +1,10 @@ +2013-05-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java: + * src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java: + Added new tests into test cases ClippingCircleByConcavePolygonalShape + and ClippingCircleByConvexPolygonalShape. + 2013-05-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r 57c4b42782cb -r 16cbf1722b43 src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java Mon May 13 09:54:53 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java Tue May 14 10:49:47 2013 +0200 @@ -1523,6 +1523,72 @@ } /** + * Check if circle shape could be clipped by a concave polygonal shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeRGB4TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip polygon which is used as a base for clip shape + CommonClippingOperations.renderConcaveClipPolygon(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture4(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByPolygonalShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a concave polygonal shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeRGB5TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip polygon which is used as a base for clip shape + CommonClippingOperations.renderConcaveClipPolygon(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture5(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByPolygonalShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a concave polygonal shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeRGB6TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip polygon which is used as a base for clip shape + CommonClippingOperations.renderConcaveClipPolygon(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture6(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByPolygonalShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args diff -r 57c4b42782cb -r 16cbf1722b43 src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Mon May 13 09:54:53 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Tue May 14 10:49:47 2013 +0200 @@ -430,6 +430,96 @@ /** * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with black color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintBlack000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 0% transparency + drawCircleClippedByPolygonalShapeAlphaPaintBlack(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with black color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintBlack025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 25% transparency + drawCircleClippedByPolygonalShapeAlphaPaintBlack(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with black color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintBlack050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 50% transparency + drawCircleClippedByPolygonalShapeAlphaPaintBlack(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with black color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintBlack075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 75% transparency + drawCircleClippedByPolygonalShapeAlphaPaintBlack(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with black color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintBlack100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 100% transparency + drawCircleClippedByPolygonalShapeAlphaPaintBlack(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is * rendered using alpha paint with red color at 0% transparency. * * @param image From ptisnovs at icedtea.classpath.org Tue May 14 02:06:29 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 14 May 2013 09:06:29 +0000 Subject: /hg/rhino-tests: Updated four tests in CompiledScriptClassTest f... Message-ID: changeset deea398a4d3c in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=deea398a4d3c author: Pavel Tisnovsky date: Tue May 14 11:09:57 2013 +0200 Updated four tests in CompiledScriptClassTest for (Open)JDK8 API: getMethod, getDeclaredMethod, getMethods and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/CompiledScriptClassTest.java | 100 +++++++++++++++++++++++- 2 files changed, 102 insertions(+), 4 deletions(-) diffs (158 lines): diff -r a572cad21e85 -r deea398a4d3c ChangeLog --- a/ChangeLog Mon May 13 09:38:58 2013 +0200 +++ b/ChangeLog Tue May 14 11:09:57 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-14 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Updated four tests in CompiledScriptClassTest for (Open)JDK8 API: + getMethod, getDeclaredMethod, getMethods and getDeclaredMethods. + 2013-05-13 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r a572cad21e85 -r deea398a4d3c src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Mon May 13 09:38:58 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Tue May 14 11:09:57 2013 +0200 @@ -714,6 +714,22 @@ "public native int java.lang.Object.hashCode()", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()", + "public boolean java.lang.Object.equals(java.lang.Object)", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException", + "public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException", + "public java.lang.String java.lang.Object.toString()", + "public native int java.lang.Object.hashCode()", + }; + // get all inherited methods Method[] methods = this.compiledScriptClass.getMethods(); // and transform the array into a list of method names @@ -721,7 +737,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -748,6 +777,13 @@ "public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()", + "public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException", + "public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException", + }; + // get all declared methods Method[] declaredMethods = this.compiledScriptClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -755,7 +791,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -798,7 +847,33 @@ methodsThatShouldExist_jdk7.put("notify", new Class[] {}); methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {}); + methodsThatShouldExist_jdk8.put("getEngine", new Class[] {}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -836,7 +911,24 @@ methodsThatShouldExist_jdk7.put("eval", new Class[] {javax.script.ScriptContext.class}); methodsThatShouldExist_jdk7.put("getEngine", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {}); + methodsThatShouldExist_jdk8.put("getEngine", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From jvanek at icedtea.classpath.org Tue May 14 03:34:21 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 14 May 2013 10:34:21 +0000 Subject: /hg/icedtea-web: netx/net/sourceforge/jnlp/resources/Messages.pr... Message-ID: changeset c2bfa83611c1 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c2bfa83611c1 author: Jiri Vanek date: Tue May 14 12:34:44 2013 +0200 netx/net/sourceforge/jnlp/resources/Messages.properties: (CPJVMitwExec)fixed invalid unicode character diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 9f2d8381f5f1 -r c2bfa83611c1 ChangeLog --- a/ChangeLog Fri May 03 16:17:08 2013 +0200 +++ b/ChangeLog Tue May 14 12:34:44 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-14 Jiri Vanek + Jacob Wisor + + * netx/net/sourceforge/jnlp/resources/Messages.properties: (CPJVMitwExec) + fixed invalid unicode character + 2013-05-02 Jana Fabrikova * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html: diff -r 9f2d8381f5f1 -r c2bfa83611c1 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri May 03 16:17:08 2013 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue May 14 12:34:44 2013 +0200 @@ -313,7 +313,7 @@ CPDebuggingDescription=Enable options here to help with debugging CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut. CPJVMPluginArguments=Set JVM arguments for plugin. -CPJVMitwExec=Set JVM for IcedTea-Web ??? working best with OpenJDK +CPJVMitwExec=Set JVM for IcedTea-Web \u2014 working best with OpenJDK CPJVMitwExecValidation=Validate JVM for IcedTea-Web CPJVMPluginSelectExec=Browse for JVM for IcedTea-Web CPJVMnone=No validation result for From jvanek at icedtea.classpath.org Tue May 14 03:34:57 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 14 May 2013 10:34:57 +0000 Subject: /hg/release/icedtea-web-1.4: netx/net/sourceforge/jnlp/resources... Message-ID: changeset 1f0a74a79909 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=1f0a74a79909 author: Jiri Vanek date: Tue May 14 12:35:26 2013 +0200 netx/net/sourceforge/jnlp/resources/Messages.properties: (CPJVMitwExec)fixed invalid unicode character diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 05e9ef808ffa -r 1f0a74a79909 ChangeLog --- a/ChangeLog Sat May 04 13:10:05 2013 +0200 +++ b/ChangeLog Tue May 14 12:35:26 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-14 Jiri Vanek + Jacob Wisor + + * netx/net/sourceforge/jnlp/resources/Messages.properties: (CPJVMitwExec) + fixed invalid unicode character + 2013-05-04 Jiri Vanek Prepared for 1.4.1 diff -r 05e9ef808ffa -r 1f0a74a79909 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Sat May 04 13:10:05 2013 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue May 14 12:35:26 2013 +0200 @@ -313,7 +313,7 @@ CPDebuggingDescription=Enable options here to help with debugging CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut. CPJVMPluginArguments=Set JVM arguments for plugin. -CPJVMitwExec=Set JVM for IcedTea-Web ??? working best with OpenJDK +CPJVMitwExec=Set JVM for IcedTea-Web \u2014 working best with OpenJDK CPJVMitwExecValidation=Validate JVM for IcedTea-Web CPJVMPluginSelectExec=Browse for JVM for IcedTea-Web CPJVMnone=No validation result for From jvanek at redhat.com Tue May 14 03:38:07 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 14 May 2013 12:38:07 +0200 Subject: [fyi] [icedtea-web] fixing not-escaped delimiter In-Reply-To: <201305131836.r4DIamA9010403@mail-web03.excite.co.jp> References: <201305131836.r4DIamA9010403@mail-web03.excite.co.jp> Message-ID: <5192140F.80809@redhat.com> On 05/13/2013 08:36 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 05/13/2013 07:17 PM, Jacob Wisor wrote: >>> "Jiri Vanek" wrote: >>>> Hi All >>>> >>>> Adam have noted wrong properties message: http://i.imgur.com/SyFaxDV.png >>>> Which is caused by not escaped character. Here is simple fix for this. >>>> >>>> Applicable for head and 1.4 >>>> >>>> Sorry for this >>>> J. >>> >>> I would rather propose this. >> >> I do not see the difference between those two chars :) > > The difference is that - is a hyphen minus and is reserved for arithmetic operations, whereas \u2014 is an Em dash and is reserved for flowing text. The hyphen minus The En dash (\u2013) can be ruled out, because its primary use is to denote ranges. Well, I know the theoretical difference. The issue (inside me) is that I can not see the real difference/usefulness. anyway - nvm - its me who is bugged here :) > >> Feel free to push! > > Could you do it, please? I have not had the time for bothering with keys and revision repository access yet. > Thank you! Np, thank YOU! pushed both to head an 1.4 J. From jvanek at redhat.com Tue May 14 07:39:39 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 14 May 2013 16:39:39 +0200 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties onsome OSs In-Reply-To: <201305132134.r4DLYIeR010093@mail-web02.excite.co.jp> References: <201305132134.r4DLYIeR010093@mail-web02.excite.co.jp> Message-ID: <51924CAB.8020405@redhat.com> On 05/13/2013 11:34 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 05/07/2013 05:50 PM, Jacob Wisor wrote: >>> "Jacob Wisor" wrote: >>>> Hello! >>>> >>>> Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. It is not just for Windows, this is clearly badly done in ITW:( >>>> >>>> Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just >> >> agree >> >>>> redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. >>>> >>>> Happy reviewing! >>>> Jacob >>> >>> Sorry, the webmailer keeps dropping attachements at random... >>> >> Hi! The patch looks ok, however I'm in doubts whether this quite complex solution is necessary. >> What I have in mind is: >> 1) Does .old file exists? If yes, delete it. (if it is directory then... ??? :)) I think we can >> ignore this case. If Deletion failed, warn user and log exception(if none, then jsut some stderr >> stuff) (there would be nice some better error reporting - in comamndline mode[1] just print >> exception, whether in gui[2] mode also show dialogue, but do not throw exception out - but it is >> probably work for different changeset) > > Right, deployment.properties.old can be deleted right away. I wanted to make sure that the backup file is also safe until the "renaming operation" is complete. This kind of mimiks the renaming semantics as originally intended. > >> 2)Rename current properties to .old - if it failed - again warn, but do not fail - maybe ask the >> user to continue - not continue (in gui mode). >> 3) save new properties - if this failed - then this is the only reason for fatal exception imho. > I should wrote "fatal" - classical IO exception which will become some WarningDialogue popup later. > I am not sure whether I understand you correctly. The proposed solution only Yah and I'm afraid it should not. Some warning is enough. The exception which bubble out is to strong (as the save can still work). > fails when the properties file can not be backed up and though the application keeps on running, the settings do not get saved. > Yeah, there probably should be just a notice on stderr or the UI. In any case, the application should keep on running as this seems to me to be the expected intuitive behavior. > So, I would rather keep the user unbothered, since he/she can And stay unwarned that his/her saving failed? > close the application at any time or keep on running anyway. Well I do not like the "to much dependence on backup" You approach is very nice (and by concept maybe best) with its effort to keep old properties in all costs. Even for cost of complexity. However I'm for less complexity in cost that the backup can fail. See my attached patch, but I got trapped by file.canWrite() being less multiplatform then I hoped. (But even without the nasty isDirectoryWriteable it shows more precisely what I had in mind) Also see my splitting to static function with parameter - it is necessary for testing, and unittests will be the necessary part of this commit [1]. Also see the moved : FileUtils.createParentDir(userPropertiesFile); line. Imho very necessary. What is most discussable are all the new System.err. Probably we can live with them now, but for gui mode there would be nice (in most cases) to have an "blah blah... Do you want to continue?" dialogue. Feel free to disagree. I'm moreover just on doubts. > >> What do you think? >> >> If you agree, then for now only the parts without the "user interactions" are worthy. But of course >> if you are wiling to fix also the interaction then we will be more then happy (but please as >> different changeset) >> >> Thank you for checking this! >> >> J. >> >> >> [1] >> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java >> [2] >> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java > > Thank you for the guiding references. > Best regards, J. [1] http://icedtea.classpath.org/wiki/CommitPolicy : "IcedTea-Web code changes/new feature should be accompanied with appropriate tests (JUnit class and/or reproducer). If no tests are added/modified, changes should be accompanied with an explanation as to why. " -------------- next part -------------- A non-text attachment was scrubbed... Name: Fix of backup of deployment.properties on some OSs-2.patch Type: text/x-patch Size: 5515 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130514/bacfdce3/Fixofbackupofdeployment.propertiesonsomeOSs-2.patch From doko at ubuntu.com Tue May 14 09:13:41 2013 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 14 May 2013 18:13:41 +0200 Subject: [icedtea-web][patch] Fix javaws shebang Message-ID: <519262B5.9050204@ubuntu.com> javaws apparently now uses bash extensions, so fix the shebang too. Should go to the 1.4 branch and the trunk. Matthias -------------- next part -------------- * launcher/javaws.in: Use bash as shebang. Index: b/launcher/javaws.in =================================================================== --- a/launcher/javaws.in +++ b/launcher/javaws.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ From adomurad at redhat.com Tue May 14 10:07:35 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 14 May 2013 13:07:35 -0400 Subject: [icedtea-web][patch] Fix javaws shebang In-Reply-To: <519262B5.9050204@ubuntu.com> References: <519262B5.9050204@ubuntu.com> Message-ID: <51926F57.8070303@redhat.com> On 05/14/2013 12:13 PM, Matthias Klose wrote: > javaws apparently now uses bash extensions, so fix the shebang too. Should go to > the 1.4 branch and the trunk. > > Matthias > Thanks, approved & will push. -Adam From adomurad at icedtea.classpath.org Tue May 14 10:27:36 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 14 May 2013 17:27:36 +0000 Subject: /hg/release/icedtea-web-1.4: Use bash as shebang in javaws.in. Message-ID: changeset 8f13202ea201 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=8f13202ea201 author: Matthias Klose date: Tue May 14 13:28:09 2013 -0400 Use bash as shebang in javaws.in. diffstat: ChangeLog | 4 ++++ launcher/javaws.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 1f0a74a79909 -r 8f13202ea201 ChangeLog --- a/ChangeLog Tue May 14 12:35:26 2013 +0200 +++ b/ChangeLog Tue May 14 13:28:09 2013 -0400 @@ -1,3 +1,7 @@ +2013-05-14 Matthias Klose + + * launcher/javaws.in: Use bash as shebang. + 2013-05-14 Jiri Vanek Jacob Wisor diff -r 1f0a74a79909 -r 8f13202ea201 launcher/javaws.in --- a/launcher/javaws.in Tue May 14 12:35:26 2013 +0200 +++ b/launcher/javaws.in Tue May 14 13:28:09 2013 -0400 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ From adomurad at icedtea.classpath.org Tue May 14 10:34:49 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 14 May 2013 17:34:49 +0000 Subject: /hg/icedtea-web: Use bash as shebang in javaws.in. Message-ID: changeset 2041db60cd4b in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2041db60cd4b author: Matthias Klose date: Tue May 14 13:28:09 2013 -0400 Use bash as shebang in javaws.in. diffstat: ChangeLog | 4 ++++ launcher/javaws.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (20 lines): diff -r c2bfa83611c1 -r 2041db60cd4b ChangeLog --- a/ChangeLog Tue May 14 12:34:44 2013 +0200 +++ b/ChangeLog Tue May 14 13:28:09 2013 -0400 @@ -1,3 +1,7 @@ +2013-05-14 Matthias Klose + + * launcher/javaws.in: Use bash as shebang. + 2013-05-14 Jiri Vanek Jacob Wisor diff -r c2bfa83611c1 -r 2041db60cd4b launcher/javaws.in --- a/launcher/javaws.in Tue May 14 12:34:44 2013 +0200 +++ b/launcher/javaws.in Tue May 14 13:28:09 2013 -0400 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ From gitne at excite.co.jp Tue May 14 10:48:13 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 15 May 2013 02:48:13 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBGaXggb2YgYmFja3VwIG9mIGRlcGxveW1lbnQucHJvcGVydGllcyBvbnNvbWVPU3M=?= Message-ID: <201305141748.r4EHmDjN022992@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 05/13/2013 11:34 PM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> On 05/07/2013 05:50 PM, Jacob Wisor wrote: > >>> "Jacob Wisor" wrote: > >>>> Hello! > >>>> > >>>> Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. > > It is not just for Windows, this is clearly badly done in ITW:( > > >>>> > >>>> Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just > >> > >> agree > >> > >>>> redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. > >>>> > >>>> Happy reviewing! > >>>> Jacob > >>> > >>> Sorry, the webmailer keeps dropping attachements at random... > >>> > >> Hi! The patch looks ok, however I'm in doubts whether this quite complex solution is necessary. > >> What I have in mind is: > >> 1) Does .old file exists? If yes, delete it. (if it is directory then... ??? :)) I think we can > >> ignore this case. If Deletion failed, warn user and log exception(if none, then jsut some stderr > >> stuff) (there would be nice some better error reporting - in comamndline mode[1] just print > >> exception, whether in gui[2] mode also show dialogue, but do not throw exception out - but it is > >> probably work for different changeset) > > > > Right, deployment.properties.old can be deleted right away. I wanted to make sure that the backup file is also safe until the "renaming operation" is complete. This kind of mimiks the renaming semantics as originally intended. > > > >> 2)Rename current properties to .old - if it failed - again warn, but do not fail - maybe ask the > >> user to continue - not continue (in gui mode). > >> 3) save new properties - if this failed - then this is the only reason for fatal exception imho. > > > > I should wrote "fatal" - classical IO exception which will become some WarningDialogue popup later. > > > I am not sure whether I understand you correctly. The proposed solution only > > Yah and I'm afraid it should not. Some warning is enough. The exception which bubble out is to > strong (as the save can still work). > > > fails when the properties file can not be backed up and though the application keeps on running, > the settings do not get saved. > > Yeah, there probably should be just a notice on stderr or the UI. In any case, the application should keep on running as this seems to me to be the expected intuitive behavior. > > So, I would rather keep the user unbothered, since he/she can > > And stay unwarned that his/her saving failed? No, that is what I actually meant by "keep the application running and not to bother the user": warn the user, but do not ask to quit or keep running. An info message box should warn the user about either being unable to save modifications to the config or backup the config. > > close the application at any time or keep on running anyway. > > Well I do not like the "to much dependence on backup" There is no dependency on backing up the config. As long as the the current config can be saved everything is fine, even in the event of the little flaw that the old config can not be backed up. ;-) > You approach is very nice (and by concept maybe best) with its effort to keep old properties in all > costs. Even for cost of complexity. > > However I'm for less complexity in cost that the backup can fail. You call this patch less complex? :-D No, but seriously. This seems to be getting out of hand. Nevertheless, I have commented on your patch. > See my attached patch, but I got trapped by file.canWrite() being less multiplatform then I hoped. > (But even without the nasty isDirectoryWriteable it shows more precisely what I had in mind) > Also see my splitting to static function with parameter - it is necessary for testing, and unittests > will be the necessary part of this commit [1]. Also see the moved : > > FileUtils.createParentDir(userPropertiesFile); > > line. Imho very necessary. Agreed, this is definitly correct (or was a bug). I missed it the first time too. This suffices to call for an update/patch. > What is most discussable are all the new System.err. Probably we can live with them now, but for gui > mode there would be nice (in most cases) to have an "blah blah... Do you want to continue?" dialogue. > > Feel free to disagree. I'm moreover just on doubts. > > > > >> What do you think? > >> > >> If you agree, then for now only the parts without the "user interactions" are worthy. But of course > >> if you are wiling to fix also the interaction then we will be more then happy (but please as > >> different changeset) > >> > >> Thank you for checking this! > >> > >> J. > >> > >> > >> [1] > >> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java > >> [2] > >> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java > > > > Thank you for the guiding references. > > > > Best regards, > J. > > [1] http://icedtea.classpath.org/wiki/CommitPolicy : "IcedTea-Web code changes/new feature should be > accompanied with appropriate tests (JUnit class and/or reproducer). If no tests are added/modified, > changes should be accompanied with an explanation as to why. " /** + * Backups current + * deployment.properties file. This elaborate scheme is + * necessary to handle OSs that do not allow to overwrite while renaming or + * moving onto an existing file. + */ + private boolean backupPropertiesFile() throws IOException { + return backupFile(userPropertiesFile); This is rather redundant. A supposed replacement by a static method for backing up files should be placed in FileUtils. + } + + /** + * Backups current given file. This elaborate scheme is necessary to handle + * OSs that do not allow to overwrite while renaming or moving onto an + * existing file. + */ + //package private for testing + static boolean backupFile(File f) throws IOException { This method should definitely be moved to FileUtils, since it provides general-purpose functionality. There is no use for declaring this method throwing an IOException. + //do all this madnes only if there is something to backup madnes -> madness + if (f.isFile()) { Please do check the method's parameters for validity before first use and throw an IllegalArgumentException if invalid, or catch a possible NullPointerException on the first use and chain it to an IllegalArgumentException. A simple null check should be enough in this case. + File backupPropertiesFile = new File(f.getAbsolutePath() + ".old"); + //if old backup exists, remove it - some OSs do not suport later renaming to suport -> support Btw, does a backup have to be /old/? :-D + //already existing file + if (backupPropertiesFile.isFile()) { + boolean success = backupPropertiesFile.delete(); The local variable "success" has no real meaning and any further use. Drop it, please. Besides, "success" is a quite meaningless term. + if (!success) { + System.err.println("There was an error deleting " + backupPropertiesFile + ". Backup may not be possible and future operations may fail"); Please load these messages from resources and use simple English: "Can not backup , because can not be deleted." + } + } + if (backupPropertiesFile.isDirectory()) { + System.err.println("The file used for backuping is directory - " + backupPropertiesFile + ". Buckup will not be possible and future operations will fail"); + } This if-block is unnecessary and can be dropped, because by issuing File.isFile() we have already checked whether the backup file exists and is indeed a normal file. + // Try to rename current file to file.old (which is not supposed to exists now) + boolean success = f.renameTo(backupPropertiesFile); Please get rid of the meaningless local variable "success". + if (!success) { + System.err.println("Error to backup " + f + " to " + backupPropertiesFile); Please load these messages from resources. + } + return success; Use "return true" instead for better readability and performance, see above. + } else { + File parent = f.getAbsoluteFile().getParentFile(); + if (parent != null) { + return isDirectoryWriteable(parent); isDirectoryWriteable -> isDirectoryWritable + } else { + return false; + } I am sorry, but I do not understand the reasoning behind this. Why should a check be performed on the backed up file's parent directory - whether it is writable - when the file to be backed up does not exist or is a directory? Besides, what does the return value "true" mean when the non-existent file's parent directory or directory being backed up is writable but still has not been backed up? If "f" does not exist or is a directory simply return "false", because there is nothing that can be done anyway. If you want to handle backup of files and directories in one method, then please provide additional code to backup directories too, otherwise it should be split into e.g. backupFile(File) and backupDirectory(File). + } + } + + //package private for testing, probably candindate to FileUtils class + static boolean isDirectoryWriteable(final File f) throws IOException { + if (!f.isDirectory()) { Check "f" for "null" before first dereferencing. + throw new IOException(f + " have to be directory"); Throw rather IllegalArgumentException than IOException since no I/O operation has been actually done. Please note also, that File.isDirectory() tests for existence as well, hence isDirectoryWritable() is going to have a misleading or incorrect semantics when "f" denotes a non-existent directory. + } + File ff = null; + try { + File.createTempFile("itw", "isDirWriteable", f); + if (ff != null && ff.exists()) { At what point should "ff" become non-null? Besides, "ff" is a meaningless and cryptic name for a variable. Please use longer expressive and descriptive variable names. It ain't K&R C anymore! ;-) + return true; + } else { + return false; + } + } catch (IOException ex) { + if (JNLPRuntime.isDebug()) { + ex.printStackTrace(); + } + return false; + } finally { + if (ff != null && ff.exists()) { + boolean deleted = ff.delete(); ///die silently? + if (JNLPRuntime.isDebug() && !deleted) { + System.err.println("can not delete just created tmp file " + ff.getAbsolutePath()); + } + } + } + } After all, I am not convinced that this is a suitable way to test a directory for being writable. I also do not fully understand why it is actually needed right now. This should be enough nitpicking for now. Thank you for taking a look into this problem. I was supposed to offer a revised patch based on my first proposal, but I am unsure how to proceed next. Should I still propose my revise version. Regards, Jacob From gitne at excite.co.jp Tue May 14 11:01:35 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 15 May 2013 03:01:35 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcGF0Y2hdIEZpeCBqYXZhd3Mgc2hlYmFuZw==?= Message-ID: <201305141801.r4EI1ZJd023383@mail-web03.excite.co.jp> "Matthias Klose" wrote: > javaws apparently now uses bash extensions, so fix the shebang too. Should go to > the 1.4 branch and the trunk. > > Matthias -#!/bin/sh +#!/bin/bash Is this really the desired behavior? Please correct me if I am wrong, but /bin/sh is usually a symlink to an arbitrary command shell. Would not it be more suitable to remove or work around those specific bash extensions instead? bash can not be taken for granted on every OS. Regards, Jacob From gitne at excite.co.jp Tue May 14 13:11:52 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 15 May 2013 05:11:52 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXSBpdHdlYi1zZXR0aW5ncyBsYXVuY2hlciBkb2VzIG5vdCBhY2NlcHQgLUogc3dpdGNoIHRvIHBhc3MgYXJncyB0byBKVk0=?= Message-ID: <201305142011.r4EKBqXG021917@mail-web02.excite.co.jp> Hello there! The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. Regards, Jacob From adomurad at redhat.com Tue May 14 13:32:25 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 14 May 2013 16:32:25 -0400 Subject: [icedtea-web] itweb-settings launcher does not accept -J switch to pass args to JVM In-Reply-To: <201305142011.r4EKBqXG021917@mail-web02.excite.co.jp> References: <201305142011.r4EKBqXG021917@mail-web02.excite.co.jp> Message-ID: <51929F59.1050708@redhat.com> On 05/14/2013 04:11 PM, Jacob Wisor wrote: > Hello there! > > The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. What sort of parameters could you possibly require ? It's a very simple application. If you're doing something this oddball it isn't too much of a stretch that you edit the shell script itself. As for javaws having it, I believe this is part of the spec. > > Regards, > Jacob Thanks, -Adam From adomurad at redhat.com Tue May 14 13:49:35 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 14 May 2013 16:49:35 -0400 Subject: [rfc][icedtea-web] Fix PR854: Resizing an applet several times causes 100% CPU load Message-ID: <5192A35F.7040200@redhat.com> Nasty bug with a simple fix. This has been reported since icedtea-web 1.1 See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854. The reproducer is very easy to set up. Placing a print statement reveals that after two resize's, all of icedtea-web's worker threads are busy. The waiting before was too fragile it seems. The version in the patch shouldn't dead-lock in any code-path. Everything works as expected with this patch (there really is no possible harm, too). This should go into any branches that will be released again, IMHO. From the bug comments it seems this is quite a visible issue. Thanks, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: Fix-PR854.patch Type: text/x-patch Size: 1488 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130514/5de7a87d/Fix-PR854.patch From gitne at excite.co.jp Tue May 14 16:52:18 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 15 May 2013 08:52:18 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gaXR3ZWItc2V0dGluZ3MgbGF1bmNoZXIgZG9lcyBub3QgYWNjZXB0IC1KIHN3aXRjaCB0byBwYXNzIGFyZ3MgdG8gSlZN?= Message-ID: <201305142352.r4ENqIvW029989@mail-web01.excite.co.jp> "Adam Domurad" wrote: > On 05/14/2013 04:11 PM, Jacob Wisor wrote: > > Hello there! > > > > The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. > > What sort of parameters could you possibly require ? It's a very simple > application. > If you're doing something this oddball it isn't too much of a stretch > that you edit the shell script itself. Well, for example setting system properties with the -D switch is a common practice or some specific JVM switches that may be required on some configurations. Sure, administrators could edit the launch script, but it has become quite complex by now and administrators would need to waste time on adding this functionaliy while it is virtually identical to javaws launcher's in that respect. Would not it be nice, if life were easy and tools simply stuck to the "convention" to help users get thier jobs done? ;-) Although the -J switch is not required by spec, it probably would be good to interpret it as a convention. > As for javaws having it, I believe this is part of the spec. That is true. Nevertheless, itweb-settings is a proxy tool and as for such, it would not hurt or maybe even help users to have that functionality provided. All I am asking is, whether it would make sense to invest the time and effort to get it done, so that it is probably going to finds its way into the repository, or whether there are any objections. Regards, Jacob From gitne at excite.co.jp Tue May 14 19:02:14 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 15 May 2013 11:02:14 +0900 Subject: =?ISO-2022-JP?B?W2ljZWR0ZWEtd2ViXVtyZmNdIEFkZGVkIGRlIGxvY2FsaXplZCBtYW4gcGFnZSBmb3IgamF2YXdz?= Message-ID: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> Hi! I have added a de localized man page for javaws and moved the source man page to netx/man folder resembling a usual target subfolder structure. Happy reviewing! Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: Add de localized man page.patch Type: text/x-patch Size: 9229 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/5e8bdc9e/ISO-2022-JPBQWRkIGRlIGxvY2FsaXplZCBtYW4gcGFnZS5wYXRjaA.patch From bugzilla-daemon at icedtea.classpath.org Tue May 14 20:16:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 03:16:29 +0000 Subject: [Bug 1433] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1433 Lang changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|Caciocavallo |JamVM Version|unspecified |6-1.0 Assignee|neugens at limasoftware.net |xerxes at zafena.se Product|Caciocavallo |IcedTea Target Milestone|--- |6-1.7.1 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/02320e3f/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 14 20:18:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 03:18:13 +0000 Subject: [Bug 1433] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1433 Lang changed: What |Removed |Added ---------------------------------------------------------------------------- Component|JamVM |IcedTea Version|6-1.0 |6-1.7 Assignee|xerxes at zafena.se |gnu.andrew at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/b86380aa/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 14 22:55:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 05:55:12 +0000 Subject: [Bug 1433] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1433 Lang changed: What |Removed |Added ---------------------------------------------------------------------------- Version|6-1.7 |6-1.7.4 Target Milestone|6-1.7.1 |6-1.7.4 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/cc8406d3/attachment.html From ptisnovs at icedtea.classpath.org Wed May 15 00:36:03 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 15 May 2013 07:36:03 +0000 Subject: /hg/rhino-tests: Updated four tests in SimpleScriptContextClassT... Message-ID: changeset d99e0391a6af in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d99e0391a6af author: Pavel Tisnovsky date: Wed May 15 09:39:26 2013 +0200 Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 + src/org/RhinoTests/SimpleScriptContextClassTest.java | 76 ++++++++++++++++++- 2 files changed, 77 insertions(+), 5 deletions(-) diffs (132 lines): diff -r deea398a4d3c -r d99e0391a6af ChangeLog --- a/ChangeLog Tue May 14 11:09:57 2013 +0200 +++ b/ChangeLog Wed May 15 09:39:26 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-15 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-14 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r deea398a4d3c -r d99e0391a6af src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Tue May 14 11:09:57 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Wed May 15 09:39:26 2013 +0200 @@ -481,7 +481,18 @@ }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.simpleScriptContextClass.getFields(); @@ -501,7 +512,7 @@ * Test for method javax.script.SimpleScriptContext.getClass().getDeclaredFields() */ protected void testGetDeclaredFields() { - // following fields should be declared + // following declared fields should exists final String[] declaredFieldsThatShouldExist_jdk6 = { "protected java.io.Writer javax.script.SimpleScriptContext.writer", "protected java.io.Writer javax.script.SimpleScriptContext.errorWriter", @@ -518,10 +529,29 @@ "protected javax.script.Bindings javax.script.SimpleScriptContext.globalScope", "private static java.util.List javax.script.SimpleScriptContext.scopes", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "protected java.io.Writer javax.script.SimpleScriptContext.writer", + "protected java.io.Writer javax.script.SimpleScriptContext.errorWriter", + "protected java.io.Reader javax.script.SimpleScriptContext.reader", + "protected javax.script.Bindings javax.script.SimpleScriptContext.engineScope", + "protected javax.script.Bindings javax.script.SimpleScriptContext.globalScope", + "private static java.util.List javax.script.SimpleScriptContext.scopes", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.simpleScriptContextClass.getDeclaredFields(); @@ -550,8 +580,23 @@ "ENGINE_SCOPE", "GLOBAL_SCOPE", }; + final String[] fieldsThatShouldExist_jdk8 = { + "ENGINE_SCOPE", + "GLOBAL_SCOPE", + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -589,8 +634,29 @@ "globalScope", "scopes", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "writer", + "errorWriter", + "reader", + "engineScope", + "globalScope", + "scopes", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From ptisnovs at icedtea.classpath.org Wed May 15 00:42:00 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 15 May 2013 07:42:00 +0000 Subject: /hg/gfx-test: Five new tests added into BitBltBasicTests test su... Message-ID: changeset d616b88c89ff in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d616b88c89ff author: Pavel Tisnovsky date: Wed May 15 09:45:29 2013 +0200 Five new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 75 ++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diffs (97 lines): diff -r 16cbf1722b43 -r d616b88c89ff ChangeLog --- a/ChangeLog Tue May 14 10:49:47 2013 +0200 +++ b/ChangeLog Wed May 15 09:45:29 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Five new tests added into BitBltBasicTests test suite. + 2013-05-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByConcavePolygonalShape.java: diff -r 16cbf1722b43 -r d616b88c89ff src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue May 14 10:49:47 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed May 15 09:45:29 2013 +0200 @@ -3974,6 +3974,81 @@ } /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for horizontal blue gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalBlueGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** * Test basic BitBlt operation for vertical blue gradient buffered image * with type TYPE_BYTE_BINARY. * From jvanek at redhat.com Wed May 15 01:41:32 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 10:41:32 +0200 Subject: [icedtea-web] itweb-settings launcher does not accept -J switch to pass args to JVM In-Reply-To: <201305142352.r4ENqIvW029989@mail-web01.excite.co.jp> References: <201305142352.r4ENqIvW029989@mail-web01.excite.co.jp> Message-ID: <51934A3C.8030400@redhat.com> On 05/15/2013 01:52 AM, Jacob Wisor wrote: > "Adam Domurad" wrote: >> On 05/14/2013 04:11 PM, Jacob Wisor wrote: >>> Hello there! >>> >>> The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. >> >> What sort of parameters could you possibly require ? It's a very simple >> application. >> If you're doing something this oddball it isn't too much of a stretch >> that you edit the shell script itself. > > Well, for example setting system properties with the -D switch is a common practice or some specific JVM switches that may be required on some configurations. Sure, administrators could edit the launch script, but it has become quite complex by now and administrators would need to waste time on adding this functionaliy while it is virtually identical to javaws launcher's in that respect. Would not it be nice, if life were easy and tools simply stuck to the "convention" to help users get thier jobs done? ;-) Although the -J switch is not required by spec, it probably would be good to interpret it as a convention. > >> As for javaws having it, I believe this is part of the spec. > > That is true. Nevertheless, itweb-settings is a proxy tool and as for such, it would not hurt or maybe even help users to have that functionality provided. > > All I am asking is, whether it would make sense to invest the time and effort to get it done, so that it is probably going to finds its way into the repository, or whether there are any objections. > > Regards, > Jacob > What about this suggestion - generate both itw and javaws launchers from one template? The only difference is then main class... And itw-settings will just benefit form this... J. From jvanek at redhat.com Wed May 15 01:38:45 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 10:38:45 +0200 Subject: [icedtea-web][patch] Fix javaws shebang In-Reply-To: <201305141801.r4EI1ZJd023383@mail-web03.excite.co.jp> References: <201305141801.r4EI1ZJd023383@mail-web03.excite.co.jp> Message-ID: <51934995.10806@redhat.com> On 05/14/2013 08:01 PM, Jacob Wisor wrote: > "Matthias Klose" wrote: >> javaws apparently now uses bash extensions, so fix the shebang too. Should go to >> the 1.4 branch and the trunk. >> >> Matthias > > -#!/bin/sh > +#!/bin/bash > > Is this really the desired behavior? Please correct me if I am wrong, but /bin/sh is usually a symlink to an arbitrary command shell. Would not it be more suitable to remove or work around those specific bash extensions instead? bash can not be taken for granted on every OS. > > Regards, > Jacob > I agree with Jacob - there should be sh left as it is. J. From jvanek at redhat.com Wed May 15 01:45:35 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 10:45:35 +0200 Subject: [icedtea-web][rfc] Added de localized man page for javaws In-Reply-To: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> References: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> Message-ID: <51934B2F.3000203@redhat.com> On 05/15/2013 04:02 AM, Jacob Wisor wrote: > Hi! > > I have added a de localized man page for javaws and moved the source man page to netx/man folder resembling a usual target subfolder structure. > > Happy reviewing! > Jacob > Ouch.... I'm afraid this was little bit wasted time because of my silence:(( My intention for 1.5 is to generate man pages. As - all the necessary strings are localised (=> no double maintenance) - all parameters are kept in sync in main class. (now they are missing in man page) Some more strings may be added to Messages to have the man pages filled, but still it will less the localisation (and programmers) efforts at the end. I'm sorry for not telling this more specificity publicly earlier :(( J wiki updated. From jvanek at redhat.com Wed May 15 02:59:09 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 11:59:09 +0200 Subject: [rfc][icedtea-web] Fix PR854: Resizing an applet several times causes 100% CPU load In-Reply-To: <5192A35F.7040200@redhat.com> References: <5192A35F.7040200@redhat.com> Message-ID: <51935C6D.3050906@redhat.com> On 05/14/2013 10:49 PM, Adam Domurad wrote: > Nasty bug with a simple fix. This has been reported since icedtea-web 1.1 > > See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854. The reproducer is very easy to set > up. Placing a print statement reveals that after two resize's, all of icedtea-web's worker threads > are busy. > > The waiting before was too fragile it seems. The version in the patch shouldn't dead-lock in any > code-path. Everything works as expected with this patch (there really is no possible harm, too). > > This should go into any branches that will be released again, IMHO. From the bug comments it seems > this is quite a visible issue. > > Thanks, > -Adam This is nice! Please accompany this with automated reproducer and go on. ok for head and 1.4 J. From jvanek at redhat.com Wed May 15 03:04:35 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 12:04:35 +0200 Subject: /hg/icedtea-web: Use bash as shebang in javaws.in. In-Reply-To: References: Message-ID: <51935DB3.2060601@redhat.com> On 05/14/2013 07:34 PM, adomurad at icedtea.classpath.org wrote: > changeset 2041db60cd4b in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2041db60cd4b > author: Matthias Klose > date: Tue May 14 13:28:09 2013 -0400 > > Use bash as shebang in javaws.in. > > > diffstat: > > ChangeLog | 4 ++++ > launcher/javaws.in | 2 +- > 2 files changed, 5 insertions(+), 1 deletions(-) > > diffs (20 lines): > > diff -r c2bfa83611c1 -r 2041db60cd4b ChangeLog > --- a/ChangeLog Tue May 14 12:34:44 2013 +0200 > +++ b/ChangeLog Tue May 14 13:28:09 2013 -0400 > @@ -1,3 +1,7 @@ > +2013-05-14 Matthias Klose > + > + * launcher/javaws.in: Use bash as shebang. > + > 2013-05-14 Jiri Vanek > Jacob Wisor > > diff -r c2bfa83611c1 -r 2041db60cd4b launcher/javaws.in > --- a/launcher/javaws.in Tue May 14 12:34:44 2013 +0200 > +++ b/launcher/javaws.in Tue May 14 13:28:09 2013 -0400 > @@ -1,4 +1,4 @@ > -#!/bin/sh > +#!/bin/bash > > JAVA=@JAVA@ > LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ > After speaking with Doko and Pavel - reverting from head. As true solution is to get rid of bashism in scripts. Pavel promissed to look at it. For 1.4 would be nice to add configure check fo bash but.. . well We can believe bash will be on most of the systems... J. From jvanek at icedtea.classpath.org Wed May 15 03:14:36 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 15 May 2013 10:14:36 +0000 Subject: /hg/icedtea-web: Reverted previous commit "Use bash as shebang i... Message-ID: changeset 1b1e547ccb4a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1b1e547ccb4a author: Jiri Vanek date: Wed May 15 12:14:26 2013 +0200 Reverted previous commit "Use bash as shebang in javaws.in" diffstat: ChangeLog | 4 ---- launcher/javaws.in | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diffs (20 lines): diff -r 2041db60cd4b -r 1b1e547ccb4a ChangeLog --- a/ChangeLog Tue May 14 13:28:09 2013 -0400 +++ b/ChangeLog Wed May 15 12:14:26 2013 +0200 @@ -1,7 +1,3 @@ -2013-05-14 Matthias Klose - - * launcher/javaws.in: Use bash as shebang. - 2013-05-14 Jiri Vanek Jacob Wisor diff -r 2041db60cd4b -r 1b1e547ccb4a launcher/javaws.in --- a/launcher/javaws.in Tue May 14 13:28:09 2013 -0400 +++ b/launcher/javaws.in Wed May 15 12:14:26 2013 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ From jvanek at redhat.com Wed May 15 04:48:56 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 13:48:56 +0200 Subject: [icedtea-web][rfc] Added de localized man page for javaws In-Reply-To: <51934B2F.3000203@redhat.com> References: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> <51934B2F.3000203@redhat.com> Message-ID: <51937628.7070009@redhat.com> On 05/15/2013 10:45 AM, Jiri Vanek wrote: > On 05/15/2013 04:02 AM, Jacob Wisor wrote: >> Hi! >> >> I have added a de localized man page for javaws and moved the source man page to netx/man folder resembling a usual target subfolder structure. >> >> Happy reviewing! >> Jacob >> > Ouch.... I'm afraid this was little bit wasted time because of my silence:(( Not waisted!! Lets push this to 1.4! But part of this should be also patch to makefile so the file will be taken into consideration during make install. Maybe when touching those relicts the nice fix would be updated list of commandline switches. > My intention for 1.5 is to generate man pages. > > As - all the necessary strings are localised (=> no double maintenance) > - all parameters are kept in sync in main class. (now they are missing in man page) > > Some more strings may be added to Messages to have the man pages filled, but still it will less the > localisation (and programmers) efforts at the end. > > I'm sorry for not telling this more specificity publicly earlier :(( > > J > > wiki updated. > From ptisnovs at redhat.com Wed May 15 04:50:17 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 15 May 2013 07:50:17 -0400 (EDT) Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) Message-ID: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> Hi everyone, I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not backport). These tests check the rest of text layout subsystem. FYI: I'm also going to ask for inclusion of these three test into OpenJDK8 HEAD and then backporting them into OpenJDK7 too. Mercurial diff created against IcedTea6 HEAD is stored in an attachment. ChangeLog entry: 2013-05-15 Pavel Tisnovsky * Makefile.am: (ICEDTEA_PATCHES): Added new patch. * patches/textLayoutBoundsChecks.patch: Patch containing three new JTreg tests TextLayoutAscentDescent.java, TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that check the behavior of text layout subsystem. Can anybody please review this change? Thank you in advance, Pavel Tisnovsky -------------- next part -------------- A non-text attachment was scrubbed... Name: hg.diff Type: text/x-patch Size: 6441 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/de2fa920/hg.diff From jvanek at redhat.com Wed May 15 04:56:38 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 13:56:38 +0200 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <5187CA7A.7000100@redhat.com> References: <5187CA7A.7000100@redhat.com> Message-ID: <519377F6.6000709@redhat.com> When applet calls JavaScript function, which calls back to appelt, then *mostly* deadlock occurs. I made several attempts to fix this more generally, but I was unsuccessful. So this "hack" is preventing deadlock, maybe also the timeout can be a bit shorter... Although this is for both head and 1.4, for head some more investigations are needed later. J. ps,reproducer in progress. -------------- next part -------------- A non-text attachment was scrubbed... Name: dirtyFix1.patch Type: text/x-patch Size: 1147 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/eb920a69/dirtyFix1.patch From jvanek at redhat.com Wed May 15 05:11:22 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 14:11:22 +0200 Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) In-Reply-To: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> References: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> Message-ID: <51937B6A.60908@redhat.com> On 05/15/2013 01:50 PM, Pavel Tisnovsky wrote: > Hi everyone, > > I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not backport). > These tests check the rest of text layout subsystem. > > FYI: I'm also going to ask for inclusion of these three test into > OpenJDK8 HEAD and then backporting them into OpenJDK7 too. > > Mercurial diff created against IcedTea6 HEAD is stored in an attachment. > > ChangeLog entry: > 2013-05-15 Pavel Tisnovsky > > * Makefile.am: > (ICEDTEA_PATCHES): Added new patch. > * patches/textLayoutBoundsChecks.patch: > Patch containing three new JTreg tests TextLayoutAscentDescent.java, > TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that > check the behavior of text layout subsystem. > > Can anybody please review this change? > > Thank you in advance, > Pavel Tisnovsky > Looks ok to me, hgowever two nits - it would be nice to have bugid in changelog (test themselves?) to bug it reproduces - I think there is misisng makefile entry. Please post fixed version before push itself. Thank you for this! J. From ptisnovs at redhat.com Wed May 15 05:23:44 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 15 May 2013 08:23:44 -0400 (EDT) Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) In-Reply-To: <51937B6A.60908@redhat.com> References: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> <51937B6A.60908@redhat.com> Message-ID: <1968600339.1113220.1368620624560.JavaMail.root@redhat.com> ----- Jiri Vanek wrote: > On 05/15/2013 01:50 PM, Pavel Tisnovsky wrote: > > Hi everyone, > > > > I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not backport). > > These tests check the rest of text layout subsystem. > > > > FYI: I'm also going to ask for inclusion of these three test into > > OpenJDK8 HEAD and then backporting them into OpenJDK7 too. > > > > Mercurial diff created against IcedTea6 HEAD is stored in an attachment. > > > > ChangeLog entry: > > 2013-05-15 Pavel Tisnovsky > > > > * Makefile.am: > > (ICEDTEA_PATCHES): Added new patch. > > * patches/textLayoutBoundsChecks.patch: > > Patch containing three new JTreg tests TextLayoutAscentDescent.java, > > TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that > > check the behavior of text layout subsystem. > > > > Can anybody please review this change? > > > > Thank you in advance, > > Pavel Tisnovsky > > > > Looks ok to me, hgowever two nits > - it would be nice to have bugid in changelog (test themselves?) to bug it reproduces unfortunately there's not bug ID for those tests. FYI: these tests check the behavior of IT6 after latest security patches are updated, incl. changes made by Roman Kennke and there is not bug# in Oracle DB for this change. > - I think there is misisng makefile entry. doh, you are right, please look at fixed hg.diff Pavel > > Please post fixed version before push itself. > > Thank you for this! > J. -------------- next part -------------- A non-text attachment was scrubbed... Name: hg.diff Type: text/x-patch Size: 6906 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/67b5a30e/hg.diff From jvanek at redhat.com Wed May 15 05:26:52 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 14:26:52 +0200 Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) In-Reply-To: <1968600339.1113220.1368620624560.JavaMail.root@redhat.com> References: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> <51937B6A.60908@redhat.com> <1968600339.1113220.1368620624560.JavaMail.root@redhat.com> Message-ID: <51937F0C.8060308@redhat.com> On 05/15/2013 02:23 PM, Pavel Tisnovsky wrote: > ----- Jiri Vanek wrote: >> On 05/15/2013 01:50 PM, Pavel Tisnovsky wrote: >>> Hi everyone, >>> >>> I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not backport). >>> These tests check the rest of text layout subsystem. >>> >>> FYI: I'm also going to ask for inclusion of these three test into >>> OpenJDK8 HEAD and then backporting them into OpenJDK7 too. >>> >>> Mercurial diff created against IcedTea6 HEAD is stored in an attachment. >>> >>> ChangeLog entry: >>> 2013-05-15 Pavel Tisnovsky >>> >>> * Makefile.am: >>> (ICEDTEA_PATCHES): Added new patch. >>> * patches/textLayoutBoundsChecks.patch: >>> Patch containing three new JTreg tests TextLayoutAscentDescent.java, >>> TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that >>> check the behavior of text layout subsystem. >>> >>> Can anybody please review this change? >>> >>> Thank you in advance, >>> Pavel Tisnovsky >>> >> >> Looks ok to me, hgowever two nits >> - it would be nice to have bugid in changelog (test themselves?) to bug it reproduces > > unfortunately there's not bug ID for those tests. FYI: these tests check the behavior > of IT6 after latest security patches are updated, incl. changes made by Roman Kennke > and there is not bug# in Oracle DB for this change. > >> - I think there is misisng makefile entry. > > doh, you are right, please look at fixed hg.diff > > Pavel > >> >> Please post fixed version before push itself. >> >> Thank you for this! >> J. ok then :( /me missing the bugid J. From jvanek at redhat.com Wed May 15 05:27:16 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 14:27:16 +0200 Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) In-Reply-To: <1968600339.1113220.1368620624560.JavaMail.root@redhat.com> References: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> <51937B6A.60908@redhat.com> <1968600339.1113220.1368620624560.JavaMail.root@redhat.com> Message-ID: <51937F24.6060204@redhat.com> On 05/15/2013 02:23 PM, Pavel Tisnovsky wrote: > ----- Jiri Vanek wrote: >> On 05/15/2013 01:50 PM, Pavel Tisnovsky wrote: >>> Hi everyone, >>> >>> I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not backport). >>> These tests check the rest of text layout subsystem. >>> >>> FYI: I'm also going to ask for inclusion of these three test into >>> OpenJDK8 HEAD and then backporting them into OpenJDK7 too. >>> >>> Mercurial diff created against IcedTea6 HEAD is stored in an attachment. >>> >>> ChangeLog entry: >>> 2013-05-15 Pavel Tisnovsky >>> >>> * Makefile.am: >>> (ICEDTEA_PATCHES): Added new patch. >>> * patches/textLayoutBoundsChecks.patch: >>> Patch containing three new JTreg tests TextLayoutAscentDescent.java, >>> TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that >>> check the behavior of text layout subsystem. >>> >>> Can anybody please review this change? >>> >>> Thank you in advance, >>> Pavel Tisnovsky >>> >> >> Looks ok to me, hgowever two nits >> - it would be nice to have bugid in changelog (test themselves?) to bug it reproduces > > unfortunately there's not bug ID for those tests. FYI: these tests check the behavior > of IT6 after latest security patches are updated, incl. changes made by Roman Kennke > and there is not bug# in Oracle DB for this change. > >> - I think there is misisng makefile entry. > > doh, you are right, please look at fixed hg.diff > > Pavel > >> >> Please post fixed version before push itself. >> >> Thank you for this! >> J. ok then :( /me missing the bugid Good luck with upstram fight! J. From adomurad at redhat.com Wed May 15 06:12:10 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 15 May 2013 09:12:10 -0400 Subject: [icedtea-web][patch] Fix javaws shebang In-Reply-To: <51934995.10806@redhat.com> References: <201305141801.r4EI1ZJd023383@mail-web03.excite.co.jp> <51934995.10806@redhat.com> Message-ID: <519389AA.1020404@redhat.com> On 05/15/2013 04:38 AM, Jiri Vanek wrote: > On 05/14/2013 08:01 PM, Jacob Wisor wrote: >> "Matthias Klose" wrote: >>> javaws apparently now uses bash extensions, so fix the shebang too. Should go to >>> the 1.4 branch and the trunk. >>> >>> Matthias >> -#!/bin/sh >> +#!/bin/bash >> >> Is this really the desired behavior? Please correct me if I am wrong, but /bin/sh is usually a symlink to an arbitrary command shell. Would not it be more suitable to remove or work around those specific bash extensions instead? bash can not be taken for granted on every OS. >> >> Regards, >> Jacob >> > I agree with Jacob - there should be sh left as it is. > > J. > Right -- in that case don't use bash extensions, like Jacob suggested. -Adam From gnu.andrew at redhat.com Wed May 15 07:05:46 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 15 May 2013 10:05:46 -0400 (EDT) Subject: Reviewer needed: three new JTreg tests for IcedTea6 HEAD (text layout subsystem) In-Reply-To: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> References: <76718301.1094478.1368618617710.JavaMail.root@redhat.com> Message-ID: <1206738650.2208605.1368626746195.JavaMail.root@redhat.com> ----- Original Message ----- > Hi everyone, > > I'd like to add three new JTreg tests into IcedTea6 HEAD (it is not > backport). > These tests check the rest of text layout subsystem. > > FYI: I'm also going to ask for inclusion of these three test into > OpenJDK8 HEAD and then backporting them into OpenJDK7 too. > > Mercurial diff created against IcedTea6 HEAD is stored in an attachment. > > ChangeLog entry: > 2013-05-15 Pavel Tisnovsky > > * Makefile.am: > (ICEDTEA_PATCHES): Added new patch. > * patches/textLayoutBoundsChecks.patch: > Patch containing three new JTreg tests TextLayoutAscentDescent.java, > TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that > check the behavior of text layout subsystem. > > Can anybody please review this change? > > Thank you in advance, > Pavel Tisnovsky > I think the patch name should have something in it to represent that these are jtreg tests; just a "jtreg-" prefix would do. I think this is the case for some existing patches. Otherwise, fine. Thanks for this. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From jvanek at redhat.com Wed May 15 07:20:26 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 15 May 2013 16:20:26 +0200 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties onsomeOSs In-Reply-To: <201305141748.r4EHmDjN022992@mail-web03.excite.co.jp> References: <201305141748.r4EHmDjN022992@mail-web03.excite.co.jp> Message-ID: <519399AA.1070909@redhat.com> On 05/14/2013 07:48 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 05/13/2013 11:34 PM, Jacob Wisor wrote: >>> "Jiri Vanek" wrote: >>>> On 05/07/2013 05:50 PM, Jacob Wisor wrote: >>>>> "Jacob Wisor" wrote: >>>>>> Hello! >>>>>> >>>>>> Some OSs (e.g. Windows) or file systems do not allow to overwrite while renaming or moving files. It could also depend on the implementation of java.io.File.renameTo(java.io.File), as its specification leaves open the exact semantics. >> >> It is not just for Windows, this is clearly badly done in ITW:( >> >>>>>> >>>>>> Although the proposed fix is not really elegant, it should work on the majority of systems. Maybe the whole idea of renaming deployment.properties to always have a safe backup is just >>>> >>>> agree >>>> >>>>>> redundant on modern operating and file systems, since most of them feature journaled or transactional file systems, so there should always be a safe copy having integrity available. this sentence ^ is important ;) >>>>>> >>>>>> Happy reviewing! >>>>>> Jacob >>>>> >>>>> Sorry, the webmailer keeps dropping attachements at random... >>>>> >>>> Hi! The patch looks ok, however I'm in doubts whether this quite complex solution is necessary. >>>> What I have in mind is: >>>> 1) Does .old file exists? If yes, delete it. (if it is directory then... ??? :)) I think we can >>>> ignore this case. If Deletion failed, warn user and log exception(if none, then jsut some stderr >>>> stuff) (there would be nice some better error reporting - in comamndline mode[1] just print >>>> exception, whether in gui[2] mode also show dialogue, but do not throw exception out - but it is >>>> probably work for different changeset) >>> >>> Right, deployment.properties.old can be deleted right away. I wanted to make sure that the backup file is also safe until the "renaming operation" is complete. This kind of mimiks the renaming semantics as originally intended. >>> >>>> 2)Rename current properties to .old - if it failed - again warn, but do not fail - maybe ask the >>>> user to continue - not continue (in gui mode). >>>> 3) save new properties - if this failed - then this is the only reason for fatal exception imho. >>> >> >> I should wrote "fatal" - classical IO exception which will become some WarningDialogue popup later. >> >>> I am not sure whether I understand you correctly. The proposed solution only >> >> Yah and I'm afraid it should not. Some warning is enough. The exception which bubble out is to >> strong (as the save can still work). >> >>> fails when the properties file can not be backed up and though the application keeps on running, >> the settings do not get saved. >>> Yeah, there probably should be just a notice on stderr or the UI. In any case, the application should keep on running as this seems to me to be the expected intuitive behavior. >>> So, I would rather keep the user unbothered, since he/she can >> >> And stay unwarned that his/her saving failed? > > No, that is what I actually meant by "keep the application running and not to bother the user": warn the user, but do not ask to quit or keep running. An info message box should warn the user about either being unable to save modifications to the config or backup the config. Well if not to bother uzer, then both IOexception you thrown were incorrect (Am I missing something??). I think That user *should* be warned in gui mode, (and to continue in headless mode). No throwing - this throwing caused to not to save the new properties. > >>> close the application at any time or keep on running anyway. >> >> Well I do not like the "to much dependence on backup" > > There is no dependency on backing up the config. As long as the the current config can be saved everything is fine, even in the event of the little flaw that the old config can not be backed up. ;-) > >> You approach is very nice (and by concept maybe best) with its effort to keep old properties in all >> costs. Even for cost of complexity. >> >> However I'm for less complexity in cost that the backup can fail. > > You call this patch less complex? :-D ehm ..no O:) Sorry As told, I got trapped into "writtable directory" hell. > No, but seriously. This seems to be getting out of hand. Nevertheless, I have commented on your patch. Ouch. My patch was not mentioned to be "patch", or ever to be pushed. It was moreover what I have in mind. I hooped you will simplify your patch to some subset of yopur original good one, and my second "simple and evil" one. > >> See my attached patch, but I got trapped by file.canWrite() being less multiplatform then I hoped. >> (But even without the nasty isDirectoryWriteable it shows more precisely what I had in mind) >> Also see my splitting to static function with parameter - it is necessary for testing, and unittests >> will be the necessary part of this commit [1]. Also see the moved : >> >> FileUtils.createParentDir(userPropertiesFile); >> >> line. Imho very necessary. > > Agreed, this is definitly correct (or was a bug). I missed it the first time too. This suffices to call for an update/patch. goood. > >> What is most discussable are all the new System.err. Probably we can live with them now, but for gui >> mode there would be nice (in most cases) to have an "blah blah... Do you want to continue?" dialogue. >> >> Feel free to disagree. I'm moreover just on doubts. >> >>> >>>> What do you think? >>>> >>>> If you agree, then for now only the parts without the "user interactions" are worthy. But of course >>>> if you are wiling to fix also the interaction then we will be more then happy (but please as >>>> different changeset) >>>> >>>> Thank you for checking this! >>>> >>>> J. >>>> >>>> >>>> [1] >>>> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java >>>> [2] >>>> http://icedtea.classpath.org/hg/icedtea-web/file/9f2d8381f5f1/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java >>> >>> Thank you for the guiding references. >>> >> >> Best regards, >> J. >> >> [1] http://icedtea.classpath.org/wiki/CommitPolicy : "IcedTea-Web code changes/new feature should be >> accompanied with appropriate tests (JUnit class and/or reproducer). If no tests are added/modified, >> changes should be accompanied with an explanation as to why. " > > /** > + * Backups current > + * deployment.properties file. This elaborate scheme is > + * necessary to handle OSs that do not allow to overwrite while renaming or > + * moving onto an existing file. > + */ > + private boolean backupPropertiesFile() throws IOException { > + return backupFile(userPropertiesFile); > > This is rather redundant. A supposed replacement by a static method for backing up files should be placed in FileUtils. Don't think so. Depends on personal feelings l.Feel free to keep or remove. > > + } > + > + /** > + * Backups current given file. This elaborate scheme is necessary to handle > + * OSs that do not allow to overwrite while renaming or moving onto an > + * existing file. > + */ > + //package private for testing > + static boolean backupFile(File f) throws IOException { > > This method should definitely be moved to FileUtils, since it provides general-purpose functionality. > There is no use for declaring this method throwing an IOException. > > + //do all this madnes only if there is something to backup > > madnes -> madness > > + if (f.isFile()) { > > Please do check the method's parameters for validity before first use and throw an IllegalArgumentException if invalid, or catch a possible NullPointerException on the first use and chain it to an IllegalArgumentException. A simple null check should be enough in this case. No - f.isFile() was checking also for existence of this. If there is no *file* to backup, then there is nothing to do. No exception needed. Catching of NPE can have two sharp edges. In this case I'm 100% for et it be thrown. > > + File backupPropertiesFile = new File(f.getAbsolutePath() + ".old"); > + //if old backup exists, remove it - some OSs do not suport later renaming to > > suport -> support > Btw, does a backup have to be /old/? :-D I'm afraid we have to keep the .old due to backward comaptibility :( But the utility method can have parameter holding the suffix. > > + //already existing file > + if (backupPropertiesFile.isFile()) { > + boolean success = backupPropertiesFile.delete(); > > The local variable "success" has no real meaning and any further use. Drop it, please. Besides, "success" is a quite meaningless term. Depend on taste. I like as thin code ass possible == as few commands on line as possible > > + if (!success) { > + System.err.println("There was an error deleting " + backupPropertiesFile + ". Backup may not be possible and future operations may fail"); > > Please load these messages from resources and use simple English: "Can not backup , because can not be deleted." 100% agree. I would do if I ment this as patch and not as idea. And sorry for my english :(. Also I won't to highlight places which maybe deserves attention on gui/headless mode. > > + } > + } > + if (backupPropertiesFile.isDirectory()) { > + System.err.println("The file used for backuping is directory - " + backupPropertiesFile + ". Buckup will not be possible and future operations will fail"); > + } > > This if-block is unnecessary and can be dropped, because by issuing File.isFile() we have already checked whether the backup file exists and is indeed a normal file. True. I added the isFile later. > > + // Try to rename current file to file.old (which is not supposed to exists now) > + boolean success = f.renameTo(backupPropertiesFile); > > Please get rid of the meaningless local variable "success". I really like them :) > > + if (!success) { > + System.err.println("Error to backup " + f + " to " + backupPropertiesFile); > > Please load these messages from resources. > > + } > + return success; > > Use "return true" instead for better readability and performance, see above. there should be else more then anything else. > > + } else { > + File parent = f.getAbsoluteFile().getParentFile(); > + if (parent != null) { > + return isDirectoryWriteable(parent); > > isDirectoryWriteable -> isDirectoryWritable > > + } else { > + return false; > + } > > I am sorry, but I do not understand the reasoning behind this. Why should a check be performed on the backed up file's parent directory - whether it is writable - when the file to be backed up does not exist or is a directory? Besides, what does the return value "true" mean when the non-existent file's parent directory or directory being backed up is writable but still has not been backed up? Definitely is unnecessary burden here. I got into this when I was thinking what this function should return if there is nothing to backup. Probably true is enough :) I wanted to return something mor relvant.. well to much ideas in time probably :) > > If "f" does not exist or is a directory simply return "false", because there is nothing that can be done anyway. If you want to handle backup of files and directories in one method, then please provide additional code to backup directories too, otherwise it should be split into e.g. backupFile(File) and backupDirectory(File). I would like any possible simplification :) > > + } > + } > + > + //package private for testing, probably candindate to FileUtils class > + static boolean isDirectoryWriteable(final File f) throws IOException { > + if (!f.isDirectory()) { > > Check "f" for "null" before first dereferencing. > > + throw new IOException(f + " have to be directory"); > > Throw rather IllegalArgumentException than IOException since no I/O operation has been actually done. Please note also, that File.isDirectory() tests for existence as well, hence isDirectoryWritable() is going to have a misleading or incorrect semantics when "f" denotes a non-existent directory. depends.. Perhaps. I do not insists on IoException. But as there can be alter catch for IOexception from this topic later, I decided for it. nvm > > + } > + File ff = null; > + try { > + File.createTempFile("itw", "isDirWriteable", f); > + if (ff != null && ff.exists()) { > > At what point should "ff" become non-null? Besides, "ff" is a meaningless and cryptic name for a variable. Please use longer expressive and descriptive variable names. It ain't K&R C anymore! ;-) :DDD /me ashamed/ Best would be to abandon whole this terrible check. > > + return true; > + } else { > + return false; > + } > + } catch (IOException ex) { > + if (JNLPRuntime.isDebug()) { > + ex.printStackTrace(); > + } > + return false; > + } finally { > + if (ff != null && ff.exists()) { > + boolean deleted = ff.delete(); ///die silently? > + if (JNLPRuntime.isDebug() && !deleted) { > + System.err.println("can not delete just created tmp file " + ff.getAbsolutePath()); > + } > + } > + } > + } > > After all, I am not convinced that this is a suitable way to test a directory for being writable. I also do not fully understand why it is actually needed right now. What can be best then create and delte file in it? > > This should be enough nitpicking for now. Thank you for taking a look into this problem. I was supposed to offer a revised patch based on my first proposal, but I am unsure how to proceed next. Should I still propose my revise version. Yes! As I told, those were just coded-ideas. Whatever you will manage now will be better then my nasty approach. My points form last time are still valid - make it more simple, - make it unittestable - and add those tests + few nits we foud later. Especially the >> FileUtils.createParentDir(userPropertiesFile); >> line. Imho very necessary. Thanx for checking this! J. Btw will you update the manifest patch? Imho worthy O:) From ptisnovs at icedtea.classpath.org Wed May 15 07:49:44 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 15 May 2013 14:49:44 +0000 Subject: /hg/icedtea6: Added patch containing three new JTreg tests TextL... Message-ID: changeset 29eed3efba72 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=29eed3efba72 author: Pavel Tisnovsky date: Wed May 15 16:48:54 2013 +0200 Added patch containing three new JTreg tests TextLayoutAscentDescent.java, TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that check the behavior of text layout subsystem. diffstat: ChangeLog | 9 + Makefile.am | 3 +- patches/jtreg-TextLayoutBoundsChecks.patch | 150 +++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 1 deletions(-) diffs (183 lines): diff -r c23f233213f4 -r 29eed3efba72 ChangeLog --- a/ChangeLog Tue May 07 16:09:51 2013 +0200 +++ b/ChangeLog Wed May 15 16:48:54 2013 +0200 @@ -1,3 +1,12 @@ +2013-05-15 Pavel Tisnovsky + + * Makefile.am: + (ICEDTEA_PATCHES): Added new patch. + * patches/jtreg-TextLayoutBoundsChecks.patch: + Patch containing three new JTreg tests TextLayoutAscentDescent.java, + TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that + check the behavior of text layout subsystem. + 2013-05-07 Xerxes R??nby JamVM diff -r c23f233213f4 -r 29eed3efba72 Makefile.am --- a/Makefile.am Tue May 07 16:09:51 2013 +0200 +++ b/Makefile.am Wed May 15 16:48:54 2013 +0200 @@ -547,7 +547,8 @@ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ patches/textLayoutGetCharacterCount.patch \ patches/textLayoutLimits.patch \ - patches/componentOrientationTests.patch + patches/componentOrientationTests.patch \ + patches/jtreg-TextLayoutBoundsChecks.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r c23f233213f4 -r 29eed3efba72 patches/jtreg-TextLayoutBoundsChecks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-TextLayoutBoundsChecks.patch Wed May 15 16:48:54 2013 +0200 @@ -0,0 +1,150 @@ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200 +@@ -0,0 +1,46 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++ ++/** ++ * @test ++ * @run main TextLayoutAscentDescent ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's methods getAscent() and getDescent() work properly. ++ */ ++public class TextLayoutAscentDescent { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false)); ++ ++ float ascent = tl.getAscent(); ++ float descent = tl.getDescent(); ++ if (ascent <= 0) { ++ throw new RuntimeException("Ascent " + ascent + " is <=0"); ++ } ++ if (descent <= 0) { ++ throw new RuntimeException("Descent " + descent + " is <=0"); ++ } ++ } ++} ++ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,43 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++import java.awt.geom.Rectangle2D; ++ ++/** ++ * @test ++ * @run main TextLayoutLimits2 ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's method getBounds() works properly. ++ */ ++public class TextLayoutBoundIsNotEmpty { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false)); ++ Rectangle2D bounds = tl.getBounds(); ++ ++ if (bounds.isEmpty()) { ++ throw new RuntimeException("Bounds is empty: " + bounds.toString()); ++ } ++ } ++} ++ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,52 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++import java.awt.geom.Rectangle2D; ++ ++/** ++ * @test ++ * @run main TextLayoutGetPixelBounds ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's method getPixelBounds() works properly. ++ */ ++public class TextLayoutGetPixelBounds { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ FontRenderContext fontRenderContext = new FontRenderContext(null, false, false); ++ TextLayout tl = new TextLayout("JAVA", font, fontRenderContext); ++ ++ Rectangle2D bounds = tl.getPixelBounds(fontRenderContext, 0.0f, 0.0f); ++ int width = (int) bounds.getWidth(); ++ int height = (int) bounds.getHeight(); ++ if (width <= 0) { ++ throw new RuntimeException("Width " + width + " is <=0"); ++ } ++ if (height <= 0) { ++ throw new RuntimeException("Height " + height + " is <=0"); ++ } ++ if (bounds.isEmpty()) { ++ throw new RuntimeException("Bounds is empty: " + bounds.toString()); ++ } ++ } ++} ++ From adomurad at redhat.com Wed May 15 08:55:15 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 15 May 2013 11:55:15 -0400 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <519377F6.6000709@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> Message-ID: <5193AFE3.5000005@redhat.com> On 05/15/2013 07:56 AM, Jiri Vanek wrote: > When applet calls JavaScript function, which calls back to appelt, > then *mostly* deadlock occurs. I made several attempts to fix this > more generally, but I was unsuccessful. > > So this "hack" is preventing deadlock, maybe also the timeout can be a > bit shorter... > > Although this is for both head and 1.4, for head some more > investigations are needed later. > > J. > > ps,reproducer in progress. Hi, thanks for looking into it. Probably good idea to remove dead-lock potential. > diff -r 9f2d8381f5f1 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 03 16:17:08 2013 +0200 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 06 16:06:59 2013 +0200 > @@ -1305,8 +1305,16 @@ > PluginDebug.debug("wait ToString request 1"); > synchronized (request) { > PluginDebug.debug("wait ToString request 2"); > - while (request.isDone() == false) > - request.wait(); > + int counter = 0; > + while (request.isDone() == false){ > + // Do not wait indefinitely to avoid the potential of deadlock > + // but this will destroy the intentional recursion ? > + counter++; > + if (counter>10){ > + throw new InterruptedException("Possible deadlock, releasing"); > + } > + request.wait(1000); > + } > PluginDebug.debug("wait ToString request 3"); > } > } catch (InterruptedException e) { > This is more complex than it needs to be. More simple is: if (!request.isDone()) { request.wait(REQUEST_TIMEOUT); } if (!request.isDone()) { // Do not wait indefinitely to avoid the potential of deadlock throw new RuntimeException("Possible deadlock, releasing"); } Your message gets tossed aside and a RuntimeException is thrown if you throw InterruptedException, more direct is better. Also please put this in its own method, eg waitForRequestCompletion (probably good to encapsulate the 'catch InterruptedException' here). There are many methods like this that have a wait loop. Though I would like to see the reproducer before commenting more. Thanks, -Adam From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:10:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:10:28 +0000 Subject: [Bug 1378] [IcedTea7] Add AArch64 support to Zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED Target Milestone|2.4.0 |2.3.10 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/9714f97b/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:10:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:10:29 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1378, which changed state. Bug 1378 Summary: [IcedTea7] Add AArch64 support to Zero http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/810c4d9e/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:10:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:10:47 +0000 Subject: [Bug 1378] [IcedTea7] Add AArch64 support to Zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|1274 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/63e41a0d/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:10:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:10:47 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|1378 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/e10f68d8/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:12:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:12:37 +0000 Subject: [Bug 595] ExceptionInInitializerError/AccessControlException in AppletAudioClip.play() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=595 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #10 from Andrew John Hughes --- Is this still present? 6-1.9.1 is no longer supported. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/bc6232f4/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:13:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:13:21 +0000 Subject: [Bug 607] [regression] backport of S6638712 lets the eucalyptus build fail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=607 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/cf1e4015/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:13:54 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:13:54 +0000 Subject: [Bug 637] "make check" succeeds even if tests failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=637 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #4 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/8fdf255e/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:14:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:14:33 +0000 Subject: [Bug 644] Internal Error in referenceProcessor.cpp:1369 when running test/compiler/6849574 on ia64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=644 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #3 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/94f8c4de/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:14:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:14:47 +0000 Subject: [Bug 645] openjdk/hotspot/test/compiler/6795161 does not run: Unrecognized VM option '+DoEscapeAnalysis' In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=645 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/7c8aea97/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:14:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:14:57 +0000 Subject: [Bug 647] openjdk/langtools/test/tools/javac/limits fails with java.lang.StackOverflowError In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=647 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #3 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/b04bb007/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:15:09 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:15:09 +0000 Subject: [Bug 650] openjdk/jdk/test/java/lang/management/MemoryMXBean fails with error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=650 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/0cccd4a2/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:15:22 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:15:22 +0000 Subject: [Bug 651] openjdk/jdk/test/com/sun/jdi fails with error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=651 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #3 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/c486a047/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:15:35 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:15:35 +0000 Subject: [Bug 652] openjdk/jdk/test/java/lang/System/finalization fails with timeout In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=652 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/0ac54e03/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:16:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:16:06 +0000 Subject: [Bug 653] Internal Error in os_linux_zero.cpp:236 when running test/jdk on ia64: caught unhandled signal 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=653 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #4 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/3b6a48da/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:16:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:16:17 +0000 Subject: [Bug 655] SIGBUS MappedByteBuffer.load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=655 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #5 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/462366b5/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:19:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:19:21 +0000 Subject: [Bug 655] SIGBUS MappedByteBuffer.load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=655 --- Comment #6 from Andrew John Hughes --- Was backported in 1.11.0. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/1742eff6/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:19:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:19:48 +0000 Subject: [Bug 655] SIGBUS MappedByteBuffer.load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=655 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|WONTFIX |FIXED --- Comment #7 from Andrew John Hughes --- Should be FIXED. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/306faca9/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:20:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:20:23 +0000 Subject: [Bug 660] The VM crashes when running a play framework application In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=660 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #10 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/bf964f17/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:20:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:20:44 +0000 Subject: [Bug 681] Fail on start netbeans-6.8 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=681 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/7d129623/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:20:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:20:56 +0000 Subject: [Bug 691] icedtea fails to compile netbeans In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=691 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/28dcaf71/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:22:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:22:57 +0000 Subject: [Bug 760] Fatal error when trying to start serviio-console.sh In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=760 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/57b75fd7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:23:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:23:27 +0000 Subject: [Bug 774] How to build from scrach icedtea 1.10.3/openjdk 1.6.0_b22 on Slack In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=774 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution|--- |WONTFIX --- Comment #20 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/8843c850/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:23:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:23:47 +0000 Subject: [Bug 775] NullPointerException in restoreTransientFor In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=775 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/324db1c7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:23:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:23:58 +0000 Subject: [Bug 780] eclipse helios SR2 J2EE on Fedora15 crashes on server configuration In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=780 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/b9365f93/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:24:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:24:28 +0000 Subject: [Bug 784] SEGV in java Cassandra code In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=784 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Version|6-1.0 |6-1.9.8 Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/079cc535/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:24:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:24:42 +0000 Subject: [Bug 800] problem with omnet 4.1 on fedora 15 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=800 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/fe58009c/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:25:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:25:08 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/bf287b47/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:25:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:25:27 +0000 Subject: [Bug 868] Applying a GETFIELD instruction to an array causes a segmentation fault In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=868 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/857e0aa7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:25:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:25:42 +0000 Subject: [Bug 872] LibreOffice crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=872 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/ddd8a3d7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:26:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:26:46 +0000 Subject: [Bug 887] The bug for minecraft server on linux In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=887 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Resolution|--- |WONTFIX --- Comment #7 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/2c85c659/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 09:28:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 16:28:21 +0000 Subject: [Bug 899] Internal Error (c1_Optimizer.cpp:271) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=899 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #3 from Andrew John Hughes --- Please reopen this if the bug is still present in current versions. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/ca75a58e/attachment.html From andrew at icedtea.classpath.org Wed May 15 12:17:23 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 15 May 2013 19:17:23 +0000 Subject: /hg/icedtea7: PR716: IcedTea7 should bootstrap with IcedTea6 Message-ID: changeset 5554ebb0913a in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5554ebb0913a author: Andrew John Hughes date: Wed May 15 20:17:08 2013 +0100 PR716: IcedTea7 should bootstrap with IcedTea6 2013-05-15 Andrew John Hughes PR716: IcedTea7 should bootstrap with IcedTea6 * NEWS: Updated. * Makefile.am: (JDK_CHANGESET): Bring in CertificateRevokedException ambiguity fix. (JDK_SHA256SUM): Likewise. (ICEDTEA_BOOT_PATCHES): Rename ecj-fphexconstants to fphexconstants. Make xbootclasspath and the new bootstrap-tools split-off patch conditional. * INSTALL: Document --disable-bootstrap-tools. * acinclude.m4: (IT_BYTECODE7_CHECK): Use AC_DEFUN_ONCE. (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools to decide whether to use the boot javac/javah or the one built as part of langtools. Defaults to on for bootstrap tools that support Java 1.7. (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java can be passed -Xbootclasspath/p to prepend a path to the bootclasspath or not. * configure.ac: Invoke the new macros. * javac.in: Handle -Xbootclasspath/p by prepending its value to the bootclasspath option used to ecj. * patches/boot/bootstrap-tools.patch: Split from xbootclasspath.patch. Uses the bootstrap javac and javah rather than the langtools one for CORBA and JDK. * patches/boot/corba-dependencies.patch: Include the langtools source directory on the sourcepath. * patches/boot/fphexconstants.patch: Replace additional cases in java.lang.Math (needed when using javac via gcj). * patches/boot/icedteart.patch: Split from xbootclasspath.patch; the parts that extend the classpath. The java.text Makefile changes are changed to use -Xbootclasspath/a rather than a complete rewrite. * patches/boot/jaxws-jdk-dependency.patch: Include the generated sources on the sourcepath. * patches/boot/xbootclasspath.patch: Revised version of the java.text Makefile changes that replaces the use of -Xbootclasspath for those VMs that don't support it. diffstat: ChangeLog | 45 +++++++++++++ INSTALL | 14 +++- Makefile.am | 17 +++- NEWS | 1 + acinclude.m4 | 68 ++++++++++++++++++++- configure.ac | 2 + javac.in | 10 ++- patches/boot/bootstrap-tools.patch | 66 ++++++++++++++++++++ patches/boot/corba-dependencies.patch | 13 +++- patches/boot/ecj-fphexconstants.patch | 60 ------------------ patches/boot/fphexconstants.patch | 81 ++++++++++++++++++++++++ patches/boot/icedteart.patch | 34 ++++++++++ patches/boot/jaxws-jdk-dependency.patch | 23 ++++++- patches/boot/xbootclasspath.patch | 105 ++----------------------------- 14 files changed, 370 insertions(+), 169 deletions(-) diffs (truncated from 742 to 500 lines): diff -r 933d082ec889 -r 5554ebb0913a ChangeLog --- a/ChangeLog Tue May 07 15:59:03 2013 +0200 +++ b/ChangeLog Wed May 15 20:17:08 2013 +0100 @@ -1,3 +1,48 @@ +2013-05-15 Andrew John Hughes + + PR716: IcedTea7 should bootstrap with IcedTea6 + * NEWS: Updated. + * Makefile.am: + (JDK_CHANGESET): Bring in CertificateRevokedException + ambiguity fix. + (JDK_SHA256SUM): Likewise. + (ICEDTEA_BOOT_PATCHES): Rename ecj-fphexconstants + to fphexconstants. Make xbootclasspath and the new + bootstrap-tools split-off patch conditional. + * INSTALL: Document --disable-bootstrap-tools. + * acinclude.m4: + (IT_BYTECODE7_CHECK): Use AC_DEFUN_ONCE. + (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools + to decide whether to use the boot javac/javah or the + one built as part of langtools. Defaults to on for + bootstrap tools that support Java 1.7. + (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java + can be passed -Xbootclasspath/p to prepend a path + to the bootclasspath or not. + * configure.ac: Invoke the new macros. + * javac.in: Handle -Xbootclasspath/p by prepending + its value to the bootclasspath option used to ecj. + * patches/boot/bootstrap-tools.patch: + Split from xbootclasspath.patch. Uses the bootstrap + javac and javah rather than the langtools one for + CORBA and JDK. + * patches/boot/corba-dependencies.patch: + Include the langtools source directory on the sourcepath. + * patches/boot/fphexconstants.patch: + Replace additional cases in java.lang.Math (needed + when using javac via gcj). + * patches/boot/icedteart.patch: + Split from xbootclasspath.patch; the parts that + extend the classpath. The java.text Makefile changes + are changed to use -Xbootclasspath/a rather than a + complete rewrite. + * patches/boot/jaxws-jdk-dependency.patch: + Include the generated sources on the sourcepath. + * patches/boot/xbootclasspath.patch: + Revised version of the java.text Makefile changes + that replaces the use of -Xbootclasspath for those + VMs that don't support it. + 2013-05-07 Xerxes R??nby JamVM diff -r 933d082ec889 -r 5554ebb0913a INSTALL --- a/INSTALL Tue May 07 15:59:03 2013 +0200 +++ b/INSTALL Wed May 15 20:17:08 2013 +0100 @@ -176,6 +176,7 @@ * --enable-Werror: Turn gcc & javac warnings into errors. * --disable-jar-compression: Don't compress the OpenJDK JAR files. * --disable-downloading: Don't download tarballs if not available; fail instead. +* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below. @@ -217,7 +218,7 @@ PulseAudio which can be enabled using --enable-pulse-java. The resulting provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider. -Xrender Support +XRender Support =============== IcedTea7 includes support for an Xrender-based rendering pipeline @@ -327,7 +328,7 @@ Currently, IcedTea7 only supports the 'original' HotSpot provided as part of the upstream IcedTea forest. -Javascript Support +JavaScript Support ================== IcedTea7 adds Javascript support via the javax.script API by using @@ -346,6 +347,15 @@ avoids conflicts between the JDK's copy of Rhino and any used by other applications. +Bootstrap Tools +=============== + +For bootstrap builds, the option --disable-bootstrap-tools can be used +to make use of the javac and javah built as part of the langtools build, +rather than the bootstrap tools. The default setting of this option is +to use the bootstrap tools when they support Java 1.7 (tested at +configure time). + Building Additional Virtual Machines ==================================== diff -r 933d082ec889 -r 5554ebb0913a Makefile.am --- a/Makefile.am Tue May 07 15:59:03 2013 +0200 +++ b/Makefile.am Wed May 15 20:17:08 2013 +0100 @@ -7,14 +7,14 @@ CORBA_CHANGESET = 4366e0fe59d5 JAXP_CHANGESET = 5a11895b645d JAXWS_CHANGESET = 29619865cc64 -JDK_CHANGESET = d4cd8f10764d +JDK_CHANGESET = 5e20c1a72aa8 LANGTOOLS_CHANGESET = 718a945bfdb9 OPENJDK_CHANGESET = 6579f526e5e4 CORBA_SHA256SUM = b23b0980c704247a0a690f6fb663ec561f56e2fcdc5d69f13d9629d2c1937f32 JAXP_SHA256SUM = a0f4516cdabb60bea73ce157db3c31c24634bc4058d35257b981b6b1be5114ba JAXWS_SHA256SUM = 53e63c8b63380f4a34ae955f91455ece2f687dbe3dd47e4c14ac03761cb3daee -JDK_SHA256SUM = 4a03854b630151719fa9747525c08bc6b86362d7d2a26e62e349dc9ebfc27e51 +JDK_SHA256SUM = 5b9f736df39198eec25a697792783d361e4ea4a8289b4dc7f156bcb307278b0c LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02 OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c @@ -308,10 +308,9 @@ patches/boot/corba-no-gen.patch \ patches/boot/corba-orb.patch \ patches/boot/demos.patch \ - patches/boot/ecj-fphexconstants.patch \ + patches/boot/fphexconstants.patch \ patches/boot/fontconfig.patch \ patches/boot/generated-comments.patch \ - patches/boot/xbootclasspath.patch \ patches/boot/icedteart.patch \ patches/boot/jar.patch \ patches/boot/symbols.patch \ @@ -336,6 +335,16 @@ patches/boot/xsltproc.patch \ patches/boot/ecj-odd.patch +if !DISABLE_BOOTSTRAP_TOOLS +ICEDTEA_BOOT_PATCHES += \ + patches/boot/bootstrap-tools.patch +endif + +if !VM_SUPPORTS_XBOOTCLASSPATH +ICEDTEA_BOOT_PATCHES += \ + patches/boot/xbootclasspath.patch +endif + if !WITH_PAX ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch endif diff -r 933d082ec889 -r 5554ebb0913a NEWS --- a/NEWS Tue May 07 15:59:03 2013 +0200 +++ b/NEWS Wed May 15 20:17:08 2013 +0100 @@ -678,6 +678,7 @@ - Revert 7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg to fix PR473 + - PR716: IcedTea7 should bootstrap with IcedTea6 * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. diff -r 933d082ec889 -r 5554ebb0913a acinclude.m4 --- a/acinclude.m4 Tue May 07 15:59:03 2013 +0200 +++ b/acinclude.m4 Wed May 15 20:17:08 2013 +0100 @@ -2184,7 +2184,7 @@ AC_SUBST(ALT_JAMVM_SRC_ZIP) ]) -AC_DEFUN([IT_BYTECODE7_CHECK],[ +AC_DEFUN_ONCE([IT_BYTECODE7_CHECK],[ AC_CACHE_CHECK([if the VM lacks support for 1.7 bytecode], it_cv_bytecode7, [ CLASS=Test.java BYTECODE=$(echo $CLASS|sed 's#\.java##') @@ -2463,3 +2463,69 @@ AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN_ONCE([IT_USE_BOOTSTRAP_TOOLS], +[ + AC_REQUIRE([IT_BYTECODE7_CHECK]) + AC_MSG_CHECKING([whether to disable the use of bootstrap tools for bootstrapping]) + AC_ARG_ENABLE([bootstrap-tools], + [AS_HELP_STRING(--disable-bootstrap-tools, + disable the use of bootstrap tools for bootstrapping [[default=no if they support 7]])], + [ + case "${enableval}" in + no) + disable_bootstrap_tools=yes + ;; + *) + disable_bootstrap_tools=no + ;; + esac + ], + [ + if test "x${it_cv_bytecode7}" = "xyes"; then + disable_bootstrap_tools=yes; + else + disable_bootstrap_tools=no; + fi + ]) + AC_MSG_RESULT([$disable_bootstrap_tools]) + AM_CONDITIONAL([DISABLE_BOOTSTRAP_TOOLS], test x"${disable_bootstrap_tools}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_XBOOTCLASSPATH], +[ + AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) + AC_CACHE_CHECK([if the VM supports -Xbootclasspath], it_cv_xbootclasspath_works, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ + +public class Test +{ + public static void main(String[] args) + { + System.out.println("Hello World!"); + } +}] +EOF + mkdir build + if $JAVAC -d build -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -Xbootclasspath/p:build $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_xbootclasspath_works=yes; + else + it_cv_xbootclasspath_works=no; + fi + else + it_cv_xbootclasspath_works=no; + fi + rm -f $CLASS build/*.class + rmdir build + cd .. + rmdir tmp.$$ + ]) + AC_PROVIDE([$0])dnl + AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes") +]) diff -r 933d082ec889 -r 5554ebb0913a configure.ac --- a/configure.ac Tue May 07 15:59:03 2013 +0200 +++ b/configure.ac Wed May 15 20:17:08 2013 +0100 @@ -151,6 +151,8 @@ IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_BYTECODE7_CHECK +IT_USE_BOOTSTRAP_TOOLS +IT_CHECK_FOR_XBOOTCLASSPATH IT_FIND_RHINO_JAR IT_WITH_OPENJDK_SRC_ZIP diff -r 933d082ec889 -r 5554ebb0913a javac.in --- a/javac.in Tue May 07 15:59:03 2013 +0200 +++ b/javac.in Wed May 15 20:17:08 2013 +0100 @@ -18,7 +18,15 @@ } my @bcoption; -push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' +my @bcoptions = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; +my $bc = $bcoptions[0]; +my $systembc = glob '/home/andrew/builder/icedtea7/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +if ($bc) +{ + $bc =~ s/^[^:]*://; + $systembc = join ":", $bc, $systembc; +} +push @bcoption, '-bootclasspath', $systembc unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', diff -r 933d082ec889 -r 5554ebb0913a patches/boot/bootstrap-tools.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/bootstrap-tools.patch Wed May 15 20:17:08 2013 +0100 @@ -0,0 +1,66 @@ +diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk +--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2012-06-29 15:19:55.000000000 +0100 ++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2012-06-29 18:52:40.584723407 +0100 +@@ -131,26 +131,14 @@ + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar ++JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ +- $(JAVACFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++ $(JAVACFLAGS) ++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk +--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2012-06-29 15:21:00.000000000 +0100 ++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2012-06-29 18:53:43.337711469 +0100 +@@ -168,27 +168,15 @@ + + # Langtools + ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar + JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar + DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) + JAVADOC_CMD = $(BOOT_JAVA_CMD) \ + "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ + -jar $(JAVADOC_JAR) $(JAVADOCFLAGS) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) + JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) + JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \ +- $(JAVADOCFLAGS) + endif + + # Override of what javac to use (see deploy workspace) diff -r 933d082ec889 -r 5554ebb0913a patches/boot/corba-dependencies.patch --- a/patches/boot/corba-dependencies.patch Tue May 07 15:59:03 2013 +0200 +++ b/patches/boot/corba-dependencies.patch Wed May 15 20:17:08 2013 +0100 @@ -7,8 +7,19 @@ $(CAT) $(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \ -+ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \ ++ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(LANGTOOLS_TOPDIR)/src/share/classes" \ + -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup) +diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk +--- openjdk-boot.orig/make/Defs-internal.gmk ++++ openjdk-boot/make/Defs-internal.gmk +@@ -305,6 +305,7 @@ + + # Common make arguments (supplied to all component builds) + COMMON_BUILD_ARGUMENTS = \ ++ LANGTOOLS_TOPDIR=$(ABS_LANGTOOLS_TOPDIR) \ + JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ + JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \ + EXTERNALSANITYCONTROL=true \ diff -r 933d082ec889 -r 5554ebb0913a patches/boot/ecj-fphexconstants.patch --- a/patches/boot/ecj-fphexconstants.patch Tue May 07 15:59:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java ---- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:49:00.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:59:16.000000000 +0000 -@@ -76,7 +76,7 @@ - * {@code 0x1.fffffffffffffP+1023} and also equal to - * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. - */ -- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 -+ public static final double MAX_VALUE = 1.7976931348623157e+308; - - /** - * A constant holding the smallest positive normal value of type -@@ -86,7 +86,7 @@ - * - * @since 1.6 - */ -- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 -+ public static final double MIN_NORMAL = 2.2250738585072014E-308; - - /** - * A constant holding the smallest positive nonzero value of type -@@ -95,7 +95,7 @@ - * {@code 0x0.0000000000001P-1022} and also equal to - * {@code Double.longBitsToDouble(0x1L)}. - */ -- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 -+ public static final double MIN_VALUE = 4.9e-324; - - /** - * Maximum exponent a finite {@code double} variable may have. -diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java ---- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:49:00.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:59:16.000000000 +0000 -@@ -76,7 +76,7 @@ - * {@code 0x1.fffffeP+127f} and also equal to - * {@code Float.intBitsToFloat(0x7f7fffff)}. - */ -- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f -+ public static final float MAX_VALUE = 3.4028235e+38f; - - /** - * A constant holding the smallest positive normal value of type -@@ -86,7 +86,7 @@ - * - * @since 1.6 - */ -- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f -+ public static final float MIN_NORMAL = 1.17549435E-38f; - - /** - * A constant holding the smallest positive nonzero value of type -@@ -94,7 +94,7 @@ - * hexadecimal floating-point literal {@code 0x0.000002P-126f} - * and also equal to {@code Float.intBitsToFloat(0x1)}. - */ -- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f -+ public static final float MIN_VALUE = 1.4e-45f; - - /** - * Maximum exponent a finite {@code float} variable may have. It diff -r 933d082ec889 -r 5554ebb0913a patches/boot/fphexconstants.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/fphexconstants.patch Wed May 15 20:17:08 2013 +0100 @@ -0,0 +1,81 @@ +diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java +--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:49:00.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:59:16.000000000 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffffffffffP+1023} and also equal to + * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. + */ +- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 ++ public static final double MAX_VALUE = 1.7976931348623157e+308; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 ++ public static final double MIN_NORMAL = 2.2250738585072014E-308; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -95,7 +95,7 @@ + * {@code 0x0.0000000000001P-1022} and also equal to + * {@code Double.longBitsToDouble(0x1L)}. + */ +- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 ++ public static final double MIN_VALUE = 4.9e-324; + + /** + * Maximum exponent a finite {@code double} variable may have. +diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java +--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:49:00.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:59:16.000000000 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffeP+127f} and also equal to + * {@code Float.intBitsToFloat(0x7f7fffff)}. + */ +- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f ++ public static final float MAX_VALUE = 3.4028235e+38f; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f ++ public static final float MIN_NORMAL = 1.17549435E-38f; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -94,7 +94,7 @@ + * hexadecimal floating-point literal {@code 0x0.000002P-126f} + * and also equal to {@code Float.intBitsToFloat(0x1)}. + */ +- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f ++ public static final float MIN_VALUE = 1.4e-45f; + + /** + * Maximum exponent a finite {@code float} variable may have. It +diff --git a/src/share/classes/java/lang/Math.java b/src/share/classes/java/lang/Math.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Math.java ++++ openjdk-boot/jdk/src/share/classes/java/lang/Math.java +@@ -647,7 +647,7 @@ + * @see java.lang.Integer#MIN_VALUE + */ + public static int round(float a) { From bugzilla-daemon at icedtea.classpath.org Wed May 15 12:17:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 19:17:32 +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 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=5554ebb0913a author: Andrew John Hughes date: Wed May 15 20:17:08 2013 +0100 PR716: IcedTea7 should bootstrap with IcedTea6 2013-05-15 Andrew John Hughes PR716: IcedTea7 should bootstrap with IcedTea6 * NEWS: Updated. * Makefile.am: (JDK_CHANGESET): Bring in CertificateRevokedException ambiguity fix. (JDK_SHA256SUM): Likewise. (ICEDTEA_BOOT_PATCHES): Rename ecj-fphexconstants to fphexconstants. Make xbootclasspath and the new bootstrap-tools split-off patch conditional. * INSTALL: Document --disable-bootstrap-tools. * acinclude.m4: (IT_BYTECODE7_CHECK): Use AC_DEFUN_ONCE. (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools to decide whether to use the boot javac/javah or the one built as part of langtools. Defaults to on for bootstrap tools that support Java 1.7. (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java can be passed -Xbootclasspath/p to prepend a path to the bootclasspath or not. * configure.ac: Invoke the new macros. * javac.in: Handle -Xbootclasspath/p by prepending its value to the bootclasspath option used to ecj. * patches/boot/bootstrap-tools.patch: Split from xbootclasspath.patch. Uses the bootstrap javac and javah rather than the langtools one for CORBA and JDK. * patches/boot/corba-dependencies.patch: Include the langtools source directory on the sourcepath. * patches/boot/fphexconstants.patch: Replace additional cases in java.lang.Math (needed when using javac via gcj). * patches/boot/icedteart.patch: Split from xbootclasspath.patch; the parts that extend the classpath. The java.text Makefile changes are changed to use -Xbootclasspath/a rather than a complete rewrite. * patches/boot/jaxws-jdk-dependency.patch: Include the generated sources on the sourcepath. * patches/boot/xbootclasspath.patch: Revised version of the java.text Makefile changes that replaces the use of -Xbootclasspath for those VMs that don't support it. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/a428e3f9/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 12:18:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 19:18:28 +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 ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Blocks| |1274 Resolution|--- |FIXED Target Milestone|2.5.0 |2.4.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/cfb2458b/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 12:18:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 19:18:28 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 716, which changed state. Bug 716 Summary: IcedTea7 should bootstrap with IcedTea6 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/54b71539/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 12:18:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 19:18:28 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |716 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/a7153657/attachment.html From andrew at icedtea.classpath.org Wed May 15 12:25:20 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 15 May 2013 19:25:20 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset c23f233213f4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c23f233213f4 author: Xerxes Ranby date: Tue May 07 16:09:51 2013 +0200 JamVM: Update to 2013-05-06 revision. 2013-05-07 Xerxes R?nby JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code - Do not free unprepared Miranda method code data - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. (JAMVM_SHA256SUM): Updated. changeset 29eed3efba72 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=29eed3efba72 author: Pavel Tisnovsky date: Wed May 15 16:48:54 2013 +0200 Added patch containing three new JTreg tests TextLayoutAscentDescent.java, TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that check the behavior of text layout subsystem. changeset 2afb2999ac61 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2afb2999ac61 author: Andrew John Hughes date: Wed May 15 20:23:28 2013 +0100 Merge changeset 095625ea8650 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=095625ea8650 author: Andrew John Hughes date: Wed May 15 20:25:05 2013 +0100 Remove reference to removed patch. 2013-05-15 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Remove reference to removed patch patches/openjdk/8009641-8007675_build_fix.patch. diffstat: ChangeLog | 93 + Makefile.am | 45 +- NEWS | 10 + patches/ecj/override.patch | 51 + patches/jtreg-TextLayoutBoundsChecks.patch | 150 + patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 ---------- patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 --- patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - 43 files changed, 309 insertions(+), 23818 deletions(-) diffs (truncated from 24366 to 500 lines): diff -r 3b76dff83564 -r 095625ea8650 ChangeLog --- a/ChangeLog Tue Apr 30 13:18:33 2013 +0200 +++ b/ChangeLog Wed May 15 20:25:05 2013 +0100 @@ -1,3 +1,35 @@ +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + +2013-05-15 Pavel Tisnovsky + + * Makefile.am: + (ICEDTEA_PATCHES): Added new patch. + * patches/jtreg-TextLayoutBoundsChecks.patch: + Patch containing three new JTreg tests TextLayoutAscentDescent.java, + TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that + check the behavior of text layout subsystem. + +2013-05-07 Xerxes R??nby + + JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision. + (JAMVM_SHA256SUM): Updated. + 2013-04-30 Pavel Tisnovsky * Makefile.am: @@ -348,6 +380,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -949,6 +1037,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r 3b76dff83564 -r 095625ea8650 Makefile.am --- a/Makefile.am Tue Apr 30 13:18:33 2013 +0200 +++ b/Makefile.am Wed May 15 20:25:05 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82 -JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 +JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 +JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 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 @@ -263,39 +263,6 @@ SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ patches/openjdk/7036559-concurrenthashmap_improvements.patch \ patches/security/20130416/8009063.patch \ patches/openjdk/8004302-soap_test_failure.patch \ @@ -337,7 +304,6 @@ if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ - patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch @@ -530,8 +496,6 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ - patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ patches/openjdk/8007393.patch \ patches/openjdk/8007611.patch \ @@ -547,7 +511,8 @@ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ patches/textLayoutGetCharacterCount.patch \ patches/textLayoutLimits.patch \ - patches/componentOrientationTests.patch + patches/componentOrientationTests.patch \ + patches/jtreg-TextLayoutBoundsChecks.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 3b76dff83564 -r 095625ea8650 NEWS --- a/NEWS Tue Apr 30 13:18:33 2013 +0200 +++ b/NEWS Wed May 15 20:25:05 2013 +0100 @@ -22,6 +22,16 @@ * Bug fixes - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only) +* JamVM + - JSR 335: (lambda expressions) initial hack + - JEP 171: Implement fence methods in sun.misc.Unsafe + - Fix invokesuper check in invokespecial opcode + - Fix non-direct interpreter invokespecial super-class check + - When GC'ing a native method don't try to free code + - Do not free unprepared Miranda method code data + - Set anonymous class protection domain + - JVM_IsVMGeneratedMethodIx stub + - Dummy implementation of sun.misc.Perf natives New in release 1.12.5 (2013-04-24): diff -r 3b76dff83564 -r 095625ea8650 patches/ecj/override.patch --- a/patches/ecj/override.patch Tue Apr 30 13:18:33 2013 +0200 +++ b/patches/ecj/override.patch Wed May 15 20:25:05 2013 +0100 @@ -311,3 +311,54 @@ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); +diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java +--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:24.027496931 +0000 ++++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:56.968026902 +0000 +@@ -1040,7 +1040,6 @@ + + targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); +@@ -1114,7 +1113,6 @@ + + javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction() { + +- @Override + public Void run() { + for (int i = 0; i < sig.length; i++) { + if (tracing) { +@@ -1203,7 +1201,6 @@ + final String className = opClassName; + targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); +@@ -1239,7 +1236,6 @@ + AccessControlContext stack = AccessController.getContext(); + Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction() { + +- @Override + public Object run() { + try { + ReflectUtil.checkPackageAccess(method.getDeclaringClass()); +@@ -1676,7 +1672,6 @@ + + Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(respType); +@@ -2854,7 +2849,6 @@ + + Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction>() { + +- @Override + public Class run() { + try { + ReflectUtil.checkPackageAccess(className); diff -r 3b76dff83564 -r 095625ea8650 patches/jtreg-TextLayoutBoundsChecks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-TextLayoutBoundsChecks.patch Wed May 15 20:25:05 2013 +0100 @@ -0,0 +1,150 @@ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200 +@@ -0,0 +1,46 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++ ++/** ++ * @test ++ * @run main TextLayoutAscentDescent ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's methods getAscent() and getDescent() work properly. ++ */ ++public class TextLayoutAscentDescent { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false)); ++ ++ float ascent = tl.getAscent(); ++ float descent = tl.getDescent(); ++ if (ascent <= 0) { ++ throw new RuntimeException("Ascent " + ascent + " is <=0"); ++ } ++ if (descent <= 0) { ++ throw new RuntimeException("Descent " + descent + " is <=0"); ++ } ++ } ++} ++ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,43 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++import java.awt.geom.Rectangle2D; ++ ++/** ++ * @test ++ * @run main TextLayoutLimits2 ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's method getBounds() works properly. ++ */ ++public class TextLayoutBoundIsNotEmpty { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false)); ++ Rectangle2D bounds = tl.getBounds(); ++ ++ if (bounds.isEmpty()) { ++ throw new RuntimeException("Bounds is empty: " + bounds.toString()); ++ } ++ } ++} ++ +--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200 ++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,52 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.Font; ++import java.awt.font.TextLayout; ++import java.awt.font.FontRenderContext; ++import java.awt.geom.Rectangle2D; ++ ++/** ++ * @test ++ * @run main TextLayoutGetPixelBounds ++ * @author Pavel Tisnovsky ++ * ++ * Test if TextLayout's method getPixelBounds() works properly. ++ */ ++public class TextLayoutGetPixelBounds { ++ public static void main(String []args) { ++ Font font = new Font("Times New Roman", Font.BOLD, 10); ++ FontRenderContext fontRenderContext = new FontRenderContext(null, false, false); ++ TextLayout tl = new TextLayout("JAVA", font, fontRenderContext); ++ ++ Rectangle2D bounds = tl.getPixelBounds(fontRenderContext, 0.0f, 0.0f); ++ int width = (int) bounds.getWidth(); ++ int height = (int) bounds.getHeight(); ++ if (width <= 0) { ++ throw new RuntimeException("Width " + width + " is <=0"); ++ } ++ if (height <= 0) { ++ throw new RuntimeException("Height " + height + " is <=0"); ++ } ++ if (bounds.isEmpty()) { ++ throw new RuntimeException("Bounds is empty: " + bounds.toString()); ++ } ++ } ++} ++ diff -r 3b76dff83564 -r 095625ea8650 patches/openjdk/8004341-jck_dialog_failure.patch --- a/patches/openjdk/8004341-jck_dialog_failure.patch Tue Apr 30 13:18:33 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# HG changeset patch -# User denis -# Date 1355221156 -14400 -# Node ID 090b35175a91906d75050f12a5f3e54c7da199e9 -# Parent 52029bcc00e103876c5149d7f95d9246e73d3435 -8004341: Two JCK tests fails with 7u11 b06 -Reviewed-by: serb, skoivu - -diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java ---- openjdk/jdk/src/share/classes/java/awt/Dialog.java -+++ openjdk/jdk/src/share/classes/java/awt/Dialog.java -@@ -1631,12 +1631,13 @@ - if (localModalityType == null) { - this.modal = fields.get("modal", false); - setModal(modal); -+ } else { -+ this.modalityType = localModalityType; - } - - this.resizable = fields.get("resizable", true); - this.undecorated = fields.get("undecorated", false); - this.title = (String)fields.get("title", ""); -- this.modalityType = localModalityType; - - blockedWindows = new IdentityArrayList(); - diff -r 3b76dff83564 -r 095625ea8650 patches/openjdk/8005615-failure_to_load_logger_implementation.patch --- a/patches/openjdk/8005615-failure_to_load_logger_implementation.patch Tue Apr 30 13:18:33 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,542 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1360107230 0 -# Node ID cff0241d217f7b463d58ddcd0add8d41de9eb280 -# Parent dabed5898de907431b524952aade46f0b6b960aa -8005615: Java Logger fails to load tomcat logger implementation (JULI) -Reviewed-by: mchung - -diff --git a/src/share/classes/java/util/logging/LogManager.java b/src/share/classes/java/util/logging/LogManager.java ---- openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -+++ openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. 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 -@@ -159,7 +159,7 @@ - - // LoggerContext for system loggers and user loggers - private final LoggerContext systemContext = new SystemLoggerContext(); -- private final LoggerContext userContext = new UserLoggerContext(); -+ private final LoggerContext userContext = new LoggerContext(); - private Logger rootLogger; - - // Have we done the primordial reading of the configuration file? -@@ -197,13 +197,13 @@ - - // Create and retain Logger for the root of the namespace. From bugzilla-daemon at icedtea.classpath.org Wed May 15 14:35:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 21:35:48 +0000 Subject: [Bug 1435] New: OpenJDK 6/7 returns incorrect TrueType font metrics Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 Bug ID: 1435 Summary: OpenJDK 6/7 returns incorrect TrueType font metrics Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: drazzib at drazzib.com CC: unassigned at icedtea.classpath.org Created attachment 873 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=873&action=edit Patch from Nobuhiro Ban Problem ======= On OpenJDK JRE and using some TrueType font, JasperReports does not display text element which height is just the same as the font size eg. { height="8", size="8", font="IPA mincho" }. JasperReports checks the text size before drawing the text elements. If (ascent + descent) of text is greater than the height of text element, this text is not drawn. In above case, Sun Java returns the same height (ascent + descent = fontsize), but OpenJDK returns the text height greater than font size, so not drawn. Sample code (includes Japanese char) =================================== import java.awt.Font; import java.awt.font.FontRenderContext; import java.awt.font.TextLayout; public class JavaApplication1 { public static void main(String[] args) throws Exception { Font f = new Font("IPA??????",Font.PLAIN, 8); TextLayout layout = new TextLayout("IPA??????", f, new FontRenderContext(null, true, true)); System.out.println("Ascent: " + layout.getAscent()); System.out.println("Descent: " + layout.getDescent()); } } Result of this code =================== Sun Java 6 (sun-java6-jre 6.26-0squeeze1) > Ascent: 7.0390625 > Descent: 0.9609375 OpenJDK 6 (openjdk-6-jre 6b24~pre2-1) > Ascent: 7.046875 > Descent: 0.96875 OpenJDK 7 (openjdk-7-jre 7~b147-2.0-1) > Ascent: 7.046875 > Descent: 0.96875 Sun Java returns correct height, but OpenJDK returns greater value than Sun's. Analysis of Source code ======================= In OpenJDK6/7 native method sun.font.FreetypeFontScaler.getFontMetricsNative(): jdk/src/share/native/sun/font/freetypeScaler.c >JNIEXPORT jobject JNICALL >Java_sun_font_FreetypeFontScaler_getFontMetricsNative( > JNIEnv *env, jobject scaler, jobject font2D, > jlong pScalerContext, jlong pScaler) { (snip) > /* ascent */ > ax = 0; > ay = -(jfloat) FT26Dot6ToFloat(FT_MulFix( > ((jlong) scalerInfo->face->ascender + bmodifier/2), > (jlong) scalerInfo->face->size->metrics.y_scale)); > /* descent */ > dx = 0; > dy = -(jfloat) FT26Dot6ToFloat(FT_MulFix( > ((jlong) scalerInfo->face->descender + bmodifier/2), > (jlong) scalerInfo->face->size->metrics.y_scale)); (snip) > metrics = (*env)->NewObject(env, > sunFontIDs.strikeMetricsClass, > sunFontIDs.strikeMetricsCtr, > ax, ay, dx, dy, bx, by, lx, ly, mx, my); > > return metrics; >} This code uses FT_MulFix to convert size. But FT_MulFix sometimes rounds up and loses precision. In FreeType2's FT_MulFix: freetype-2.4.8/src/base/ftcalc.c > c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 ); If both ascent and descent are rounded up, (ascent + descent) is greater than original height. In the sample case (IPA mincho font), bmodifier = 0 scalerInfo->face->ascender = 1802L scalerInfo->face->descender = -246L scalerInfo->face->size->metrics.y_scale = 16384L In this case, 1802 mod 4 = 2 and 246 mod 4 = 2, so both are rounded up. This causes (ay + dy) > font-size. (Note: (Sun) 1802.0/256.0 = 7.0390625, (OpenJDK) 1804.0/256.0 = 7.046875) Suggested fix ============= Fix to keep the precision in the font metrics conversion in Java_sun_font_FreetypeFontScaler_getFontMetricsNative(). See attached patch from Nobuhiro Ban -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/d25f47d0/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 15 14:36:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 15 May 2013 21:36:48 +0000 Subject: [Bug 1435] OpenJDK 6/7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 Damien Raude-Morvan changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |http://bugs.debian.org/6578 | |54 --- Comment #1 from Damien Raude-Morvan --- Applied in current Debian package : http://patch-tracker.debian.org/patch/series/dl/openjdk-7/7u21-2.3.9-4/FreetypeFontScaler_getFontMetricsNative.diff -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130515/427d2604/attachment.html From stefan at complang.tuwien.ac.at Wed May 15 23:28:30 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 16 May 2013 08:28:30 +0200 Subject: [icedtea-web][rfc] Added de localized man page for javaws In-Reply-To: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> References: <201305150202.r4F22E6T008151@mail-web03.excite.co.jp> Message-ID: > Happy reviewing! You might want to amend this. I've only touched the UTF-8 version. -------------- next part -------------- A non-text attachment was scrubbed... Name: man-de-utf8-cleanup.patch Type: application/octet-stream Size: 2494 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130516/68edb48e/man-de-utf8-cleanup.patch From ptisnovs at icedtea.classpath.org Thu May 16 01:22:40 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 16 May 2013 08:22:40 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptContextClassTest fo... Message-ID: changeset 3ab1ee93ed90 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=3ab1ee93ed90 author: Pavel Tisnovsky date: Thu May 16 10:26:07 2013 +0200 Updated four tests in ScriptContextClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptContextClassTest.java | 70 ++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) diffs (121 lines): diff -r d99e0391a6af -r 3ab1ee93ed90 ChangeLog --- a/ChangeLog Wed May 15 09:39:26 2013 +0200 +++ b/ChangeLog Thu May 16 10:26:07 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-16 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Updated four tests in ScriptContextClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-15 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r d99e0391a6af -r 3ab1ee93ed90 src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Wed May 15 09:39:26 2013 +0200 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Thu May 16 10:26:07 2013 +0200 @@ -444,9 +444,24 @@ "public static final int javax.script.ScriptContext.ENGINE_SCOPE", "public static final int javax.script.ScriptContext.GLOBAL_SCOPE", }; + final String[] fieldsThatShouldExist_jdk8 = { + "public static final int javax.script.ScriptContext.ENGINE_SCOPE", + "public static final int javax.script.ScriptContext.GLOBAL_SCOPE", + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.scriptContextClass.getFields(); @@ -475,10 +490,25 @@ "public static final int javax.script.ScriptContext.ENGINE_SCOPE", "public static final int javax.script.ScriptContext.GLOBAL_SCOPE", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "public static final int javax.script.ScriptContext.ENGINE_SCOPE", + "public static final int javax.script.ScriptContext.GLOBAL_SCOPE", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.scriptContextClass.getDeclaredFields(); @@ -507,8 +537,23 @@ "ENGINE_SCOPE", "GLOBAL_SCOPE", }; + final String[] fieldsThatShouldExist_jdk8 = { + "ENGINE_SCOPE", + "GLOBAL_SCOPE", + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -538,8 +583,25 @@ "ENGINE_SCOPE", "GLOBAL_SCOPE", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "ENGINE_SCOPE", + "GLOBAL_SCOPE", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From ptisnovs at icedtea.classpath.org Thu May 16 01:34:06 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 16 May 2013 08:34:06 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltConvolveOp test suite. Message-ID: changeset 51cd89f835e7 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=51cd89f835e7 author: Pavel Tisnovsky date: Thu May 16 10:37:27 2013 +0200 Six new tests added into BitBltConvolveOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltConvolveOp.java | 84 ++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diffs (120 lines): diff -r d616b88c89ff -r 51cd89f835e7 ChangeLog --- a/ChangeLog Wed May 15 09:45:29 2013 +0200 +++ b/ChangeLog Thu May 16 10:37:27 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-16 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + Six new tests added into BitBltConvolveOp test suite. + 2013-05-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r d616b88c89ff -r 51cd89f835e7 src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Wed May 15 09:45:29 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Thu May 16 10:37:27 2013 +0200 @@ -530,6 +530,34 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -614,6 +642,34 @@ } /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -698,6 +754,34 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, sobelOperatorGyROP); + } + + /** * Entry point to the test suite. * * @param args not used in this case From andrew at icedtea.classpath.org Thu May 16 06:27:36 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 16 May 2013 13:27:36 +0000 Subject: /hg/icedtea7: Fix accidental inclusion of hardcoded path. Message-ID: changeset c8821d8403ff in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c8821d8403ff author: Andrew John Hughes date: Thu May 16 14:27:22 2013 +0100 Fix accidental inclusion of hardcoded path. 2013-05-16 Andrew John Hughes * javac.in: Fix accidental inclusion of hardcoded path. diffstat: ChangeLog | 5 +++++ javac.in | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 5554ebb0913a -r c8821d8403ff ChangeLog --- a/ChangeLog Wed May 15 20:17:08 2013 +0100 +++ b/ChangeLog Thu May 16 14:27:22 2013 +0100 @@ -1,3 +1,8 @@ +2013-05-16 Andrew John Hughes + + * javac.in: Fix accidental inclusion of + hardcoded path. + 2013-05-15 Andrew John Hughes PR716: IcedTea7 should bootstrap with IcedTea6 diff -r 5554ebb0913a -r c8821d8403ff javac.in --- a/javac.in Wed May 15 20:17:08 2013 +0100 +++ b/javac.in Thu May 16 14:27:22 2013 +0100 @@ -20,7 +20,7 @@ my @bcoption; my @bcoptions = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; my $bc = $bcoptions[0]; -my $systembc = glob '/home/andrew/builder/icedtea7/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'; if ($bc) { $bc =~ s/^[^:]*://; From gitne at excite.co.jp Thu May 16 06:31:47 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 16 May 2013 22:31:47 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBBZGRlZCBkZSBsb2NhbGl6ZWQgbWFuIHBhZ2UgZm9yIGphdmF3cw==?= Message-ID: <201305161331.r4GDVl3G030000@mail-web02.excite.co.jp> "Stefan Ring" wrote: > > Happy reviewing! > > You might want to amend this. I've only touched the UTF-8 version. Yes, agreed on almost everything, thank you. Although I would disagree on -Prüfe auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung +Prüft auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung because the source does not say "checks for update". I interpret that "check" as being in the imperative form. But, those sentences are semantically equivalent. Regards, Jacob ps: I have updated the iso-8859-1 version too. -------------- next part -------------- A non-text attachment was scrubbed... Name: Add de localized man page.patch Type: text/x-patch Size: 12197 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130516/4b6e66b3/ISO-2022-JPBQWRkIGRlIGxvY2FsaXplZCBtYW4gcGFnZS5wYXRjaA.patch From gitne at excite.co.jp Thu May 16 06:54:38 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 16 May 2013 22:54:38 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBBZGRlZCBkZSBsb2NhbGl6ZWQgbWFuIHBhZ2UgZm9yIGphdmF3cw==?= Message-ID: <201305161354.r4GDscFn032246@mail-web02.excite.co.jp> "Jacob Wisor" wrote: > "Stefan Ring" wrote: > > > Happy reviewing! > > > > You might want to amend this. I've only touched the UTF-8 version. > > Yes, agreed on almost everything, thank you. Although I would disagree on > > -Prüfe auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung > +Prüft auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung > > because the source does not say "checks for update". I interpret that "check" as being in the imperative form. But, those sentences are semantically equivalent. > > Regards, > Jacob > > ps: I have updated the iso-8859-1 version too. Sorry, found few spelling mistakes more... :( From gitne at excite.co.jp Thu May 16 07:00:32 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 16 May 2013 23:00:32 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBBZGRlZCBkZSBsb2NhbGl6ZWQgbWFuIHBhZ2UgZm9yIGphdmF3cw==?= Message-ID: <201305161400.r4GE0W03023363@mail-web01.excite.co.jp> "Jacob Wisor" wrote: > "Stefan Ring" wrote: > > > Happy reviewing! > > > > You might want to amend this. I've only touched the UTF-8 version. > > Yes, agreed on almost everything, thank you. Although I would disagree on > > -Prüfe auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung > +Prüft auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung > > because the source does not say "checks for update". I interpret that "check" as being in the imperative form. But, those sentences are semantically equivalent. > > Regards, > Jacob > > ps: I have updated the iso-8859-1 version too. Sorry, webmailer has dropped the attachment again :-\ -------------- next part -------------- A non-text attachment was scrubbed... Name: Add de localized man page.patch Type: text/x-patch Size: 12201 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130516/e6f6a7f8/ISO-2022-JPBQWRkIGRlIGxvY2FsaXplZCBtYW4gcGFnZS5wYXRjaA.patch From jvanek at redhat.com Thu May 16 08:39:59 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 16 May 2013 17:39:59 +0200 Subject: [icedtea-web][rfc] Added de localized man page for javaws In-Reply-To: <201305161400.r4GE0W03023363@mail-web01.excite.co.jp> References: <201305161400.r4GE0W03023363@mail-web01.excite.co.jp> Message-ID: <5194FDCF.9080005@redhat.com> On 05/16/2013 04:00 PM, Jacob Wisor wrote: > "Jacob Wisor" wrote: >> "Stefan Ring" wrote: >>>> Happy reviewing! >>> >>> You might want to amend this. I've only touched the UTF-8 version. >> >> Yes, agreed on almost everything, thank you. Although I would disagree on >> >> -Prüfe auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung >> +Prüft auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung >> >> because the source does not say "checks for update". I interpret that "check" as being in the imperative form. But, those sentences are semantically equivalent. >> >> Regards, >> Jacob >> >> ps: I have updated the iso-8859-1 version too. > > Sorry, webmailer has dropped the attachment again :-\ Hi! Looks ok. Thank you very much! However - is the non utf version needed? I'm for dropipng it. If it is necessary, then I'm for generating from utf-8 version. J. From adomurad at redhat.com Thu May 16 11:30:13 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 16 May 2013 14:30:13 -0400 Subject: [rfc][icedtea-web] Fix PR854: Resizing an applet several times causes 100% CPU load In-Reply-To: <51935C6D.3050906@redhat.com> References: <5192A35F.7040200@redhat.com> <51935C6D.3050906@redhat.com> Message-ID: <519525B5.8040905@redhat.com> On 05/15/2013 05:59 AM, Jiri Vanek wrote: > On 05/14/2013 10:49 PM, Adam Domurad wrote: >> Nasty bug with a simple fix. This has been reported since icedtea-web 1.1 >> >> See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854. The >> reproducer is very easy to set >> up. Placing a print statement reveals that after two resize's, all of >> icedtea-web's worker threads >> are busy. >> >> The waiting before was too fragile it seems. The version in the patch >> shouldn't dead-lock in any >> code-path. Everything works as expected with this patch (there really >> is no possible harm, too). >> >> This should go into any branches that will be released again, IMHO. >> From the bug comments it seems >> this is quite a visible issue. >> >> Thanks, >> -Adam > > This is nice! Please accompany this with automated reproducer and go on. > > ok for head and 1.4 > > J. Here's a reproducer. Without patch, fails to resize more than once (gets stalled). ChangeLog: 2013-05-16 Adam Domurad Reproducer for PR854. * tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html: Resizes applet from Javascript. * tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java: Simple applet with a few helper methods. * tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java: Test applet resizing. Cheers. -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: resize-applet-reproducer.patch Type: text/x-patch Size: 8520 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130516/82889651/resize-applet-reproducer.patch From jvanek at redhat.com Fri May 17 01:54:07 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 10:54:07 +0200 Subject: [rfc][icedtea-web] Fix PR854: Resizing an applet several times causes 100% CPU load In-Reply-To: <519525B5.8040905@redhat.com> References: <5192A35F.7040200@redhat.com> <51935C6D.3050906@redhat.com> <519525B5.8040905@redhat.com> Message-ID: <5195F02F.80902@redhat.com> On 05/16/2013 08:30 PM, Adam Domurad wrote: > On 05/15/2013 05:59 AM, Jiri Vanek wrote: >> On 05/14/2013 10:49 PM, Adam Domurad wrote: >>> Nasty bug with a simple fix. This has been reported since icedtea-web 1.1 >>> >>> See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854. The >>> reproducer is very easy to set >>> up. Placing a print statement reveals that after two resize's, all of >>> icedtea-web's worker threads >>> are busy. >>> >>> The waiting before was too fragile it seems. The version in the patch >>> shouldn't dead-lock in any >>> code-path. Everything works as expected with this patch (there really >>> is no possible harm, too). >>> >>> This should go into any branches that will be released again, IMHO. >>> From the bug comments it seems >>> this is quite a visible issue. >>> >>> Thanks, >>> -Adam >> >> This is nice! Please accompany this with automated reproducer and go on. >> >> ok for head and 1.4 >> >> J. > > Here's a reproducer. Without patch, fails to resize more than once (gets stalled). > > ChangeLog: > 2013-05-16 Adam Domurad > > Reproducer for PR854. > * tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html: > Resizes applet from Javascript. > * tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java: > Simple applet with a few helper methods. > * tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java: > Test applet resizing. > > Cheers. > -Adam ThanX! From jvanek at redhat.com Fri May 17 04:04:32 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 13:04:32 +0200 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <5193AFE3.5000005@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> Message-ID: <51960EC0.7050609@redhat.com> Here you go:) J. On 05/15/2013 05:55 PM, Adam Domurad wrote: > On 05/15/2013 07:56 AM, Jiri Vanek wrote: >> When applet calls JavaScript function, which calls back to appelt, then *mostly* deadlock occurs. >> I made several attempts to fix this more generally, but I was unsuccessful. >> >> So this "hack" is preventing deadlock, maybe also the timeout can be a bit shorter... >> >> Although this is for both head and 1.4, for head some more investigations are needed later. >> >> J. >> >> ps,reproducer in progress. > > Hi, thanks for looking into it. Probably good idea to remove dead-lock potential. > >> diff -r 9f2d8381f5f1 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 03 16:17:08 2013 +0200 >> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 06 16:06:59 2013 +0200 >> @@ -1305,8 +1305,16 @@ >> PluginDebug.debug("wait ToString request 1"); >> synchronized (request) { >> PluginDebug.debug("wait ToString request 2"); >> - while (request.isDone() == false) >> - request.wait(); >> + int counter = 0; >> + while (request.isDone() == false){ >> + // Do not wait indefinitely to avoid the potential of deadlock >> + // but this will destroy the intentional recursion ? >> + counter++; >> + if (counter>10){ >> + throw new InterruptedException("Possible deadlock, releasing"); >> + } >> + request.wait(1000); >> + } >> PluginDebug.debug("wait ToString request 3"); >> } >> } catch (InterruptedException e) { >> > > This is more complex than it needs to be. > More simple is: > > if (!request.isDone()) { > request.wait(REQUEST_TIMEOUT); > } > if (!request.isDone()) { > // Do not wait indefinitely to avoid the potential of deadlock > throw new RuntimeException("Possible deadlock, releasing"); > } > > Your message gets tossed aside and a RuntimeException is thrown if you throw InterruptedException, > more direct is better. > > Also please put this in its own method, eg waitForRequestCompletion (probably good to encapsulate > the 'catch InterruptedException' here). There are many methods like this that have a wait loop. > Though I would like to see the reproducer before commenting more. > > Thanks, > -Adam > -------------- next part -------------- A non-text attachment was scrubbed... Name: dadlockFix-tests.patch Type: text/x-patch Size: 9807 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/64612323/dadlockFix-tests.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: dadlockFix-fix.patch Type: text/x-patch Size: 1334 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/64612323/dadlockFix-fix.patch From gitne at excite.co.jp Fri May 17 04:58:52 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 17 May 2013 20:58:52 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBGaXggb2YgYmFja3VwIG9mIGRlcGxveW1lbnQucHJvcGVydGllcyBvbiBzb21lIE9Tcw==?= Message-ID: <201305171158.r4HBwqfG020733@mail-web01.excite.co.jp> "Jiri Vanek" wrote: > [...] > Btw will you update the manifest patch? Imho worthy O:) > I have looked into that further, but I must admit that I am confused by the whole autoconf and automake infrastructure. Way too complicated to just solve a relatively simple problem... It might have been okay 20 years ago to use that sceme, but fortunetelly there are better tools now, ;) Jacob From ptisnovs at icedtea.classpath.org Fri May 17 05:36:38 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 17 May 2013 12:36:38 +0000 Subject: /hg/rhino-tests: Updated two tests in AbstractScriptEngineClassT... Message-ID: changeset d4b48d0f24fc in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d4b48d0f24fc author: Pavel Tisnovsky date: Fri May 17 14:40:06 2013 +0200 Updated two tests in AbstractScriptEngineClassTest for (Open)JDK8 API: getAnnotation and getAnnotations. diffstat: ChangeLog | 6 +++ src/org/RhinoTests/AbstractScriptEngineClassTest.java | 36 +++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diffs (80 lines): diff -r 3ab1ee93ed90 -r d4b48d0f24fc ChangeLog --- a/ChangeLog Thu May 16 10:26:07 2013 +0200 +++ b/ChangeLog Fri May 17 14:40:06 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-17 Pavel Tisnovsky + + * src/org/RhinoTests/AbstractScriptEngineClassTest.java: + Updated two tests in AbstractScriptEngineClassTest for (Open)JDK8 API: + getAnnotation and getAnnotations. + 2013-05-16 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r 3ab1ee93ed90 -r d4b48d0f24fc src/org/RhinoTests/AbstractScriptEngineClassTest.java --- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java Thu May 16 10:26:07 2013 +0200 +++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java Fri May 17 14:40:06 2013 +0200 @@ -1068,6 +1068,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.abstractScriptEngineClass.getAnnotations(); // and transform the array into a list of annotation names @@ -1075,7 +1078,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -1094,6 +1110,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.abstractScriptEngineClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1101,7 +1120,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From jvanek at redhat.com Fri May 17 05:58:34 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 14:58:34 +0200 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties on some OSs In-Reply-To: <201305171158.r4HBwqfG020733@mail-web01.excite.co.jp> References: <201305171158.r4HBwqfG020733@mail-web01.excite.co.jp> Message-ID: <5196297A.1030205@redhat.com> On 05/17/2013 01:58 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> [...] >> Btw will you update the manifest patch? Imho worthy O:) >> > > I have looked into that further, but I must admit that I am confused by the whole autoconf and automake infrastructure. Way too complicated to just solve a relatively simple problem... It might have been okay 20 years ago to use that sceme, but fortunetelly there are better tools now, ;) > > Jacob > diff --git a/netx.manifest.in b/netx.manifest.in --- a/netx.manifest.in +++ b/netx.manifest.in @@ -1,2 +1,8 @@ Implementation-Title: @PACKAGE_NAME@ Implementation-Version: @FULL_VERSION@ +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web +Implementation-Vendor: IcedTea +Specification-Title: JSR56: Java Network Launching Protocol and API +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 +Specification-Vendor: Java Community Process +Specification-Version: 6.0 I'm for this slightly updated (just vendor changed) manifest to go in. No more variables are needed at this time. Of course we can define all VENDOR, PACKAGE_URL as variables in makefile and lets the autotools machinery to substitute, but is it really worthy? I do not want to let this patch die. J. From ptisnovs at icedtea.classpath.org Fri May 17 05:58:02 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 17 May 2013 12:58:02 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltAffineTransformOp t... Message-ID: changeset 2fdf9c72f3e4 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2fdf9c72f3e4 author: Pavel Tisnovsky date: Fri May 17 15:01:29 2013 +0200 Six new tests added into BitBltAffineTransformOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineTransformOp.java | 87 ++++++++++++++++- 2 files changed, 90 insertions(+), 2 deletions(-) diffs (116 lines): diff -r 51cd89f835e7 -r 2fdf9c72f3e4 ChangeLog --- a/ChangeLog Thu May 16 10:37:27 2013 +0200 +++ b/ChangeLog Fri May 17 15:01:29 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-17 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java: + Six new tests added into BitBltAffineTransformOp test suite. + 2013-05-16 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r 51cd89f835e7 -r 2fdf9c72f3e4 src/org/gfxtest/testsuites/BitBltAffineTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Thu May 16 10:37:27 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Fri May 17 15:01:29 2013 +0200 @@ -1,7 +1,7 @@ /* Java gfx-test framework - Copyright (C) 2012 Red Hat + Copyright (C) 2012, 2013 Red Hat This file is part of IcedTea. @@ -169,7 +169,90 @@ return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); } - + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); + } + /** * Entry point to the test suite. * From jvanek at redhat.com Fri May 17 06:16:25 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 15:16:25 +0200 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties on some OSs In-Reply-To: <5196297A.1030205@redhat.com> References: <201305171158.r4HBwqfG020733@mail-web01.excite.co.jp> <5196297A.1030205@redhat.com> Message-ID: <51962DA9.3000205@redhat.com> On 05/17/2013 02:58 PM, Jiri Vanek wrote: > On 05/17/2013 01:58 PM, Jacob Wisor wrote: >> "Jiri Vanek" wrote: >>> [...] >>> Btw will you update the manifest patch? Imho worthy O:) >>> >> >> I have looked into that further, but I must admit that I am confused by the whole autoconf and automake infrastructure. Way too complicated to just solve a relatively simple problem... It might have been okay 20 years ago to use that sceme, but fortunetelly there are better tools now, ;) >> >> Jacob >> > > diff --git a/netx.manifest.in b/netx.manifest.in > --- a/netx.manifest.in > +++ b/netx.manifest.in > @@ -1,2 +1,8 @@ > Implementation-Title: @PACKAGE_NAME@ > Implementation-Version: @FULL_VERSION@ > +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web > +Implementation-Vendor: IcedTea > +Specification-Title: JSR56: Java Network Launching Protocol and API > +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 > +Specification-Vendor: Java Community Process > +Specification-Version: 6.0 > > > I'm for this slightly updated (just vendor changed) manifest to go in. No more variables are needed > at this time. > > Of course we can define all VENDOR, PACKAGE_URL as variables in makefile and lets the autotools > machinery to substitute, but is it really worthy? > damn - PACKAGE_URL works for me. Sorry. so: +Implementation-URL: @PACKAGE_URL@ > I do not want to let this patch die. > > J. > From omajid at redhat.com Fri May 17 07:26:15 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 17 May 2013 10:26:15 -0400 Subject: [icedtea-web][rfc] Fix of backup of deployment.properties on some OSs In-Reply-To: <51962DA9.3000205@redhat.com> References: <201305171158.r4HBwqfG020733@mail-web01.excite.co.jp> <5196297A.1030205@redhat.com> <51962DA9.3000205@redhat.com> Message-ID: <51963E07.4080306@redhat.com> On 05/17/2013 09:16 AM, Jiri Vanek wrote: > On 05/17/2013 02:58 PM, Jiri Vanek wrote: >> On 05/17/2013 01:58 PM, Jacob Wisor wrote: >>> "Jiri Vanek" wrote: >>>> [...] >>>> Btw will you update the manifest patch? Imho worthy O:) >>>> >> diff --git a/netx.manifest.in b/netx.manifest.in >> --- a/netx.manifest.in >> +++ b/netx.manifest.in >> @@ -1,2 +1,8 @@ >> Implementation-Title: @PACKAGE_NAME@ >> Implementation-Version: @FULL_VERSION@ >> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >> +Implementation-Vendor: IcedTea >> +Specification-Title: JSR56: Java Network Launching Protocol and API >> +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 >> +Specification-Vendor: Java Community Process >> +Specification-Version: 6.0 > +Implementation-URL: @PACKAGE_URL@ Looks good to me. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at redhat.com Fri May 17 07:32:01 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 16:32:01 +0200 Subject: [icedtea-web] itweb-settings launcher does not accept -J switch to pass args to JVM In-Reply-To: <51934A3C.8030400@redhat.com> References: <201305142352.r4ENqIvW029989@mail-web01.excite.co.jp> <51934A3C.8030400@redhat.com> Message-ID: <51963F61.8060600@redhat.com> On 05/15/2013 10:41 AM, Jiri Vanek wrote: > On 05/15/2013 01:52 AM, Jacob Wisor wrote: >> "Adam Domurad" wrote: >>> On 05/14/2013 04:11 PM, Jacob Wisor wrote: >>>> Hello there! >>>> >>>> The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. >>> >>> What sort of parameters could you possibly require ? It's a very simple >>> application. >>> If you're doing something this oddball it isn't too much of a stretch >>> that you edit the shell script itself. >> >> Well, for example setting system properties with the -D switch is a common practice or some specific JVM switches that may be required on some configurations. Sure, administrators could edit the launch script, but it has become quite complex by now and administrators would need to waste time on adding this functionaliy while it is virtually identical to javaws launcher's in that respect. Would not it be nice, if life were easy and tools simply stuck to the "convention" to help users get thier jobs done? ;-) Although the -J switch is not required by spec, it probably would be good to interpret it as a convention. >> >>> As for javaws having it, I believe this is part of the spec. >> >> That is true. Nevertheless, itweb-settings is a proxy tool and as for such, it would not hurt or maybe even help users to have that functionality provided. >> >> All I am asking is, whether it would make sense to invest the time and effort to get it done, so that it is probably going to finds its way into the repository, or whether there are any objections. >> >> Regards, >> Jacob >> > > What about this suggestion - generate both itw and javaws launchers from one template? The only > difference is then main class... And itw-settings will just benefit form this... Eg like attached patch? J. -------------- next part -------------- A non-text attachment was scrubbed... Name: unifiedLaunchers.diff Type: text/x-patch Size: 7760 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/8890e1d0/unifiedLaunchers.diff From adomurad at redhat.com Fri May 17 07:59:49 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 17 May 2013 10:59:49 -0400 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <51960EC0.7050609@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> Message-ID: <519645E5.2010603@redhat.com> On 05/17/2013 07:04 AM, Jiri Vanek wrote: > > Here you go:) > > > J. > > On 05/15/2013 05:55 PM, Adam Domurad wrote: >> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>> When applet calls JavaScript function, which calls back to appelt, >>> then *mostly* deadlock occurs. >>> I made several attempts to fix this more generally, but I was >>> unsuccessful. >>> >>> So this "hack" is preventing deadlock, maybe also the timeout can be >>> a bit shorter... >>> >>> Although this is for both head and 1.4, for head some more >>> investigations are needed later. >>> >>> J. >>> >>> ps,reproducer in progress. >> >> Hi, thanks for looking into it. Probably good idea to remove >> dead-lock potential. >> >>> diff -r 9f2d8381f5f1 >>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri >>> May 03 16:17:08 2013 +0200 >>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon >>> May 06 16:06:59 2013 +0200 >>> @@ -1305,8 +1305,16 @@ >>> PluginDebug.debug("wait ToString request 1"); >>> synchronized (request) { >>> PluginDebug.debug("wait ToString request 2"); >>> - while (request.isDone() == false) >>> - request.wait(); >>> + int counter = 0; >>> + while (request.isDone() == false){ >>> + // Do not wait indefinitely to avoid the >>> potential of deadlock >>> + // but this will destroy the intentional >>> recursion ? >>> + counter++; >>> + if (counter>10){ >>> + throw new InterruptedException("Possible >>> deadlock, releasing"); >>> + } >>> + request.wait(1000); >>> + } >>> PluginDebug.debug("wait ToString request 3"); >>> } >>> } catch (InterruptedException e) { >>> >> >> This is more complex than it needs to be. >> More simple is: >> >> if (!request.isDone()) { >> request.wait(REQUEST_TIMEOUT); >> } >> if (!request.isDone()) { >> // Do not wait indefinitely to avoid the potential of deadlock >> throw new RuntimeException("Possible deadlock, releasing"); >> } >> >> Your message gets tossed aside and a RuntimeException is thrown if >> you throw InterruptedException, >> more direct is better. >> >> Also please put this in its own method, eg waitForRequestCompletion >> (probably good to encapsulate >> the 'catch InterruptedException' here). There are many methods like >> this that have a wait loop. >> Though I would like to see the reproducer before commenting more. >> >> Thanks, >> -Adam >> > RE: Reproducer only, see other email for fix > diff -r 1b1e547ccb4a > tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html > Fri May 17 13:02:36 2013 +0200 > [..license snip..] > + > +--> > + > +

+ codebase="." archive="AppletJsAppletDeadlock.jar" > code="AppletJsAppletDeadlock.class" width="800" height="250"> > +

> + > diff -r 1b1e547ccb4a > tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java > Fri May 17 13:02:36 2013 +0200 > @@ -0,0 +1,89 @@ > +[..license snip..] > + > +public class AppletJsAppletDeadlock extends java.applet.Applet { > + > + private TextArea outputText = null; > + > + public void printOutput(String msg) { > + System.out.println(msg); > + outputText.setText(outputText.getText() + msg + "\n"); > + } > + > + public void jsCallback(String location) { > + printOutput("Callback function called"); > + > + // try requesting the page > + try { > + URL url = new URL(location); > + URLConnection con = url.openConnection(); > + BufferedReader br = new BufferedReader(new InputStreamReader( > + con.getInputStream())); > + > + String line; > + while ((line = br.readLine()) != null) { > + System.err.println(line); > + } Why do you request the page ? I can't quite see how it's related to the test. It seems like it could just be a simple print statement. > + > + printOutput("Succesfully connected to " + location); > + } catch (Exception e) { > + printOutput("Failed to connect to '" + location + "': " + > e.getMessage()); > + } > + > + } > + > + @Override > + public void start() { > +// public void init() { Drop comment line > + outputText = new TextArea("", 12, 95); This is just for visual information right ? It makes the test slightly more complicated than it needs to be, but OK if you think it helps. > + this.add(outputText); > + > + printOutput("AppletJsAppletDeadlock started"); > + > + JSObject win = JSObject.getWindow(this); > + win.eval("callApplet();"); > + > + printOutput("JS call finished"); > + } > +} > diff -r 1b1e547ccb4a > tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java > Fri May 17 13:02:36 2013 +0200 > @@ -0,0 +1,67 @@ > +[..license snip..] > + > +public class AppletJsAppletDeadlockTest extends BrowserTest { > + > + private static final String called = "Callback function called"; > + private static final String started = "AppletJsAppletDeadlock > started"; > + private static final String finished = "JS call finished"; > + > + private static final RulesFolowingClosingListener.ContainsRule > calledRule = new RulesFolowingClosingListener.ContainsRule(called); > + private static final RulesFolowingClosingListener.ContainsRule > startedRule = new RulesFolowingClosingListener.ContainsRule(started); > + private static final RulesFolowingClosingListener.ContainsRule > finishedRule= new RulesFolowingClosingListener.ContainsRule(finished); Pretty hard to read. Simpler please. I doubt it's better than just making an assertContains method. > + > + @Test > + @NeedsDisplay > + @TestInBrowsers(testIn = Browsers.one) > + public void callAppletJsAppletNotDeadlock() throws Exception { > + ProcessResult processResult = > server.executeBrowser("AppletJsAppletDeadlock.html", new > RulesFolowingClosingListener(finishedRule), null); > + Assert.assertTrue(startedRule.toPassingString(), > startedRule.evaluate(processResult.stdout)); > + Assert.assertTrue(finishedRule.toPassingString(), > finishedRule.evaluate(processResult.stdout)); Pretty hard to read. It looks like a lot more than a simple string match. > + //this is representing another error, not sure now it is > worthy to be fixed Why is this not occurring ? Is it because of the timeout you introduced ? IMHO it should be a known-to-fail case. I don't think you should give the impression that your 'fix' is the last word here. > + //Assert.assertTrue(calledRule.toPassingString(), > calledRuleRule.evaluate(processResult.stdout)); > + } > +} Happy hacking, -Adam From adomurad at redhat.com Fri May 17 08:10:46 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 17 May 2013 11:10:46 -0400 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <51960EC0.7050609@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> Message-ID: <51964876.8060603@redhat.com> On 05/17/2013 07:04 AM, Jiri Vanek wrote: > > Here you go:) > > > J. > > On 05/15/2013 05:55 PM, Adam Domurad wrote: >> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>> When applet calls JavaScript function, which calls back to appelt, >>> then *mostly* deadlock occurs. >>> I made several attempts to fix this more generally, but I was >>> unsuccessful. >>> >>> So this "hack" is preventing deadlock, maybe also the timeout can be >>> a bit shorter... >>> >>> Although this is for both head and 1.4, for head some more >>> investigations are needed later. >>> >>> J. >>> >>> ps,reproducer in progress. >> >> Hi, thanks for looking into it. Probably good idea to remove >> dead-lock potential. >> >>> diff -r 9f2d8381f5f1 >>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri >>> May 03 16:17:08 2013 +0200 >>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon >>> May 06 16:06:59 2013 +0200 >>> @@ -1305,8 +1305,16 @@ >>> PluginDebug.debug("wait ToString request 1"); >>> synchronized (request) { >>> PluginDebug.debug("wait ToString request 2"); >>> - while (request.isDone() == false) >>> - request.wait(); >>> + int counter = 0; >>> + while (request.isDone() == false){ >>> + // Do not wait indefinitely to avoid the potential of deadlock >>> + // but this will destroy the intentional recursion ? >>> + counter++; >>> + if (counter>10){ >>> + throw new InterruptedException("Possible deadlock, releasing"); >>> + } >>> + request.wait(1000); >>> + } >>> PluginDebug.debug("wait ToString request 3"); >>> } >>> } catch (InterruptedException e) { >>> >> >> This is more complex than it needs to be. >> More simple is: >> >> if (!request.isDone()) { >> request.wait(REQUEST_TIMEOUT); >> } >> if (!request.isDone()) { >> // Do not wait indefinitely to avoid the potential of deadlock >> throw new RuntimeException("Possible deadlock, releasing"); >> } >> >> Your message gets tossed aside and a RuntimeException is thrown if >> you throw InterruptedException, >> more direct is better. >> >> Also please put this in its own method, eg waitForRequestCompletion >> (probably good to encapsulate >> the 'catch InterruptedException' here). There are many methods like >> this that have a wait loop. >> Though I would like to see the reproducer before commenting more. >> >> Thanks, >> -Adam >> > RE: the newest fix (well, fix for dead-lock) > diff -r 1b1e547ccb4a > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May > 15 12:14:26 2013 +0200 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May > 17 13:02:36 2013 +0200 > @@ -181,6 +181,18 @@ > > > private SplashPanel splashPanel; > + > + private static long REQUEST_TIMEOUT=2000;//2s I am a little fearful of legitimate requests that take >2 seconds. There are some monstrous Javascript functions out there; this timeout is a hard limit on arbitrary Javascript code. I'd sleep easier if it were at least a minute (I know this would break the reproducer, but you could set the time-out longer). We're just asking for confusing regressions otherwise (at least if we *do* cause a regression with Javascript code that takes a minute, it will be fairly obvious). > + > + private static void waitForRequestCompletion(PluginCallRequest > request) throws RuntimeException, InterruptedException { You don't need to declare you're throwing RuntimeException, and I don't think it's in good style. Also you can encapsulate the 'catch (InterruptedException)' rethrow logic here. > + if (!request.isDone()) { > + request.wait(REQUEST_TIMEOUT); > + } > + if (!request.isDone()) { > + // Do not wait indefinitely to avoid the potential of deadlock > + throw new RuntimeException("Possible deadlock, releasing"); > + } > + } > > /** > * Null constructor to allow instantiation via newInstance() > @@ -1305,8 +1317,7 @@ > PluginDebug.debug("wait ToString request 1"); > synchronized (request) { > PluginDebug.debug("wait ToString request 2"); > - while (request.isDone() == false) > - request.wait(); > + waitForRequestCompletion(request); > PluginDebug.debug("wait ToString request 3"); > } > } catch (InterruptedException e) { Surely this method should be used anywhere that 'while (request.isDone() == false)' was used. Unless you see a reason it shouldn't. Happy hacking, -Adam From jvanek at redhat.com Fri May 17 08:12:53 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 17:12:53 +0200 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <519645E5.2010603@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> <519645E5.2010603@redhat.com> Message-ID: <519648F5.4040901@redhat.com> On 05/17/2013 04:59 PM, Adam Domurad wrote: > On 05/17/2013 07:04 AM, Jiri Vanek wrote: >> >> Here you go:) >> >> >> J. >> >> On 05/15/2013 05:55 PM, Adam Domurad wrote: >>> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>>> When applet calls JavaScript function, which calls back to appelt, then *mostly* deadlock occurs. >>>> I made several attempts to fix this more generally, but I was unsuccessful. >>>> >>>> So this "hack" is preventing deadlock, maybe also the timeout can be a bit shorter... >>>> >>>> Although this is for both head and 1.4, for head some more investigations are needed later. >>>> >>>> J. >>>> >>>> ps,reproducer in progress. >>> >>> Hi, thanks for looking into it. Probably good idea to remove dead-lock potential. >>> >>>> diff -r 9f2d8381f5f1 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 03 16:17:08 2013 +0200 >>>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 06 16:06:59 2013 +0200 >>>> @@ -1305,8 +1305,16 @@ >>>> PluginDebug.debug("wait ToString request 1"); >>>> synchronized (request) { >>>> PluginDebug.debug("wait ToString request 2"); >>>> - while (request.isDone() == false) >>>> - request.wait(); >>>> + int counter = 0; >>>> + while (request.isDone() == false){ >>>> + // Do not wait indefinitely to avoid the potential of deadlock >>>> + // but this will destroy the intentional recursion ? >>>> + counter++; >>>> + if (counter>10){ >>>> + throw new InterruptedException("Possible deadlock, releasing"); >>>> + } >>>> + request.wait(1000); >>>> + } >>>> PluginDebug.debug("wait ToString request 3"); >>>> } >>>> } catch (InterruptedException e) { >>>> >>> >>> This is more complex than it needs to be. >>> More simple is: >>> >>> if (!request.isDone()) { >>> request.wait(REQUEST_TIMEOUT); >>> } >>> if (!request.isDone()) { >>> // Do not wait indefinitely to avoid the potential of deadlock >>> throw new RuntimeException("Possible deadlock, releasing"); >>> } >>> >>> Your message gets tossed aside and a RuntimeException is thrown if you throw InterruptedException, >>> more direct is better. >>> >>> Also please put this in its own method, eg waitForRequestCompletion (probably good to encapsulate >>> the 'catch InterruptedException' here). There are many methods like this that have a wait loop. >>> Though I would like to see the reproducer before commenting more. >>> >>> Thanks, >>> -Adam >>> >> > > RE: Reproducer only, see other email for fix > >> diff -r 1b1e547ccb4a >> tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html Fri >> May 17 13:02:36 2013 +0200 >> [..license snip..] >> + >> +--> >> + >> +

> + codebase="." archive="AppletJsAppletDeadlock.jar" >> code="AppletJsAppletDeadlock.class" width="800" height="250"> >> +

>> + >> diff -r 1b1e547ccb4a tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java Fri May 17 >> 13:02:36 2013 +0200 >> @@ -0,0 +1,89 @@ >> +[..license snip..] >> + >> +public class AppletJsAppletDeadlock extends java.applet.Applet { >> + >> + private TextArea outputText = null; >> + >> + public void printOutput(String msg) { >> + System.out.println(msg); >> + outputText.setText(outputText.getText() + msg + "\n"); >> + } >> + >> + public void jsCallback(String location) { >> + printOutput("Callback function called"); >> + >> + // try requesting the page >> + try { >> + URL url = new URL(location); >> + URLConnection con = url.openConnection(); >> + BufferedReader br = new BufferedReader(new InputStreamReader( >> + con.getInputStream())); >> + >> + String line; >> + while ((line = br.readLine()) != null) { >> + System.err.println(line); >> + } > > Why do you request the page ? I can't quite see how it's related to the test. It seems like it could > just be a simple print statement. hmhm yeees. This is result of playing with it too much. If you insists, I will remove. > >> + >> + printOutput("Succesfully connected to " + location); >> + } catch (Exception e) { >> + printOutput("Failed to connect to '" + location + "': " + e.getMessage()); >> + } >> + >> + } >> + >> + @Override >> + public void start() { >> +// public void init() { > > Drop comment line nope. > >> + outputText = new TextArea("", 12, 95); > > This is just for visual information right ? It makes the test slightly more complicated than it > needs to be, but OK if you think it helps. > >> + this.add(outputText); >> + >> + printOutput("AppletJsAppletDeadlock started"); >> + >> + JSObject win = JSObject.getWindow(this); >> + win.eval("callApplet();"); >> + >> + printOutput("JS call finished"); >> + } >> +} >> diff -r 1b1e547ccb4a >> tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java >> Fri May 17 13:02:36 2013 +0200 >> @@ -0,0 +1,67 @@ >> +[..license snip..] >> + >> +public class AppletJsAppletDeadlockTest extends BrowserTest { >> + >> + private static final String called = "Callback function called"; >> + private static final String started = "AppletJsAppletDeadlock started"; >> + private static final String finished = "JS call finished"; >> + >> + private static final RulesFolowingClosingListener.ContainsRule calledRule = new >> RulesFolowingClosingListener.ContainsRule(called); >> + private static final RulesFolowingClosingListener.ContainsRule startedRule = new >> RulesFolowingClosingListener.ContainsRule(started); >> + private static final RulesFolowingClosingListener.ContainsRule finishedRule= new >> RulesFolowingClosingListener.ContainsRule(finished); > > Pretty hard to read. Simpler please. I doubt it's better than just making an assertContains method. Definitely NOPE. This is what rules were designed for and this is the cleanest way how to avoid doubling the code and still writing the same messages. > >> + >> + @Test >> + @NeedsDisplay >> + @TestInBrowsers(testIn = Browsers.one) >> + public void callAppletJsAppletNotDeadlock() throws Exception { >> + ProcessResult processResult = server.executeBrowser("AppletJsAppletDeadlock.html", new >> RulesFolowingClosingListener(finishedRule), null); >> + Assert.assertTrue(startedRule.toPassingString(), >> startedRule.evaluate(processResult.stdout)); >> + Assert.assertTrue(finishedRule.toPassingString(), >> finishedRule.evaluate(processResult.stdout)); > > Pretty hard to read. It looks like a lot more than a simple string match. the same as above :-///////// > >> + //this is representing another error, not sure now it is worthy to be fixed > > Why is this not occurring ? Is it because of the timeout you introduced ? IMHO it should be a > known-to-fail case. I don't think you should give the impression that your 'fix' is the last word here. Yap. You hit the issue, I'm wondering you have not read it from "fix-part". When the timeout bubble out, then the whole stack is halted. So when applet>js->applet(deadlock)->js (expectations) Then expectation is never executed. I was thinking about second test, which will do the same, and one more assert and will be knowntofail. But As I probably do not want to fix it completely, than I do not want to add test testing some unfixible thing. But I can add if you wont. I was 50/50 with it. Thanx for review! J. Ps - Hey you are *real* nitpicker now... Not every line of code have to be by your will. And tbh - those rules are exactly for this purpose and are cleanest way how to avoid writing to much same/similar code. From adomurad at redhat.com Fri May 17 08:37:17 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 17 May 2013 11:37:17 -0400 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <519648F5.4040901@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> <519645E5.2010603@redhat.com> <519648F5.4040901@redhat.com> Message-ID: <51964EAD.3020008@redhat.com> On 05/17/2013 11:12 AM, Jiri Vanek wrote: > On 05/17/2013 04:59 PM, Adam Domurad wrote: >> On 05/17/2013 07:04 AM, Jiri Vanek wrote: >>> >>> Here you go:) >>> >>> >>> J. >>> >>> On 05/15/2013 05:55 PM, Adam Domurad wrote: >>>> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>>>> When applet calls JavaScript function, which calls back to appelt, >>>>> then *mostly* deadlock occurs. >>>>> I made several attempts to fix this more generally, but I was >>>>> unsuccessful. >>>>> >>>>> So this "hack" is preventing deadlock, maybe also the timeout can >>>>> be a bit shorter... >>>>> >>>>> Although this is for both head and 1.4, for head some more >>>>> investigations are needed later. >>>>> >>>>> J. >>>>> >>>>> ps,reproducer in progress. >>>> >>>> Hi, thanks for looking into it. Probably good idea to remove >>>> dead-lock potential. >>>> >>>>> diff -r 9f2d8381f5f1 >>>>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>>>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri >>>>> May 03 16:17:08 2013 +0200 >>>>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon >>>>> May 06 16:06:59 2013 +0200 >>>>> @@ -1305,8 +1305,16 @@ >>>>> PluginDebug.debug("wait ToString request 1"); >>>>> synchronized (request) { >>>>> PluginDebug.debug("wait ToString request 2"); >>>>> - while (request.isDone() == false) >>>>> - request.wait(); >>>>> + int counter = 0; >>>>> + while (request.isDone() == false){ >>>>> + // Do not wait indefinitely to avoid the >>>>> potential of deadlock >>>>> + // but this will destroy the intentional >>>>> recursion ? >>>>> + counter++; >>>>> + if (counter>10){ >>>>> + throw new InterruptedException("Possible >>>>> deadlock, releasing"); >>>>> + } >>>>> + request.wait(1000); >>>>> + } >>>>> PluginDebug.debug("wait ToString request 3"); >>>>> } >>>>> } catch (InterruptedException e) { >>>>> >>>> >>>> This is more complex than it needs to be. >>>> More simple is: >>>> >>>> if (!request.isDone()) { >>>> request.wait(REQUEST_TIMEOUT); >>>> } >>>> if (!request.isDone()) { >>>> // Do not wait indefinitely to avoid the potential of deadlock >>>> throw new RuntimeException("Possible deadlock, releasing"); >>>> } >>>> >>>> Your message gets tossed aside and a RuntimeException is thrown if >>>> you throw InterruptedException, >>>> more direct is better. >>>> >>>> Also please put this in its own method, eg waitForRequestCompletion >>>> (probably good to encapsulate >>>> the 'catch InterruptedException' here). There are many methods like >>>> this that have a wait loop. >>>> Though I would like to see the reproducer before commenting more. >>>> >>>> Thanks, >>>> -Adam >>>> >>> >> >> RE: Reproducer only, see other email for fix >> >>> diff -r 1b1e547ccb4a >>> tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html >>> >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ >>> b/tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html >>> Fri >>> May 17 13:02:36 2013 +0200 >>> [..license snip..] >>> + >>> +--> >>> + >>> +

>> + codebase="." archive="AppletJsAppletDeadlock.jar" >>> code="AppletJsAppletDeadlock.class" width="800" height="250"> >>> +

>>> + >>> diff -r 1b1e547ccb4a >>> tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ >>> b/tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java >>> Fri May 17 >>> 13:02:36 2013 +0200 >>> @@ -0,0 +1,89 @@ >>> +[..license snip..] >>> + >>> +public class AppletJsAppletDeadlock extends java.applet.Applet { >>> + >>> + private TextArea outputText = null; >>> + >>> + public void printOutput(String msg) { >>> + System.out.println(msg); >>> + outputText.setText(outputText.getText() + msg + "\n"); >>> + } >>> + >>> + public void jsCallback(String location) { >>> + printOutput("Callback function called"); >>> + >>> + // try requesting the page >>> + try { >>> + URL url = new URL(location); >>> + URLConnection con = url.openConnection(); >>> + BufferedReader br = new BufferedReader(new >>> InputStreamReader( >>> + con.getInputStream())); >>> + >>> + String line; >>> + while ((line = br.readLine()) != null) { >>> + System.err.println(line); >>> + } >> >> Why do you request the page ? I can't quite see how it's related to >> the test. It seems like it could >> just be a simple print statement. > > hmhm yeees. This is result of playing with it too much. > > If you insists, I will remove. Please remove, then. >> >>> + >>> + printOutput("Succesfully connected to " + location); >>> + } catch (Exception e) { >>> + printOutput("Failed to connect to '" + location + "': " >>> + e.getMessage()); >>> + } >>> + >>> + } >>> + >>> + @Override >>> + public void start() { >>> +// public void init() { >> >> Drop comment line > > nope. Sorry if I have missed the value here. Care to explain ? I do not insist either way. >> >>> + outputText = new TextArea("", 12, 95); >> >> This is just for visual information right ? It makes the test >> slightly more complicated than it >> needs to be, but OK if you think it helps. >> >>> + this.add(outputText); >>> + >>> + printOutput("AppletJsAppletDeadlock started"); >>> + >>> + JSObject win = JSObject.getWindow(this); >>> + win.eval("callApplet();"); >>> + >>> + printOutput("JS call finished"); >>> + } >>> +} >>> diff -r 1b1e547ccb4a >>> tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java >>> >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ >>> b/tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java >>> Fri May 17 13:02:36 2013 +0200 >>> @@ -0,0 +1,67 @@ >>> +[..license snip..] >>> + >>> +public class AppletJsAppletDeadlockTest extends BrowserTest { >>> + >>> + private static final String called = "Callback function called"; >>> + private static final String started = "AppletJsAppletDeadlock >>> started"; >>> + private static final String finished = "JS call finished"; >>> + >>> + private static final RulesFolowingClosingListener.ContainsRule >>> calledRule = new >>> RulesFolowingClosingListener.ContainsRule(called); >>> + private static final RulesFolowingClosingListener.ContainsRule >>> startedRule = new >>> RulesFolowingClosingListener.ContainsRule(started); >>> + private static final RulesFolowingClosingListener.ContainsRule >>> finishedRule= new >>> RulesFolowingClosingListener.ContainsRule(finished); >> >> Pretty hard to read. Simpler please. I doubt it's better than just >> making an assertContains method. > > Definitely NOPE. > > This is what rules were designed for and this is the cleanest way how > to avoid doubling the code and still writing the same messages. Ok, see below. > >> >>> + >>> + @Test >>> + @NeedsDisplay >>> + @TestInBrowsers(testIn = Browsers.one) >>> + public void callAppletJsAppletNotDeadlock() throws Exception { >>> + ProcessResult processResult = >>> server.executeBrowser("AppletJsAppletDeadlock.html", new >>> RulesFolowingClosingListener(finishedRule), null); >>> + Assert.assertTrue(startedRule.toPassingString(), >>> startedRule.evaluate(processResult.stdout)); >>> + Assert.assertTrue(finishedRule.toPassingString(), >>> finishedRule.evaluate(processResult.stdout)); >> >> Pretty hard to read. It looks like a lot more than a simple string >> match. > > the same as above :-///////// Ok, see below. > >> >>> + //this is representing another error, not sure now it is >>> worthy to be fixed >> >> Why is this not occurring ? Is it because of the timeout you >> introduced ? IMHO it should be a >> known-to-fail case. I don't think you should give the impression that >> your 'fix' is the last word here. > > Yap. You hit the issue, I'm wondering you have not read it from > "fix-part". I have, but the comment 'another error' threw me off. > > > When the timeout bubble out, then the whole stack is halted. > So when applet>js->applet(deadlock)->js (expectations) > Then expectation is never executed. > > I was thinking about second test, which will do the same, and one > more assert and will be knowntofail. But As I probably do not want to > fix it completely, than I do not want to add test testing some > unfixible thing. Is it really unfixable ? I think a known-to-fail is deserving regardless. Even more so if it's not worth trying to fix -- you can leave comments here for the next poor soul who tries :-)) > > But I can add if you wont. I was 50/50 with it. > > Thanx for review! > > J. > > > Ps - Hey you are *real* nitpicker now... Not every line of code have > to be by your will. And tbh - those rules are exactly for this purpose > and are cleanest way how to avoid writing to much same/similar code. Sorry, they won't be insisted and I understand. I do think there are cleaner solutions with a lot less boilerplate though. It was tricky to mentally correlate the lines with the strings they match against. Happy hacking, -Adam From jvanek at redhat.com Fri May 17 08:48:07 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 17 May 2013 17:48:07 +0200 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <51964876.8060603@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> <51964876.8060603@redhat.com> Message-ID: <51965137.1090106@redhat.com> On 05/17/2013 05:10 PM, Adam Domurad wrote: > On 05/17/2013 07:04 AM, Jiri Vanek wrote: >> >> Here you go:) >> >> >> J. >> >> On 05/15/2013 05:55 PM, Adam Domurad wrote: >>> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>>> When applet calls JavaScript function, which calls back to appelt, >>>> then *mostly* deadlock occurs. >>>> I made several attempts to fix this more generally, but I was >>>> unsuccessful. >>>> >>>> So this "hack" is preventing deadlock, maybe also the timeout can be >>>> a bit shorter... >>>> >>>> Although this is for both head and 1.4, for head some more >>>> investigations are needed later. >>>> >>>> J. >>>> >>>> ps,reproducer in progress. >>> >>> Hi, thanks for looking into it. Probably good idea to remove >>> dead-lock potential. >>> >>>> diff -r 9f2d8381f5f1 >>>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri >>>> May 03 16:17:08 2013 +0200 >>>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon >>>> May 06 16:06:59 2013 +0200 >>>> @@ -1305,8 +1305,16 @@ >>>> PluginDebug.debug("wait ToString request 1"); >>>> synchronized (request) { >>>> PluginDebug.debug("wait ToString request 2"); >>>> - while (request.isDone() == false) >>>> - request.wait(); >>>> + int counter = 0; >>>> + while (request.isDone() == false){ >>>> + // Do not wait indefinitely to avoid the potential of deadlock >>>> + // but this will destroy the intentional recursion ? >>>> + counter++; >>>> + if (counter>10){ >>>> + throw new InterruptedException("Possible deadlock, releasing"); >>>> + } >>>> + request.wait(1000); >>>> + } >>>> PluginDebug.debug("wait ToString request 3"); >>>> } >>>> } catch (InterruptedException e) { >>>> >>> >>> This is more complex than it needs to be. >>> More simple is: >>> >>> if (!request.isDone()) { >>> request.wait(REQUEST_TIMEOUT); >>> } >>> if (!request.isDone()) { >>> // Do not wait indefinitely to avoid the potential of deadlock >>> throw new RuntimeException("Possible deadlock, releasing"); >>> } >>> >>> Your message gets tossed aside and a RuntimeException is thrown if >>> you throw InterruptedException, >>> more direct is better. >>> >>> Also please put this in its own method, eg waitForRequestCompletion >>> (probably good to encapsulate >>> the 'catch InterruptedException' here). There are many methods like >>> this that have a wait loop. >>> Though I would like to see the reproducer before commenting more. >>> >>> Thanks, >>> -Adam >>> >> > > RE: the newest fix (well, fix for dead-lock) > >> diff -r 1b1e547ccb4a >> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May >> 15 12:14:26 2013 +0200 >> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May >> 17 13:02:36 2013 +0200 >> @@ -181,6 +181,18 @@ >> >> >> private SplashPanel splashPanel; >> + >> + private static long REQUEST_TIMEOUT=2000;//2s > > I am a little fearful of legitimate requests that take >2 seconds. There > are some monstrous Javascript functions out there; this timeout is a > hard limit on arbitrary Javascript code. I'd sleep easier if it were at > least a minute (I know this would break the reproducer, but you could > set the time-out longer). We're just asking for confusing regressions > otherwise (at least if we *do* cause a regression with Javascript code > that takes a minute, it will be fairly obvious). Hmhm. No issue with reproducer of course. At first I had 10s and it sounded to me like an ages... Do you really wont such an long timeout? Although I see your concern.... my bargain is going to 20s.. Ouch I would love 10.. but it is to low under your offer :) The vote against the "monstrous Javascript functions out there" :)) is that js->applet->js should not be such an evil construction, Well - js->applet or applet-> js can be... but... Well Its the same loop isnt it? Then your minute will probably win. (reproducer need update now, but after your reply) > >> + >> + private static void waitForRequestCompletion(PluginCallRequest >> request) throws RuntimeException, InterruptedException { > > You don't need to declare you're throwing RuntimeException, and I don't > think it's in good style. :DDD Sorry, good catch! > Also you can encapsulate the 'catch (InterruptedException)' rethrow > logic here. As runtime exception? Probably good idea. > >> + if (!request.isDone()) { >> + request.wait(REQUEST_TIMEOUT); >> + } >> + if (!request.isDone()) { >> + // Do not wait indefinitely to avoid the potential of deadlock >> + throw new RuntimeException("Possible deadlock, releasing"); >> + } >> + } >> >> /** >> * Null constructor to allow instantiation via newInstance() >> @@ -1305,8 +1317,7 @@ >> PluginDebug.debug("wait ToString request 1"); >> synchronized (request) { >> PluginDebug.debug("wait ToString request 2"); >> - while (request.isDone() == false) >> - request.wait(); >> + waitForRequestCompletion(request); >> PluginDebug.debug("wait ToString request 3"); >> } >> } catch (InterruptedException e) { > > Surely this method should be used anywhere that 'while (request.isDone() > == false)' was used. Unless you see a reason it shouldn't. As a separate changese unless you insist. Refactoring should always happen as separate changeset. Ok? -------------- next part -------------- A non-text attachment was scrubbed... Name: dadlockFix-fix2.patch Type: text/x-patch Size: 2038 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/0d0916bc/dadlockFix-fix2.patch From gitne at excite.co.jp Fri May 17 08:52:25 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sat, 18 May 2013 00:52:25 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl0gaXR3ZWItc2V0dGluZ3MgbGF1bmNoZXIgZG9lcyBub3QgYWNjZXB0IC1KIHN3aXRjaCB0byBwYXNzIGFyZ3MgdG8gSlZN?= Message-ID: <201305171552.r4HFqPIb007027@mail-web01.excite.co.jp> "Jiri Vanek" wrote: > On 05/15/2013 10:41 AM, Jiri Vanek wrote: > > On 05/15/2013 01:52 AM, Jacob Wisor wrote: > >> "Adam Domurad" wrote: > >>> On 05/14/2013 04:11 PM, Jacob Wisor wrote: > >>>> Hello there! > >>>> > >>>> The subject says it all. Is this the desired behavior? The javaws launcher does honor the -J switch. > >>> > >>> What sort of parameters could you possibly require ? It's a very simple > >>> application. > >>> If you're doing something this oddball it isn't too much of a stretch > >>> that you edit the shell script itself. > >> > >> Well, for example setting system properties with the -D switch is a common practice or some specific JVM switches that may be required on some configurations. Sure, administrators could edit the launch script, but it has become quite complex by now and administrators would need to waste time on adding this functionaliy while it is virtually identical to javaws launcher's in that respect. Would not it be nice, if life were easy and tools simply stuck to the "convention" to help users get thier jobs done? ;-) Although the -J switch is not required by spec, it probably would be good to interpret it as a convention. > >> > >>> As for javaws having it, I believe this is part of the spec. > >> > >> That is true. Nevertheless, itweb-settings is a proxy tool and as for such, it would not hurt or maybe even help users to have that functionality provided. > >> > >> All I am asking is, whether it would make sense to invest the time and effort to get it done, so that it is probably going to finds its way into the repository, or whether there are any objections. > >> > >> Regards, > >> Jacob > >> > > > > What about this suggestion - generate both itw and javaws launchers from one template? The only > > difference is then main class... And itw-settings will just benefit form this... > > Eg like attached patch? Look good to me. Nice clean up and consolidation. From ptisnovs at icedtea.classpath.org Fri May 17 08:59:39 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 17 May 2013 15:59:39 +0000 Subject: /hg/icedtea6: Renamed three patches to be more consistent with o... Message-ID: changeset ce006f6558f1 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ce006f6558f1 author: Pavel Tisnovsky date: Fri May 17 17:58:51 2013 +0200 Renamed three patches to be more consistent with other JTreg-related patches. diffstat: ChangeLog | 17 + Makefile.am | 6 +- patches/componentOrientationTests.patch | 246 -------------------------- patches/jtreg-ComponentOrientationTests.patch | 246 ++++++++++++++++++++++++++ patches/jtreg-LayoutGetCharacterCount.patch | 54 +++++ patches/jtreg-LayoutLimits.patch | 49 +++++ patches/textLayoutGetCharacterCount.patch | 54 ----- patches/textLayoutLimits.patch | 49 ----- 8 files changed, 369 insertions(+), 352 deletions(-) diffs (truncated from 762 to 500 lines): diff -r 29eed3efba72 -r ce006f6558f1 ChangeLog --- a/ChangeLog Wed May 15 16:48:54 2013 +0200 +++ b/ChangeLog Fri May 17 17:58:51 2013 +0200 @@ -1,3 +1,20 @@ +2013-05-17 Pavel Tisnovsky + + * patches/componentOrientationTests.patch: + Renamed to... + * patches/jtreg-ComponentOrientationTests.patch: + this. + * patches/textLayoutGetCharacterCount.patch: + Renamed to... + * patches/jtreg-LayoutGetCharacterCount.patch: + this. + * patches/textLayoutLimits.patch: + Renamed to... + * patches/jtreg-LayoutLimits.patch: + this. + * Makefile.am: + Renamed three patches to be more consistent with other JTreg-related patches. + 2013-05-15 Pavel Tisnovsky * Makefile.am: diff -r 29eed3efba72 -r ce006f6558f1 Makefile.am --- a/Makefile.am Wed May 15 16:48:54 2013 +0200 +++ b/Makefile.am Fri May 17 17:58:51 2013 +0200 @@ -545,9 +545,9 @@ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ - patches/textLayoutGetCharacterCount.patch \ - patches/textLayoutLimits.patch \ - patches/componentOrientationTests.patch \ + patches/jtreg-LayoutGetCharacterCount.patch \ + patches/jtreg-LayoutLimits.patch \ + patches/jtreg-ComponentOrientationTests.patch \ patches/jtreg-TextLayoutBoundsChecks.patch if WITH_ALT_HSBUILD diff -r 29eed3efba72 -r ce006f6558f1 patches/componentOrientationTests.patch --- a/patches/componentOrientationTests.patch Wed May 15 16:48:54 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,246 +0,0 @@ -diff -uN ComponentOrientation/ComponentOrientationTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,77 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentOrientationTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation subsystem works properly. -+ */ -+public class ComponentOrientationTest { -+ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA"); -+ JLabel label2 = new JLabel("JAVA"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ -+ // test the order of two components -+ if (rect1.x >= rect2.x) { -+ panel.dispose(); -+ throw new RuntimeException("Components are positioned in a wrong order!"); -+ } -+ if (rect1.x + rect1.width >= rect2.x) { -+ panel.dispose(); -+ throw new RuntimeException("Components are positioned on the same place!"); -+ } -+ -+ // test vertical position of two components -+ if (rect1.y != rect2.y) { -+ panel.dispose(); -+ throw new RuntimeException("Components are not positioned on the same vertical position!"); -+ } -+ panel.dispose(); -+ } -+} -diff -uN ComponentOrientation/ComponentPlacementTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,79 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentPlacementTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation and component placement subsystem works properly. -+ */ -+public class ComponentPlacementTest -+{ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA1"); -+ JLabel label2 = new JLabel("JAVA2"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle panelRect = panel.getBounds(); -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ rect1.x += panelRect.x; -+ rect1.y += panelRect.y; -+ rect2.x += panelRect.x; -+ rect2.y += panelRect.y; -+ -+ if (!panelRect.contains(rect1)) { -+ panel.dispose(); -+ throw new RuntimeException("First component is not placed inside the frame!"); -+ } -+ if (!panelRect.contains(rect2)) { -+ panel.dispose(); -+ throw new RuntimeException("Second component is not placed inside the frame!"); -+ } -+ if (!rect1.intersection(rect2).isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("Component intersection detected!"); -+ } -+ panel.dispose(); -+ } -+ -+} -diff -uN ComponentOrientation/ComponentSizeTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,78 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentSizeTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation and component placement subsystem works properly. -+ */ -+public class ComponentSizeTest -+{ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA"); -+ JLabel label2 = new JLabel("JAVA"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ -+ if (rect1.isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("First component has zero area!"); -+ } -+ if (rect2.isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("Second component has zero area!"); -+ } -+ if (rect1.width != rect2.width) { -+ panel.dispose(); -+ throw new RuntimeException("Components should have the same width!"); -+ } -+ if (rect1.height != rect2.height) { -+ panel.dispose(); -+ throw new RuntimeException("Components should have the same height!"); -+ } -+ panel.dispose(); -+ } -+ -+} diff -r 29eed3efba72 -r ce006f6558f1 patches/jtreg-ComponentOrientationTests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-ComponentOrientationTests.patch Fri May 17 17:58:51 2013 +0200 @@ -0,0 +1,246 @@ +diff -uN ComponentOrientation/ComponentOrientationTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java +--- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 ++++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,77 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.ComponentOrientation; ++import java.awt.FlowLayout; ++import java.awt.Rectangle; ++ ++import javax.swing.JFrame; ++import javax.swing.JLabel; ++ ++/** ++ * @test ++ * @run main ComponentOrientationTest ++ * @author Pavel Tisnovsky ++ * ++ * Basic test if component orientation subsystem works properly. ++ */ ++public class ComponentOrientationTest { ++ ++ public static void main(String[] args) { ++ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; ++ ++ for (int align : aligns) { ++ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); ++ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); ++ } ++ } ++ ++ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { ++ JFrame panel = new JFrame(); ++ JLabel label1 = new JLabel("JAVA"); ++ JLabel label2 = new JLabel("JAVA"); ++ ++ panel.setLayout(new FlowLayout(align)); ++ panel.applyComponentOrientation(componentOrientation); ++ ++ panel.add(label1); ++ panel.add(label2); ++ panel.pack(); ++ ++ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); ++ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); ++ ++ // test the order of two components ++ if (rect1.x >= rect2.x) { ++ panel.dispose(); ++ throw new RuntimeException("Components are positioned in a wrong order!"); ++ } ++ if (rect1.x + rect1.width >= rect2.x) { ++ panel.dispose(); ++ throw new RuntimeException("Components are positioned on the same place!"); ++ } ++ ++ // test vertical position of two components ++ if (rect1.y != rect2.y) { ++ panel.dispose(); ++ throw new RuntimeException("Components are not positioned on the same vertical position!"); ++ } ++ panel.dispose(); ++ } ++} +diff -uN ComponentOrientation/ComponentPlacementTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java +--- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 ++++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.ComponentOrientation; ++import java.awt.FlowLayout; ++import java.awt.Rectangle; ++ ++import javax.swing.JFrame; ++import javax.swing.JLabel; ++ ++/** ++ * @test ++ * @run main ComponentPlacementTest ++ * @author Pavel Tisnovsky ++ * ++ * Basic test if component orientation and component placement subsystem works properly. ++ */ ++public class ComponentPlacementTest ++{ ++ public static void main(String[] args) { ++ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; ++ for (int align : aligns) { ++ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); ++ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); ++ } ++ } ++ ++ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { ++ JFrame panel = new JFrame(); ++ JLabel label1 = new JLabel("JAVA1"); ++ JLabel label2 = new JLabel("JAVA2"); ++ ++ panel.setLayout(new FlowLayout(align)); ++ panel.applyComponentOrientation(componentOrientation); ++ ++ panel.add(label1); ++ panel.add(label2); ++ panel.pack(); ++ ++ Rectangle panelRect = panel.getBounds(); ++ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); ++ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); ++ rect1.x += panelRect.x; ++ rect1.y += panelRect.y; ++ rect2.x += panelRect.x; ++ rect2.y += panelRect.y; ++ ++ if (!panelRect.contains(rect1)) { ++ panel.dispose(); ++ throw new RuntimeException("First component is not placed inside the frame!"); ++ } ++ if (!panelRect.contains(rect2)) { ++ panel.dispose(); ++ throw new RuntimeException("Second component is not placed inside the frame!"); ++ } ++ if (!rect1.intersection(rect2).isEmpty()) { ++ panel.dispose(); ++ throw new RuntimeException("Component intersection detected!"); ++ } ++ panel.dispose(); ++ } ++ ++} +diff -uN ComponentOrientation/ComponentSizeTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java +--- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 ++++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,78 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.ComponentOrientation; ++import java.awt.FlowLayout; ++import java.awt.Rectangle; ++ ++import javax.swing.JFrame; ++import javax.swing.JLabel; ++ ++/** ++ * @test ++ * @run main ComponentSizeTest ++ * @author Pavel Tisnovsky ++ * ++ * Basic test if component orientation and component placement subsystem works properly. ++ */ ++public class ComponentSizeTest ++{ ++ public static void main(String[] args) { ++ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; ++ for (int align : aligns) { From adomurad at redhat.com Fri May 17 09:17:53 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 17 May 2013 12:17:53 -0400 Subject: [rfc][icedtea-web] function applet -> js ->applet call deadlock In-Reply-To: <51965137.1090106@redhat.com> References: <5187CA7A.7000100@redhat.com> <519377F6.6000709@redhat.com> <5193AFE3.5000005@redhat.com> <51960EC0.7050609@redhat.com> <51964876.8060603@redhat.com> <51965137.1090106@redhat.com> Message-ID: <51965831.4080009@redhat.com> On 05/17/2013 11:48 AM, Jiri Vanek wrote: > On 05/17/2013 05:10 PM, Adam Domurad wrote: >> On 05/17/2013 07:04 AM, Jiri Vanek wrote: >>> Here you go:) >>> >>> >>> J. >>> >>> On 05/15/2013 05:55 PM, Adam Domurad wrote: >>>> On 05/15/2013 07:56 AM, Jiri Vanek wrote: >>>>> When applet calls JavaScript function, which calls back to appelt, >>>>> then *mostly* deadlock occurs. >>>>> I made several attempts to fix this more generally, but I was >>>>> unsuccessful. >>>>> >>>>> So this "hack" is preventing deadlock, maybe also the timeout can be >>>>> a bit shorter... >>>>> >>>>> Although this is for both head and 1.4, for head some more >>>>> investigations are needed later. >>>>> >>>>> J. >>>>> >>>>> ps,reproducer in progress. >>>> Hi, thanks for looking into it. Probably good idea to remove >>>> dead-lock potential. >>>> >>>>> diff -r 9f2d8381f5f1 >>>>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>>>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri >>>>> May 03 16:17:08 2013 +0200 >>>>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon >>>>> May 06 16:06:59 2013 +0200 >>>>> @@ -1305,8 +1305,16 @@ >>>>> PluginDebug.debug("wait ToString request 1"); >>>>> synchronized (request) { >>>>> PluginDebug.debug("wait ToString request 2"); >>>>> - while (request.isDone() == false) >>>>> - request.wait(); >>>>> + int counter = 0; >>>>> + while (request.isDone() == false){ >>>>> + // Do not wait indefinitely to avoid the potential of deadlock >>>>> + // but this will destroy the intentional recursion ? >>>>> + counter++; >>>>> + if (counter>10){ >>>>> + throw new InterruptedException("Possible deadlock, releasing"); >>>>> + } >>>>> + request.wait(1000); >>>>> + } >>>>> PluginDebug.debug("wait ToString request 3"); >>>>> } >>>>> } catch (InterruptedException e) { >>>>> >>>> This is more complex than it needs to be. >>>> More simple is: >>>> >>>> if (!request.isDone()) { >>>> request.wait(REQUEST_TIMEOUT); >>>> } >>>> if (!request.isDone()) { >>>> // Do not wait indefinitely to avoid the potential of deadlock >>>> throw new RuntimeException("Possible deadlock, releasing"); >>>> } >>>> >>>> Your message gets tossed aside and a RuntimeException is thrown if >>>> you throw InterruptedException, >>>> more direct is better. >>>> >>>> Also please put this in its own method, eg waitForRequestCompletion >>>> (probably good to encapsulate >>>> the 'catch InterruptedException' here). There are many methods like >>>> this that have a wait loop. >>>> Though I would like to see the reproducer before commenting more. >>>> >>>> Thanks, >>>> -Adam >>>> >> RE: the newest fix (well, fix for dead-lock) >> >>> diff -r 1b1e547ccb4a >>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May >>> 15 12:14:26 2013 +0200 >>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May >>> 17 13:02:36 2013 +0200 >>> @@ -181,6 +181,18 @@ >>> >>> >>> private SplashPanel splashPanel; >>> + >>> + private static long REQUEST_TIMEOUT=2000;//2s >> I am a little fearful of legitimate requests that take >2 seconds. There >> are some monstrous Javascript functions out there; this timeout is a >> hard limit on arbitrary Javascript code. I'd sleep easier if it were at >> least a minute (I know this would break the reproducer, but you could >> set the time-out longer). We're just asking for confusing regressions >> otherwise (at least if we *do* cause a regression with Javascript code >> that takes a minute, it will be fairly obvious). > Hmhm. No issue with reproducer of course. At first I had 10s and it sounded to me like an ages... > > Do you really wont such an long timeout? > > Although I see your concern.... my bargain is going to 20s.. Ouch I would love 10.. but it is to low > under your offer :) > > The vote against the "monstrous Javascript functions out there" :)) is that js->applet->js should > not be such an evil construction, Well - js->applet or applet-> js can be... but... Well Its the > same loop isnt it? > Then your minute will probably win. > > (reproducer need update now, but after your reply) > If you can detect re-entry, you can shorten the time. But this is a general code path, so I think we should tread carefully with one minute. (It'll make the test a bit long, but probably the lesser evil). > * Null constructor to allow instantiation via newInstance() > @@ -1305,8 +1317,7 @@ > PluginDebug.debug("wait ToString request 1"); > synchronized (request) { > PluginDebug.debug("wait ToString request 2"); > - while (request.isDone() == false) > - request.wait(); > + waitForRequestCompletion(request); > PluginDebug.debug("wait ToString request 3"); > } > } catch (InterruptedException e) { >> Surely this method should be used anywhere that 'while (request.isDone() >> == false)' was used. Unless you see a reason it shouldn't. > As a separate changese unless you insist. > Refactoring should always happen as separate changeset. Ok? Sure. > > OK to push with one minute+ changed reproducer IMO. -Adam From adomurad at icedtea.classpath.org Fri May 17 09:36:31 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 17 May 2013 16:36:31 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 29aad2f10875 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=29aad2f10875 author: Adam Domurad date: Fri May 17 12:31:32 2013 -0400 Fix PR854: Resizing an applet several times causes 100% CPU load changeset 64f7c169eb3e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64f7c169eb3e author: Adam Domurad date: Fri May 17 12:34:41 2013 -0400 Reproducer for PR854 diffstat: ChangeLog | 6 + NEWS | 2 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 13 +- tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html | 57 +++++++ tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java | 72 ++++++++++ tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java | 65 +++++++++ 6 files changed, 203 insertions(+), 12 deletions(-) diffs (254 lines): diff -r 1b1e547ccb4a -r 64f7c169eb3e ChangeLog --- a/ChangeLog Wed May 15 12:14:26 2013 +0200 +++ b/ChangeLog Fri May 17 12:34:41 2013 -0400 @@ -1,3 +1,9 @@ +2013-05-17 Adam Domurad + + Fix PR854: Resizing an applet several times causes 100% CPU load + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Replace buggy initialization wait. + 2013-05-14 Jiri Vanek Jacob Wisor diff -r 1b1e547ccb4a -r 64f7c169eb3e NEWS --- a/NEWS Wed May 15 12:14:26 2013 +0200 +++ b/NEWS Fri May 17 12:34:41 2013 -0400 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.5 (2013-XX-XX): +* Plugin + - PR854: Resizing an applet several times causes 100% CPU load New in release 1.4 (2013-XX-XX): * Added cs localization diff -r 1b1e547ccb4a -r 64f7c169eb3e plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May 15 12:14:26 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 17 12:34:41 2013 -0400 @@ -665,18 +665,7 @@ if (message.startsWith("width")) { // Wait for panel to come alive - long maxTimeToSleep = APPLET_TIMEOUT; - statusLock.lock(); - try { - while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && - maxTimeToSleep > 0) { - maxTimeToSleep -= waitTillTimeout(statusLock, initComplete, - maxTimeToSleep); - } - } - finally { - statusLock.unlock(); - } + waitForAppletInit(panel); // 0 => width, 1=> width_value, 2 => height, 3=> height_value String[] dimMsg = message.split(" "); diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html Fri May 17 12:34:41 2013 -0400 @@ -0,0 +1,57 @@ + + +

+

+ + + + + diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java Fri May 17 12:34:41 2013 -0400 @@ -0,0 +1,72 @@ + +import java.applet.Applet; + +/* AppletTest.java +Copyright (C) 2011 Red Hat, Inc. + +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, version 2. + +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. + */ +public class ResizeApplet extends Applet { + + /* Make sures the process is exited if we stall */ + private static class StallTimeoutThread extends Thread { + private static final int MILLISECONDS_TO_SLEEP = 5000; + @Override + public void run() { + try { + Thread.sleep(MILLISECONDS_TO_SLEEP); + System.out.println("*** APPLET FINISHED ***"); + } catch (InterruptedException ie) { + } + } + } + + @Override + public void init() { + new StallTimeoutThread().start(); + } + + /* Utility for Javascript-side */ + public void print(String str) { + System.out.println(str); + } + + /* Utility for Javascript-side */ + public synchronized void sleep(int time) { + try { + wait(time); + } catch (InterruptedException e) { + } + } +} diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java Fri May 17 12:34:41 2013 -0400 @@ -0,0 +1,65 @@ +/* AppletTestTests.java +Copyright (C) 2011 Red Hat, Inc. + +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, version 2. + +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. + */ + +import static org.junit.Assert.assertTrue; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess.AutoClose; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; + +import org.junit.Test; + +public class ResizeAppletTests extends BrowserTest { + + void assertContains(String source, String message, String substring) { + assertTrue(source + " should contain '" + substring + "' but did not!", + message.contains(substring)); + } + + @Test + @TestInBrowsers(testIn = { Browsers.all }) + @NeedsDisplay + public void testResizing() throws Exception { + ProcessResult pr = server.executeBrowser("/ResizeApplet.html", AutoClose.CLOSE_ON_CORRECT_END); + assertContains("stdout", pr.stdout, AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING); + assertContains("stdout", pr.stdout, "Resizing to 500 by 500"); + } +} From bugzilla-daemon at icedtea.classpath.org Fri May 17 09:36:41 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 16:36:41 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=29aad2f10875 author: Adam Domurad date: Fri May 17 12:31:32 2013 -0400 Fix PR854: Resizing an applet several times causes 100% CPU load -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/f3011afa/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 17 09:36:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 16:36:50 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=64f7c169eb3e author: Adam Domurad date: Fri May 17 12:34:41 2013 -0400 Reproducer for PR854 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/5dfddabb/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 17 12:39:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 19:39:13 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #8 from Adam Domurad --- This should be fixed in the next release; thanks very much for the reports. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/c233f8a8/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 17 12:41:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 19:41:27 +0000 Subject: [Bug 828] firefox-8.0/npfunctions.h:303:24: error: ambiguates old declaration 'const char* NP_GetMIMEDescription() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=828 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |adomurad at redhat.com Resolution|--- |FIXED --- Comment #2 from Adam Domurad --- This should be fixed in HEAD. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/51915ff9/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 17 12:52:41 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 19:52:41 +0000 Subject: [Bug 1219] PluginStreamHandler calls System.exit In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1219 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aazores at redhat.com Assignee|adomurad at redhat.com |aazores at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/a1fbd0be/attachment.html From andrew at icedtea.classpath.org Fri May 17 14:43:13 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 17 May 2013 21:43:13 +0000 Subject: /hg/icedtea6-hg: 3 new changesets Message-ID: changeset 2e5fa8029f94 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2e5fa8029f94 author: Andrew John Hughes date: Fri May 17 22:41:38 2013 +0100 Synchronise with upstream, removing patches available there. 2013-05-17 Andrew John Hughes * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, * patches/hotspot/original/fix_get_stack_bounds_leak.patch, * patches/openjdk/8004302-soap_test_failure.patch, * patches/openjdk/jaxp144_05.patch: Removed as available upstream. * Makefile.am: Remove patches. * patches/security/20130416/6657673.patch, * patches/security/20130416/8005432.patch: Regenerated against upstream. changeset ce006f6558f1 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ce006f6558f1 author: Pavel Tisnovsky date: Fri May 17 17:58:51 2013 +0200 Renamed three patches to be more consistent with other JTreg-related patches. changeset 8721058bbbbf in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8721058bbbbf author: Andrew John Hughes date: Fri May 17 22:43:02 2013 +0100 Merge diffstat: ChangeLog | 29 + Makefile.am | 14 +- patches/componentOrientationTests.patch | 246 - patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/jtreg-ComponentOrientationTests.patch | 246 + patches/jtreg-LayoutGetCharacterCount.patch | 54 + patches/jtreg-LayoutLimits.patch | 49 + patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130416/6657673.patch | 400 +- patches/security/20130416/8005432.patch | 48 +- patches/textLayoutGetCharacterCount.patch | 54 - patches/textLayoutLimits.patch | 49 - 14 files changed, 606 insertions(+), 596292 deletions(-) diffs (truncated from 597837 to 500 lines): diff -r 095625ea8650 -r 8721058bbbbf ChangeLog --- a/ChangeLog Wed May 15 20:25:05 2013 +0100 +++ b/ChangeLog Fri May 17 22:43:02 2013 +0100 @@ -1,3 +1,32 @@ +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + +2013-05-17 Pavel Tisnovsky + + * patches/componentOrientationTests.patch: + Renamed to... + * patches/jtreg-ComponentOrientationTests.patch: + this. + * patches/textLayoutGetCharacterCount.patch: + Renamed to... + * patches/jtreg-LayoutGetCharacterCount.patch: + this. + * patches/textLayoutLimits.patch: + Renamed to... + * patches/jtreg-LayoutLimits.patch: + this. + * Makefile.am: + Renamed three patches to be more consistent with other JTreg-related patches. + 2013-05-15 Andrew John Hughes * Makefile.am: diff -r 095625ea8650 -r 8721058bbbbf Makefile.am --- a/Makefile.am Wed May 15 20:25:05 2013 +0100 +++ b/Makefile.am Fri May 17 22:43:02 2013 +0100 @@ -258,14 +258,12 @@ ICEDTEA_FSG_PATCHES = DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch + patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ patches/openjdk/7036559-concurrenthashmap_improvements.patch \ patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ patches/security/20130416/6657673.patch \ patches/security/20130416/6657673-fixup.patch \ patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ @@ -497,8 +495,6 @@ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ patches/pr1319-support_giflib_5.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ @@ -509,9 +505,9 @@ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ patches/openjdk/8009530-icu_kern_table_support_broken.patch \ - patches/textLayoutGetCharacterCount.patch \ - patches/textLayoutLimits.patch \ - patches/componentOrientationTests.patch \ + patches/jtreg-LayoutGetCharacterCount.patch \ + patches/jtreg-LayoutLimits.patch \ + patches/jtreg-ComponentOrientationTests.patch \ patches/jtreg-TextLayoutBoundsChecks.patch if WITH_ALT_HSBUILD @@ -560,8 +556,6 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ - patches/hotspot/original/fix_get_stack_bounds_leak.patch \ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ diff -r 095625ea8650 -r 8721058bbbbf patches/componentOrientationTests.patch --- a/patches/componentOrientationTests.patch Wed May 15 20:25:05 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,246 +0,0 @@ -diff -uN ComponentOrientation/ComponentOrientationTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,77 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentOrientationTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation subsystem works properly. -+ */ -+public class ComponentOrientationTest { -+ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA"); -+ JLabel label2 = new JLabel("JAVA"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ -+ // test the order of two components -+ if (rect1.x >= rect2.x) { -+ panel.dispose(); -+ throw new RuntimeException("Components are positioned in a wrong order!"); -+ } -+ if (rect1.x + rect1.width >= rect2.x) { -+ panel.dispose(); -+ throw new RuntimeException("Components are positioned on the same place!"); -+ } -+ -+ // test vertical position of two components -+ if (rect1.y != rect2.y) { -+ panel.dispose(); -+ throw new RuntimeException("Components are not positioned on the same vertical position!"); -+ } -+ panel.dispose(); -+ } -+} -diff -uN ComponentOrientation/ComponentPlacementTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,79 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentPlacementTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation and component placement subsystem works properly. -+ */ -+public class ComponentPlacementTest -+{ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA1"); -+ JLabel label2 = new JLabel("JAVA2"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle panelRect = panel.getBounds(); -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ rect1.x += panelRect.x; -+ rect1.y += panelRect.y; -+ rect2.x += panelRect.x; -+ rect2.y += panelRect.y; -+ -+ if (!panelRect.contains(rect1)) { -+ panel.dispose(); -+ throw new RuntimeException("First component is not placed inside the frame!"); -+ } -+ if (!panelRect.contains(rect2)) { -+ panel.dispose(); -+ throw new RuntimeException("Second component is not placed inside the frame!"); -+ } -+ if (!rect1.intersection(rect2).isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("Component intersection detected!"); -+ } -+ panel.dispose(); -+ } -+ -+} -diff -uN ComponentOrientation/ComponentSizeTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java ---- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 -+++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentSizeTest.java 2013-04-29 15:24:56.000000000 +0200 -@@ -0,0 +1,78 @@ -+/* -+ * Copyright 2013 Red Hat, 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. -+ */ -+ -+import java.awt.ComponentOrientation; -+import java.awt.FlowLayout; -+import java.awt.Rectangle; -+ -+import javax.swing.JFrame; -+import javax.swing.JLabel; -+ -+/** -+ * @test -+ * @run main ComponentSizeTest -+ * @author Pavel Tisnovsky -+ * -+ * Basic test if component orientation and component placement subsystem works properly. -+ */ -+public class ComponentSizeTest -+{ -+ public static void main(String[] args) { -+ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; -+ for (int align : aligns) { -+ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); -+ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); -+ } -+ } -+ -+ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { -+ JFrame panel = new JFrame(); -+ JLabel label1 = new JLabel("JAVA"); -+ JLabel label2 = new JLabel("JAVA"); -+ -+ panel.setLayout(new FlowLayout(align)); -+ panel.applyComponentOrientation(componentOrientation); -+ -+ panel.add(label1); -+ panel.add(label2); -+ panel.pack(); -+ -+ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); -+ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); -+ -+ if (rect1.isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("First component has zero area!"); -+ } -+ if (rect2.isEmpty()) { -+ panel.dispose(); -+ throw new RuntimeException("Second component has zero area!"); -+ } -+ if (rect1.width != rect2.width) { -+ panel.dispose(); -+ throw new RuntimeException("Components should have the same width!"); -+ } -+ if (rect1.height != rect2.height) { -+ panel.dispose(); -+ throw new RuntimeException("Components should have the same height!"); -+ } -+ panel.dispose(); -+ } -+ -+} diff -r 095625ea8650 -r 8721058bbbbf patches/hotspot/original/7197906-handle_32_bit_shifts.patch --- a/patches/hotspot/original/7197906-handle_32_bit_shifts.patch Wed May 15 20:25:05 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ ---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:37.897456500 +0200 -+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:34.345253300 +0200 -@@ -285,7 +285,7 @@ - }; - - static size_t power_to_cards_back(uint i) { -- return (size_t)(1 << (LogBase * i)); -+ return (size_t)1 << (LogBase * i); - } - static size_t power_to_words_back(uint i) { - return power_to_cards_back(i) * N_words; ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:37.901456800 +0200 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:34.354253900 +0200 -@@ -110,7 +110,7 @@ - #ifndef PRODUCT - bool CMBitMapRO::covers(ReservedSpace rs) const { - // assert(_bm.map() == _virtual_space.low(), "map inconsistency"); -- assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize, -+ assert(((size_t)_bm.size() * ((size_t)1 << _shifter)) == _bmWordSize, - "size inconsistency"); - return _bmStartWord == (HeapWord*)(rs.base()) && - _bmWordSize == rs.size()>>LogHeapWordSize; ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:37.898456600 +0200 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:34.346253400 +0200 -@@ -273,7 +273,7 @@ - if (_max_fine_entries == 0) { - assert(_mod_max_fine_entries_mask == 0, "Both or none."); - size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries); -- _max_fine_entries = (size_t)(1 << max_entries_log); -+ _max_fine_entries = (size_t)1 << max_entries_log; - _mod_max_fine_entries_mask = _max_fine_entries - 1; - - assert(_fine_eviction_sample_size == 0 diff -r 095625ea8650 -r 8721058bbbbf patches/hotspot/original/fix_get_stack_bounds_leak.patch --- a/patches/hotspot/original/fix_get_stack_bounds_leak.patch Wed May 15 20:25:05 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -2650,6 +2650,8 @@ - ssize_t len = getline(&str, &dummy, f); - if (len == -1) { - fclose(f); -+ if (str != NULL) -+ free(str); - return false; - } - diff -r 095625ea8650 -r 8721058bbbbf patches/jtreg-ComponentOrientationTests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-ComponentOrientationTests.patch Fri May 17 22:43:02 2013 +0100 @@ -0,0 +1,246 @@ +diff -uN ComponentOrientation/ComponentOrientationTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java +--- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 ++++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentOrientationTest.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,77 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.ComponentOrientation; ++import java.awt.FlowLayout; ++import java.awt.Rectangle; ++ ++import javax.swing.JFrame; ++import javax.swing.JLabel; ++ ++/** ++ * @test ++ * @run main ComponentOrientationTest ++ * @author Pavel Tisnovsky ++ * ++ * Basic test if component orientation subsystem works properly. ++ */ ++public class ComponentOrientationTest { ++ ++ public static void main(String[] args) { ++ int[] aligns = {FlowLayout.LEFT, FlowLayout.CENTER, FlowLayout.RIGHT}; ++ ++ for (int align : aligns) { ++ testComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT, align, true); ++ testComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT, align, false); ++ } ++ } ++ ++ private static void testComponentOrientation(ComponentOrientation componentOrientation, int align, boolean firstLabelBeforeSecondOne) { ++ JFrame panel = new JFrame(); ++ JLabel label1 = new JLabel("JAVA"); ++ JLabel label2 = new JLabel("JAVA"); ++ ++ panel.setLayout(new FlowLayout(align)); ++ panel.applyComponentOrientation(componentOrientation); ++ ++ panel.add(label1); ++ panel.add(label2); ++ panel.pack(); ++ ++ Rectangle rect1 = firstLabelBeforeSecondOne ? label1.getBounds() : label2.getBounds(); ++ Rectangle rect2 = firstLabelBeforeSecondOne ? label2.getBounds() : label1.getBounds(); ++ ++ // test the order of two components ++ if (rect1.x >= rect2.x) { ++ panel.dispose(); ++ throw new RuntimeException("Components are positioned in a wrong order!"); ++ } ++ if (rect1.x + rect1.width >= rect2.x) { ++ panel.dispose(); ++ throw new RuntimeException("Components are positioned on the same place!"); ++ } ++ ++ // test vertical position of two components ++ if (rect1.y != rect2.y) { ++ panel.dispose(); ++ throw new RuntimeException("Components are not positioned on the same vertical position!"); ++ } ++ panel.dispose(); ++ } ++} +diff -uN ComponentOrientation/ComponentPlacementTest.java /jck/icedtea6/openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java +--- openjdk.old/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 ++++ openjdk/jdk/test/java/awt/ComponentOrientation/ComponentPlacementTest.java 2013-04-29 15:24:56.000000000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * Copyright 2013 Red Hat, 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. ++ */ ++ ++import java.awt.ComponentOrientation; ++import java.awt.FlowLayout; ++import java.awt.Rectangle; From bugzilla-daemon at icedtea.classpath.org Fri May 17 15:24:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 17 May 2013 22:24:49 +0000 Subject: [Bug 1432] Runescape updater gets stuck at 2 percent In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1432 --- Comment #2 from romulasry at yahoo.com --- I don't have this issue in chome/chromium anymore but I still get this bug under Firefox 20. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130517/a696c92b/attachment.html From jvanek at redhat.com Mon May 20 00:00:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 09:00:49 +0200 Subject: /hg/icedtea-web: 2 new changesets In-Reply-To: References: Message-ID: <5199CA21.3040602@redhat.com> On 05/17/2013 06:36 PM, adomurad at icedtea.classpath.org wrote: > changeset 29aad2f10875 in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=29aad2f10875 > author: Adam Domurad > date: Fri May 17 12:31:32 2013 -0400 > > Fix PR854: Resizing an applet several times causes 100% CPU load > > > changeset 64f7c169eb3e in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64f7c169eb3e > author: Adam Domurad > date: Fri May 17 12:34:41 2013 -0400 > > Reproducer for PR854 > > ... > +} I'm for 1.4 in this case too.[rfc] J. From ptisnovs at icedtea.classpath.org Mon May 20 01:05:00 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 20 May 2013 08:05:00 +0000 Subject: /hg/rhino-tests: Updated two tests in BindingsClassTest for (Ope... Message-ID: changeset a4b6ee7d30e6 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a4b6ee7d30e6 author: Pavel Tisnovsky date: Mon May 20 10:08:26 2013 +0200 Updated two tests in BindingsClassTest for (Open)JDK8 API: getAnnotation and getAnnotations. diffstat: ChangeLog | 6 +++++ src/org/RhinoTests/BindingsClassTest.java | 36 +++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diffs (80 lines): diff -r d4b48d0f24fc -r a4b6ee7d30e6 ChangeLog --- a/ChangeLog Fri May 17 14:40:06 2013 +0200 +++ b/ChangeLog Mon May 20 10:08:26 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-20 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Updated two tests in BindingsClassTest for (Open)JDK8 API: + getAnnotation and getAnnotations. + 2013-05-17 Pavel Tisnovsky * src/org/RhinoTests/AbstractScriptEngineClassTest.java: diff -r d4b48d0f24fc -r a4b6ee7d30e6 src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Fri May 17 14:40:06 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Mon May 20 10:08:26 2013 +0200 @@ -897,6 +897,9 @@ // this should be really empty }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.bindingsClass.getAnnotations(); // and transform the array into a list of annotation names @@ -904,7 +907,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -923,6 +939,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.bindingsClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -930,7 +949,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From ptisnovs at icedtea.classpath.org Mon May 20 01:14:36 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 20 May 2013 08:14:36 +0000 Subject: /hg/gfx-test: Five new tests added into ClippingCircleByConvexPo... Message-ID: changeset 47183195d9f0 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=47183195d9f0 author: Pavel Tisnovsky date: Mon May 20 10:18:01 2013 +0200 Five new tests added into ClippingCircleByConvexPolygonalShape test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java | 90 ++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diffs (112 lines): diff -r 2fdf9c72f3e4 -r 47183195d9f0 ChangeLog --- a/ChangeLog Fri May 17 15:01:29 2013 +0200 +++ b/ChangeLog Mon May 20 10:18:01 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-20 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java: + Five new tests added into ClippingCircleByConvexPolygonalShape test suite. + 2013-05-17 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java: diff -r 2fdf9c72f3e4 -r 47183195d9f0 src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Fri May 17 15:01:29 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java Mon May 20 10:18:01 2013 +0200 @@ -879,6 +879,96 @@ } /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with cyan color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintCyan000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 0% transparency + drawCircleClippedByPolygonalShapeAlphaPaintCyan(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with cyan color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintCyan025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 25% transparency + drawCircleClippedByPolygonalShapeAlphaPaintCyan(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with cyan color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintCyan050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 50% transparency + drawCircleClippedByPolygonalShapeAlphaPaintCyan(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with cyan color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintCyan075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 75% transparency + drawCircleClippedByPolygonalShapeAlphaPaintCyan(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a convex polygonal shape. Circle is + * rendered using alpha paint with cyan color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByPolygonalShapeAlphaPaintCyan100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by convex polygonal shape using alpha paint with 100% transparency + drawCircleClippedByPolygonalShapeAlphaPaintCyan(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** * Check if circle shape could be clipped by a polygonal shape. Circle is * rendered using horizontal gradient paint. * From guillaume at archlinux.org Mon May 20 03:33:54 2013 From: guillaume at archlinux.org (Guillaume ALAUX) Date: Mon, 20 May 2013 12:33:54 +0200 Subject: Utility "jar" changes file permissions Message-ID: Hello, When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the following jar file gets wrong file permissions (not "go" readable): % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar -rw------- 1 root root 2.5M May 15 08:33 /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar I found the "jar" utility has already had such issue as reported here [0] [1]. I can reproduce the wrong behavior explained in Sun's bug report [1]: % touch newjar.jar % echo New >> newManifest % echo OneMore >> oneMoreManifest % jar -cfM0 newjar.jar newManifest % ls -l newjar.jar -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar % jar uf newjar.jar oneMoreManifest % ls -l newjar.jar -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar There is a unit test called UpdateJar.java in OpenJDK for that. Is it worth opening a bug report? [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 Thanks! -- Guillaume From jvanek at redhat.com Mon May 20 04:02:43 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 13:02:43 +0200 Subject: Utility "jar" changes file permissions In-Reply-To: References: Message-ID: <519A02D3.3070100@redhat.com> On 05/20/2013 12:33 PM, Guillaume ALAUX wrote: > Hello, > > When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the > following jar file gets wrong file permissions (not "go" readable): > > % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar > -rw------- 1 root root 2.5M May 15 08:33 > /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar > > I found the "jar" utility has already had such issue as reported here [0] [1]. > > I can reproduce the wrong behavior explained in Sun's bug report [1]: > > % touch newjar.jar > % echo New >> newManifest > % echo OneMore >> oneMoreManifest > > % jar -cfM0 newjar.jar newManifest > > % ls -l newjar.jar > -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar > > % jar uf newjar.jar oneMoreManifest > > % ls -l newjar.jar > -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar > > There is a unit test called UpdateJar.java in OpenJDK for that. > > Is it worth opening a bug report? > > [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 > [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 > > Thanks! > > -- > Guillaume > Hi! One of the recent (half an year ago?) security hardening patch changed api for temporal files to have just -rw------- permissions. Side effect of this is that when you update jar (jar -uf), it is passed through tmp file and so the permissions are restricted to -rw------- ... So from point of view this is correct behaviour. On the other hand, this is worthy of upstream (oracle) bug. As result of jar -u should have the same permissions as had original. The fact that one of the JDK's jars have this permissions is that jdk compile and jar itself. So if somewhere is update of jar, then it changed to -rw------- ... Last time this was reported for java-access-bridge.jar and fixed in spec file by plain "chmod". We can fix this in icedtea, but it will be just temporally workaround. Hopes this helped. J. From ptisnovs at icedtea.classpath.org Mon May 20 04:25:51 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 20 May 2013 11:25:51 +0000 Subject: /hg/icedtea6: Fixed wrong JTreg test name in @run annotation. Message-ID: changeset a371c1860804 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a371c1860804 author: Pavel Tisnovsky date: Mon May 20 13:25:41 2013 +0200 Fixed wrong JTreg test name in @run annotation. diffstat: ChangeLog | 5 +++++ patches/jtreg-TextLayoutBoundsChecks.patch | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r ce006f6558f1 -r a371c1860804 ChangeLog --- a/ChangeLog Fri May 17 17:58:51 2013 +0200 +++ b/ChangeLog Mon May 20 13:25:41 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-20 Pavel Tisnovsky + + * patches/jtreg-TextLayoutBoundsChecks.patch: + Fixed wrong JTreg test name in @run annotation. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: diff -r ce006f6558f1 -r a371c1860804 patches/jtreg-TextLayoutBoundsChecks.patch --- a/patches/jtreg-TextLayoutBoundsChecks.patch Fri May 17 17:58:51 2013 +0200 +++ b/patches/jtreg-TextLayoutBoundsChecks.patch Mon May 20 13:25:41 2013 +0200 @@ -76,7 +76,7 @@ + +/** + * @test -+ * @run main TextLayoutLimits2 ++ * @run main TextLayoutBoundIsNotEmpty + * @author Pavel Tisnovsky + * + * Test if TextLayout's method getBounds() works properly. From guillaume at archlinux.org Mon May 20 05:42:02 2013 From: guillaume at archlinux.org (Guillaume ALAUX) Date: Mon, 20 May 2013 14:42:02 +0200 Subject: Utility "jar" changes file permissions In-Reply-To: <519A02D3.3070100@redhat.com> References: <519A02D3.3070100@redhat.com> Message-ID: On 20 May 2013 13:02, Jiri Vanek wrote: > On 05/20/2013 12:33 PM, Guillaume ALAUX wrote: >> >> Hello, >> >> When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the >> following jar file gets wrong file permissions (not "go" readable): >> >> % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >> -rw------- 1 root root 2.5M May 15 08:33 >> /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >> >> I found the "jar" utility has already had such issue as reported here [0] >> [1]. >> >> I can reproduce the wrong behavior explained in Sun's bug report [1]: >> >> % touch newjar.jar >> % echo New >> newManifest >> % echo OneMore >> oneMoreManifest >> >> % jar -cfM0 newjar.jar newManifest >> >> % ls -l newjar.jar >> -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar >> >> % jar uf newjar.jar oneMoreManifest >> >> % ls -l newjar.jar >> -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar >> >> There is a unit test called UpdateJar.java in OpenJDK for that. >> >> Is it worth opening a bug report? >> >> [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 >> [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 >> >> Thanks! >> >> -- >> Guillaume >> > > Hi! > > One of the recent (half an year ago?) security hardening patch changed api > for temporal files to have just -rw------- permissions. Side effect of this > is that when you update jar (jar -uf), it is passed through tmp file and so > the permissions are restricted to -rw------- ... So from point of view this > is correct behaviour. On the other hand, this is worthy of upstream (oracle) > bug. As result of jar -u should have the same permissions as had original. > > The fact that one of the JDK's jars have this permissions is that jdk > compile and jar itself. So if somewhere is update of jar, then it changed to > -rw------- ... Last time this was reported for java-access-bridge.jar and > fixed in spec file by plain "chmod". > > We can fix this in icedtea, but it will be just temporally workaround. > > Hopes this helped. > J. Actually, a "bare" JDK downloaded from [0] does not show the issue: % ls -l newjar.jar -rw-r--r-- 1 guillaume users 0 May 20 14:08 newjar.jar % ../jdk1.7.0_21/bin/jar -cfM0 newjar.jar newManifest % ls -l newjar.jar -rw-r--r-- 1 guillaume users 132 May 20 14:08 newjar.jar % ../jdk1.7.0_21/bin/jar uf newjar.jar oneMoreManifest % ls -l newjar.jar -rw-r--r-- 1 guillaume users 264 May 20 14:08 newjar.jar So I guess it could be due to IcedTea. Does IcedTea patches the "jar" utility? [0] http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html From jvanek at redhat.com Mon May 20 05:49:44 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 14:49:44 +0200 Subject: Utility "jar" changes file permissions In-Reply-To: References: <519A02D3.3070100@redhat.com> Message-ID: <519A1BE8.7080700@redhat.com> On 05/20/2013 02:42 PM, Guillaume ALAUX wrote: > On 20 May 2013 13:02, Jiri Vanek wrote: >> On 05/20/2013 12:33 PM, Guillaume ALAUX wrote: >>> >>> Hello, >>> >>> When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the >>> following jar file gets wrong file permissions (not "go" readable): >>> >>> % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >>> -rw------- 1 root root 2.5M May 15 08:33 >>> /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >>> >>> I found the "jar" utility has already had such issue as reported here [0] >>> [1]. >>> >>> I can reproduce the wrong behavior explained in Sun's bug report [1]: >>> >>> % touch newjar.jar >>> % echo New >> newManifest >>> % echo OneMore >> oneMoreManifest >>> >>> % jar -cfM0 newjar.jar newManifest >>> >>> % ls -l newjar.jar >>> -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar >>> >>> % jar uf newjar.jar oneMoreManifest >>> >>> % ls -l newjar.jar >>> -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar >>> >>> There is a unit test called UpdateJar.java in OpenJDK for that. >>> >>> Is it worth opening a bug report? >>> >>> [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 >>> [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 >>> >>> Thanks! >>> >>> -- >>> Guillaume >>> >> >> Hi! >> >> One of the recent (half an year ago?) security hardening patch changed api >> for temporal files to have just -rw------- permissions. Side effect of this >> is that when you update jar (jar -uf), it is passed through tmp file and so >> the permissions are restricted to -rw------- ... So from point of view this >> is correct behaviour. On the other hand, this is worthy of upstream (oracle) >> bug. As result of jar -u should have the same permissions as had original. >> >> The fact that one of the JDK's jars have this permissions is that jdk >> compile and jar itself. So if somewhere is update of jar, then it changed to >> -rw------- ... Last time this was reported for java-access-bridge.jar and >> fixed in spec file by plain "chmod". >> >> We can fix this in icedtea, but it will be just temporally workaround. >> >> Hopes this helped. >> J. > > Actually, a "bare" JDK downloaded from [0] does not show the issue: > > % ls -l newjar.jar > -rw-r--r-- 1 guillaume users 0 May 20 14:08 newjar.jar > > % ../jdk1.7.0_21/bin/jar -cfM0 newjar.jar newManifest > > % ls -l newjar.jar > -rw-r--r-- 1 guillaume users 132 May 20 14:08 newjar.jar > > % ../jdk1.7.0_21/bin/jar uf newjar.jar oneMoreManifest > > % ls -l newjar.jar > -rw-r--r-- 1 guillaume users 264 May 20 14:08 newjar.jar > > So I guess it could be due to IcedTea. Does IcedTea patches the "jar" utility? > > [0] http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html > I'm afraid that it quite common that fixes from openjdk bubble to proprietary jdk quite smoothly, but in oposite direction only the crucial fixes are delivered:( So it is possible that hey have already fixed this in it. J. From guillaume at archlinux.org Mon May 20 06:04:47 2013 From: guillaume at archlinux.org (Guillaume ALAUX) Date: Mon, 20 May 2013 15:04:47 +0200 Subject: Utility "jar" changes file permissions In-Reply-To: <519A1BE8.7080700@redhat.com> References: <519A02D3.3070100@redhat.com> <519A1BE8.7080700@redhat.com> Message-ID: On 20 May 2013 14:49, Jiri Vanek wrote: > On 05/20/2013 02:42 PM, Guillaume ALAUX wrote: >> >> On 20 May 2013 13:02, Jiri Vanek wrote: >>> >>> On 05/20/2013 12:33 PM, Guillaume ALAUX wrote: >>>> >>>> >>>> Hello, >>>> >>>> When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the >>>> following jar file gets wrong file permissions (not "go" readable): >>>> >>>> % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >>>> -rw------- 1 root root 2.5M May 15 08:33 >>>> /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar >>>> >>>> I found the "jar" utility has already had such issue as reported here >>>> [0] >>>> [1]. >>>> >>>> I can reproduce the wrong behavior explained in Sun's bug report [1]: >>>> >>>> % touch newjar.jar >>>> % echo New >> newManifest >>>> % echo OneMore >> oneMoreManifest >>>> >>>> % jar -cfM0 newjar.jar newManifest >>>> >>>> % ls -l newjar.jar >>>> -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar >>>> >>>> % jar uf newjar.jar oneMoreManifest >>>> >>>> % ls -l newjar.jar >>>> -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar >>>> >>>> There is a unit test called UpdateJar.java in OpenJDK for that. >>>> >>>> Is it worth opening a bug report? >>>> >>>> [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 >>>> [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 >>>> >>>> Thanks! >>>> >>>> -- >>>> Guillaume >>>> >>> >>> Hi! >>> >>> One of the recent (half an year ago?) security hardening patch changed >>> api >>> for temporal files to have just -rw------- permissions. Side effect of >>> this >>> is that when you update jar (jar -uf), it is passed through tmp file and >>> so >>> the permissions are restricted to -rw------- ... So from point of view >>> this >>> is correct behaviour. On the other hand, this is worthy of upstream >>> (oracle) >>> bug. As result of jar -u should have the same permissions as had >>> original. >>> >>> The fact that one of the JDK's jars have this permissions is that jdk >>> compile and jar itself. So if somewhere is update of jar, then it changed >>> to >>> -rw------- ... Last time this was reported for java-access-bridge.jar and >>> fixed in spec file by plain "chmod". >>> >>> We can fix this in icedtea, but it will be just temporally workaround. >>> >>> Hopes this helped. >>> J. >> >> >> Actually, a "bare" JDK downloaded from [0] does not show the issue: >> >> % ls -l newjar.jar >> -rw-r--r-- 1 guillaume users 0 May 20 14:08 newjar.jar >> >> % ../jdk1.7.0_21/bin/jar -cfM0 newjar.jar newManifest >> >> % ls -l newjar.jar >> -rw-r--r-- 1 guillaume users 132 May 20 14:08 newjar.jar >> >> % ../jdk1.7.0_21/bin/jar uf newjar.jar oneMoreManifest >> >> % ls -l newjar.jar >> -rw-r--r-- 1 guillaume users 264 May 20 14:08 newjar.jar >> >> So I guess it could be due to IcedTea. Does IcedTea patches the "jar" >> utility? >> >> [0] >> http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html >> > > I'm afraid that it quite common that fixes from openjdk bubble to > proprietary jdk quite smoothly, but in oposite direction only the crucial > fixes are delivered:( > > So it is possible that hey have already fixed this in it. > > J. OK, I will chmod the jar for now and keep an eye on it for next releases. Thank you ! -- Guillaume From jvanek at icedtea.classpath.org Mon May 20 06:13:16 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 20 May 2013 13:13:16 +0000 Subject: /hg/icedtea-web: Fixed possible deadlock for applet->js->applet ... Message-ID: changeset 3dd0ae4efe78 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3dd0ae4efe78 author: Jiri Vanek date: Mon May 20 15:13:32 2013 +0200 Fixed possible deadlock for applet->js->applet call with testcase diffstat: ChangeLog | 16 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 35 ++- tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html | 55 +++++ tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java | 89 +++++++++ tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java | 95 ++++++++++ 5 files changed, 278 insertions(+), 12 deletions(-) diffs (327 lines): diff -r 64f7c169eb3e -r 3dd0ae4efe78 ChangeLog --- a/ChangeLog Fri May 17 12:34:41 2013 -0400 +++ b/ChangeLog Mon May 20 15:13:32 2013 +0200 @@ -1,3 +1,19 @@ +2013-05-20 Jiri Vanek + + Fixed possible deadlock for applet->js->applet call + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: + (REQUEST_TIMEOUT) new constant, 60s, to define timeout of applet->js call + (waitForRequestCompletion) new method waiting to request to be done with + timeout of REQUEST_TIMEOUT. + (javascriptToString) using the waitForRequestCompletion instead of plain + wait() + * tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html + and + * tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java + reproducer + * tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java + testcase + 2013-05-17 Adam Domurad Fix PR854: Resizing an applet several times causes 100% CPU load diff -r 64f7c169eb3e -r 3dd0ae4efe78 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 17 12:34:41 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 20 15:13:32 2013 +0200 @@ -181,7 +181,23 @@ private SplashPanel splashPanel; - + + private static long REQUEST_TIMEOUT=60000;//60s + + private static void waitForRequestCompletion(PluginCallRequest request) { + try { + if (!request.isDone()) { + request.wait(REQUEST_TIMEOUT); + } + if (!request.isDone()) { + // Do not wait indefinitely to avoid the potential of deadlock + throw new RuntimeException("Possible deadlock, releasing"); + } + } catch (InterruptedException ex) { + throw new RuntimeException("Interrupted waiting for call request.", ex); + } + } + /** * Null constructor to allow instantiation via newInstance() */ @@ -1290,18 +1306,13 @@ streamhandler.postCallRequest(request); streamhandler.write(request.getMessage()); - try { - PluginDebug.debug("wait ToString request 1"); - synchronized (request) { - PluginDebug.debug("wait ToString request 2"); - while (request.isDone() == false) - request.wait(); - PluginDebug.debug("wait ToString request 3"); - } - } catch (InterruptedException e) { - throw new RuntimeException("Interrupted waiting for call request.", - e); + PluginDebug.debug("wait ToString request 1"); + synchronized (request) { + PluginDebug.debug("wait ToString request 2"); + waitForRequestCompletion(request); + PluginDebug.debug("wait ToString request 3"); } + PluginDebug.debug(" ToString DONE"); return (String) request.getObject(); } diff -r 64f7c169eb3e -r 3dd0ae4efe78 tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html Mon May 20 15:13:32 2013 +0200 @@ -0,0 +1,55 @@ + + +

+

+ diff -r 64f7c169eb3e -r 3dd0ae4efe78 tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java Mon May 20 15:13:32 2013 +0200 @@ -0,0 +1,89 @@ +/* + Copyright (C) 2012 Red Hat, Inc. + + 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, version 2. + + 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. + */ + +import java.awt.TextArea; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import netscape.javascript.JSObject; + +public class AppletJsAppletDeadlock extends java.applet.Applet { + + private TextArea outputText = null; + + public void printOutput(String msg) { + System.out.println(msg); + outputText.setText(outputText.getText() + msg + "\n"); + } + + public void jsCallback(String location) { + printOutput("Callback function called"); + + // try requesting the page + try { + URL url = new URL(location); + URLConnection con = url.openConnection(); + BufferedReader br = new BufferedReader(new InputStreamReader( + con.getInputStream())); + + String line; + while ((line = br.readLine()) != null) { + System.err.println(line); + } + + printOutput("Succesfully connected to " + location); + } catch (Exception e) { + printOutput("Failed to connect to '" + location + "': " + e.getMessage()); + } + + } + + @Override + public void start() { +// public void init() { + outputText = new TextArea("", 12, 95); + this.add(outputText); + + printOutput("AppletJsAppletDeadlock started"); + + JSObject win = JSObject.getWindow(this); + win.eval("callApplet();"); + + printOutput("JS call finished"); + } +} diff -r 64f7c169eb3e -r 3dd0ae4efe78 tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java Mon May 20 15:13:32 2013 +0200 @@ -0,0 +1,95 @@ +/* + Copyright (C) 2012 Red Hat, Inc. + + 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, version 2. + + 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. + */ + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class AppletJsAppletDeadlockTest extends BrowserTest { + + private static final String called = "Callback function called"; + private static final String started = "AppletJsAppletDeadlock started"; + private static final String finished = "JS call finished"; + private static final RulesFolowingClosingListener.ContainsRule calledRule = new RulesFolowingClosingListener.ContainsRule(called); + private static final RulesFolowingClosingListener.ContainsRule startedRule = new RulesFolowingClosingListener.ContainsRule(started); + private static final RulesFolowingClosingListener.ContainsRule finishedRule = new RulesFolowingClosingListener.ContainsRule(finished); + private static final long defaultTimeout = ServerAccess.PROCESS_TIMEOUT; + + @BeforeClass + public static void setTimeout() { + //the timeout is js call is 60s + //see sun.applet.PluginAppletViewer.REQUEST_TIMEOUT + //so wee need to have little longer timooute here + ServerAccess.PROCESS_TIMEOUT = 120000;//120 s + } + + @AfterClass + public static void resetTimeout() { + ServerAccess.PROCESS_TIMEOUT = defaultTimeout; + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = Browsers.one) + public void callAppletJsAppletNotDeadlock() throws Exception { + ProcessResult processResult = server.executeBrowser("AppletJsAppletDeadlock.html", new RulesFolowingClosingListener(finishedRule), null); + Assert.assertTrue(startedRule.toPassingString(), startedRule.evaluate(processResult.stdout)); + Assert.assertTrue(finishedRule.toPassingString(), finishedRule.evaluate(processResult.stdout)); + //this is representing another error, not sure now it is worthy to be fixed + //Assert.assertTrue(calledRule.toPassingString(), calledRule.evaluate(processResult.stdout)); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = Browsers.one) + @KnownToFail + public void callAppletJsAppletSuccessfullyEvaluated() throws Exception { + ProcessResult processResult = server.executeBrowser("AppletJsAppletDeadlock.html", new RulesFolowingClosingListener(finishedRule), null); + Assert.assertTrue(startedRule.toPassingString(), startedRule.evaluate(processResult.stdout)); + Assert.assertTrue(finishedRule.toPassingString(), finishedRule.evaluate(processResult.stdout)); + Assert.assertTrue(calledRule.toPassingString(), calledRule.evaluate(processResult.stdout)); + } +} From jvanek at icedtea.classpath.org Mon May 20 06:42:17 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 20 May 2013 13:42:17 +0000 Subject: /hg/release/icedtea-web-1.4: Fixed possible deadlock for applet-... Message-ID: changeset 838e90afbbb8 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=838e90afbbb8 author: Jiri Vanek date: Mon May 20 15:42:42 2013 +0200 Fixed possible deadlock for applet->js->applet call with testcase diffstat: ChangeLog | 16 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 35 ++- tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html | 55 +++++ tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java | 89 +++++++++ tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java | 95 ++++++++++ 5 files changed, 278 insertions(+), 12 deletions(-) diffs (327 lines): diff -r 8f13202ea201 -r 838e90afbbb8 ChangeLog --- a/ChangeLog Tue May 14 13:28:09 2013 -0400 +++ b/ChangeLog Mon May 20 15:42:42 2013 +0200 @@ -1,3 +1,19 @@ +2013-05-20 Jiri Vanek + + Fixed possible deadlock for applet->js->applet call + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: + (REQUEST_TIMEOUT) new constant, 60s, to define timeout of applet->js call + (waitForRequestCompletion) new method waiting to request to be done with + timeout of REQUEST_TIMEOUT. + (javascriptToString) using the waitForRequestCompletion instead of plain + wait() + * tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html + and + * tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java + reproducer + * tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java + testcase + 2013-05-14 Matthias Klose * launcher/javaws.in: Use bash as shebang. diff -r 8f13202ea201 -r 838e90afbbb8 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue May 14 13:28:09 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 20 15:42:42 2013 +0200 @@ -181,7 +181,23 @@ private SplashPanel splashPanel; - + + private static long REQUEST_TIMEOUT=60000;//60s + + private static void waitForRequestCompletion(PluginCallRequest request) { + try { + if (!request.isDone()) { + request.wait(REQUEST_TIMEOUT); + } + if (!request.isDone()) { + // Do not wait indefinitely to avoid the potential of deadlock + throw new RuntimeException("Possible deadlock, releasing"); + } + } catch (InterruptedException ex) { + throw new RuntimeException("Interrupted waiting for call request.", ex); + } + } + /** * Null constructor to allow instantiation via newInstance() */ @@ -1301,18 +1317,13 @@ streamhandler.postCallRequest(request); streamhandler.write(request.getMessage()); - try { - PluginDebug.debug("wait ToString request 1"); - synchronized (request) { - PluginDebug.debug("wait ToString request 2"); - while (request.isDone() == false) - request.wait(); - PluginDebug.debug("wait ToString request 3"); - } - } catch (InterruptedException e) { - throw new RuntimeException("Interrupted waiting for call request.", - e); + PluginDebug.debug("wait ToString request 1"); + synchronized (request) { + PluginDebug.debug("wait ToString request 2"); + waitForRequestCompletion(request); + PluginDebug.debug("wait ToString request 3"); } + PluginDebug.debug(" ToString DONE"); return (String) request.getObject(); } diff -r 8f13202ea201 -r 838e90afbbb8 tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/resources/AppletJsAppletDeadlock.html Mon May 20 15:42:42 2013 +0200 @@ -0,0 +1,55 @@ + + +

+

+ diff -r 8f13202ea201 -r 838e90afbbb8 tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/srcs/AppletJsAppletDeadlock.java Mon May 20 15:42:42 2013 +0200 @@ -0,0 +1,89 @@ +/* + Copyright (C) 2012 Red Hat, Inc. + + 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, version 2. + + 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. + */ + +import java.awt.TextArea; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import netscape.javascript.JSObject; + +public class AppletJsAppletDeadlock extends java.applet.Applet { + + private TextArea outputText = null; + + public void printOutput(String msg) { + System.out.println(msg); + outputText.setText(outputText.getText() + msg + "\n"); + } + + public void jsCallback(String location) { + printOutput("Callback function called"); + + // try requesting the page + try { + URL url = new URL(location); + URLConnection con = url.openConnection(); + BufferedReader br = new BufferedReader(new InputStreamReader( + con.getInputStream())); + + String line; + while ((line = br.readLine()) != null) { + System.err.println(line); + } + + printOutput("Succesfully connected to " + location); + } catch (Exception e) { + printOutput("Failed to connect to '" + location + "': " + e.getMessage()); + } + + } + + @Override + public void start() { +// public void init() { + outputText = new TextArea("", 12, 95); + this.add(outputText); + + printOutput("AppletJsAppletDeadlock started"); + + JSObject win = JSObject.getWindow(this); + win.eval("callApplet();"); + + printOutput("JS call finished"); + } +} diff -r 8f13202ea201 -r 838e90afbbb8 tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletJsAppletDeadlock/testcases/AppletJsAppletDeadlockTest.java Mon May 20 15:42:42 2013 +0200 @@ -0,0 +1,95 @@ +/* + Copyright (C) 2012 Red Hat, Inc. + + 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, version 2. + + 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. + */ + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class AppletJsAppletDeadlockTest extends BrowserTest { + + private static final String called = "Callback function called"; + private static final String started = "AppletJsAppletDeadlock started"; + private static final String finished = "JS call finished"; + private static final RulesFolowingClosingListener.ContainsRule calledRule = new RulesFolowingClosingListener.ContainsRule(called); + private static final RulesFolowingClosingListener.ContainsRule startedRule = new RulesFolowingClosingListener.ContainsRule(started); + private static final RulesFolowingClosingListener.ContainsRule finishedRule = new RulesFolowingClosingListener.ContainsRule(finished); + private static final long defaultTimeout = ServerAccess.PROCESS_TIMEOUT; + + @BeforeClass + public static void setTimeout() { + //the timeout is js call is 60s + //see sun.applet.PluginAppletViewer.REQUEST_TIMEOUT + //so wee need to have little longer timooute here + ServerAccess.PROCESS_TIMEOUT = 120000;//120 s + } + + @AfterClass + public static void resetTimeout() { + ServerAccess.PROCESS_TIMEOUT = defaultTimeout; + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = Browsers.one) + public void callAppletJsAppletNotDeadlock() throws Exception { + ProcessResult processResult = server.executeBrowser("AppletJsAppletDeadlock.html", new RulesFolowingClosingListener(finishedRule), null); + Assert.assertTrue(startedRule.toPassingString(), startedRule.evaluate(processResult.stdout)); + Assert.assertTrue(finishedRule.toPassingString(), finishedRule.evaluate(processResult.stdout)); + //this is representing another error, not sure now it is worthy to be fixed + //Assert.assertTrue(calledRule.toPassingString(), calledRule.evaluate(processResult.stdout)); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = Browsers.one) + @KnownToFail + public void callAppletJsAppletSuccessfullyEvaluated() throws Exception { + ProcessResult processResult = server.executeBrowser("AppletJsAppletDeadlock.html", new RulesFolowingClosingListener(finishedRule), null); + Assert.assertTrue(startedRule.toPassingString(), startedRule.evaluate(processResult.stdout)); + Assert.assertTrue(finishedRule.toPassingString(), finishedRule.evaluate(processResult.stdout)); + Assert.assertTrue(calledRule.toPassingString(), calledRule.evaluate(processResult.stdout)); + } +} From jvanek at redhat.com Mon May 20 07:06:31 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 16:06:31 +0200 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <5183BCA9.7090505@redhat.com> References: <201305021657.r42GvsCD019580@mail-web02.excite.co.jp> <51829C4F.8030300@redhat.com> <5183BCA9.7090505@redhat.com> Message-ID: <519A2DE7.1050605@redhat.com> On 05/03/2013 03:33 PM, Jiri Vanek wrote: > On 05/02/2013 07:03 PM, Omair Majid wrote: >> On 05/02/2013 12:57 PM, Jacob Wisor wrote: >>> "Omair Majid" wrote: >>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: >>>>> "Jacob Wisor" wrote: >>>>>>> I would like to propose to make the jar file manifest more >>>>>>> complete, though I am not sure about the "Implementation-Vendor" >>>>>>> attribute's (key) value. >>>> >>>> I would use "IcedTea" >>>> >>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >>>> >>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. >>> >>> Setting IcedTea as vendor and then setting "Implementation-URL" to >>> @PACKAGE_URL@ does not compute. How about setting >>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding >>> it to the build script, hence "IcedTea" being the default for >>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the >>> default for @PACKAGE_URL@? >> >> That sounds fine to me. I went with @PACKAGE_URL@ since it's already >> defined, and used in only a few places, whereas the string IcedTea is >> probably present in every file already (along the lines of "This file is >> part of IcedTea"). >> >> I would like to hear what others think about "IcedTea" as the vendor, >> before we decide to use it. > > I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be > nicely consistent. > > Thank you for taking this review! > > J. > diff -r 3dd0ae4efe78 netx.manifest.in --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 @@ -1,2 +1,8 @@ Implementation-Title: @PACKAGE_NAME@ Implementation-Version: @FULL_VERSION@ +Implementation-URL: @PACKAGE_URL@ +Implementation-Vendor: IcedTea +Specification-Title: JSR56: Java Network Launching Protocol and API +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 +Specification-Vendor: Java Community Process +Specification-Version: 6.0 May I push? J. From jvanek at icedtea.classpath.org Mon May 20 07:22:22 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 20 May 2013 14:22:22 +0000 Subject: /hg/icedtea-web: Synchronized launchers to be from one source Message-ID: changeset 9e1f7dc48c20 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9e1f7dc48c20 author: Jiri Vanek date: Mon May 20 16:22:44 2013 +0200 Synchronized launchers to be from one source diffstat: ChangeLog | 14 +++++++ Makefile.am | 23 +++++++---- launcher/itweb-settings.in | 29 -------------- launcher/javaws.in | 91 ---------------------------------------------- launcher/launchers.in | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 128 deletions(-) diffs (288 lines): diff -r 3dd0ae4efe78 -r 9e1f7dc48c20 ChangeLog --- a/ChangeLog Mon May 20 15:13:32 2013 +0200 +++ b/ChangeLog Mon May 20 16:22:44 2013 +0200 @@ -1,3 +1,17 @@ +2013-05-20 Jiri Vanek + + Synchronized launchers to be from one source + * Makefile.am: (edit_launcher_script) is now accepting variables + (launcher.build/$(javaws)) no depends on launcher/launchers.in instead of + launcher/javaws.in and is filling the variables for javaws + (launcher.build/$(itweb_settings)) no depends on launcher/launchers.in instead of + launcher/itweb_settings.in and is filling the variables for itweb_settings + * launcher/itweb-settings.in: removed + * launcher/javaws.in: removed + * launcher/launchers.in: new file, substitution of removed (itweb-settings.in) + and javaws.in. Mostly based on javaws.in, just (CLASSNAME) and (PROGRAM_NAME) + and (BINARY_LOCATION) were made more general. + 2013-05-20 Jiri Vanek Fixed possible deadlock for applet->js->applet call diff -r 3dd0ae4efe78 -r 9e1f7dc48c20 Makefile.am --- a/Makefile.am Mon May 20 15:13:32 2013 +0200 +++ b/Makefile.am Mon May 20 16:22:44 2013 +0200 @@ -205,12 +205,13 @@ # the launcher needs to know $(bindir) and $(datadir) which can be different at # make-time from configure-time edit_launcher_script = sed \ - -e 's|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g' \ - -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \ - -e 's|[@]JAVAWS_SPLASH_LOCATION[@]|$(datadir)/$(PACKAGE_NAME)/javaws_splash.png|g' \ - -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \ - -e 's|[@]JAVA[@]|$(JAVA)|g' \ - -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g' + -e "s|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g" \ + -e "s|[@]JAVAWS_SPLASH_LOCATION[@]|$(datadir)/$(PACKAGE_NAME)/javaws_splash.png|g" \ + -e "s|[@]JAVA[@]|$(JAVA)|g" \ + -e "s|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g" \ + -e "s|[@]MAIN_CLASS[@]|$${MAIN_CLASS}|g" \ + -e "s|[@]BIN_LOCATION[@]|$${BIN_LOCATION}|g" \ + -e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g" # Top-Level Targets # ================= @@ -519,12 +520,18 @@ extra-lib/about.jar: stamps/extra-class-files.stamp $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; -launcher.build/$(javaws): launcher/javaws.in +launcher.build/$(javaws): launcher/launchers.in mkdir -p launcher.build + MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\ + BIN_LOCATION=$(bindir)/$(javaws) ;\ + PROGRAM_NAME=$(javaws) ;\ $(edit_launcher_script) < $< > $@ -launcher.build/$(itweb_settings): launcher/itweb-settings.in +launcher.build/$(itweb_settings): launcher/launchers.in mkdir -p launcher.build + MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ;\ + BIN_LOCATION=$(bindir)/$(itweb_settings) ;\ + PROGRAM_NAME=$(itweb_settings) ;\ $(edit_launcher_script) < $< > $@ clean-launchers: diff -r 3dd0ae4efe78 -r 9e1f7dc48c20 launcher/itweb-settings.in --- a/launcher/itweb-settings.in Mon May 20 15:13:32 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -#!/bin/sh - -JAVA=@JAVA@ -LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ -LAUNCHER_FLAGS=-Xms8m -CLASSNAME=net.sourceforge.jnlp.controlpanel.CommandLine -BINARY_LOCATION=@ITWEB_SETTINGS_BIN_LOCATION@ -PROGRAM_NAME=itweb-settings - -PROPERTY_NAME=deployment.jre.dir -CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" -CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` -if [ "x$CUSTOM_JRE" = "x" ] ; then - CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` -fi; -if [ "x$CUSTOM_JRE" != "x" ] ; then - if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then - JAVA=$CUSTOM_JRE/bin/java - else - echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA) in attempt to start. Please fix this." - fi -fi; - -${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \ - -Dicedtea-web.bin.name=${PROGRAM_NAME} \ - -Dicedtea-web.bin.location=${BINARY_LOCATION} \ - ${CLASSNAME} \ - $@ - diff -r 3dd0ae4efe78 -r 9e1f7dc48c20 launcher/javaws.in --- a/launcher/javaws.in Mon May 20 15:13:32 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -#!/bin/sh - -JAVA=@JAVA@ -LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ -LAUNCHER_FLAGS=-Xms8m -CLASSNAME=net.sourceforge.jnlp.runtime.Boot -BINARY_LOCATION=@JAVAWS_BIN_LOCATION@ -SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ -PROGRAM_NAME=javaws -CP=@JRE@/lib/rt.jar - -PROPERTY_NAME=deployment.jre.dir -CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" -CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` -if [ "x$CUSTOM_JRE" = "x" ] ; then - CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` -fi; -if [ "x$CUSTOM_JRE" != "x" ] ; then - if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" -a -e "$CUSTOM_JRE/lib/rt.jar" ] ; then - JAVA=$CUSTOM_JRE/bin/java - CP=$CUSTOM_JRE/lib/rt.jar - else - echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this." - fi -fi; - -JAVA_ARGS=( ) -ARGS=( ) -COMMAND=() - -i=0 -j=0 - -SPLASH="false" -if [ "x$ICEDTEA_WEB_SPLASH" = "x" ] ; then -SPLASH="true" -fi; -while [ "$#" -gt "0" ]; do - case "$1" in - -J*) - JAVA_ARGS[$i]="${1##-J}" - i=$((i+1)) - ;; - *) - ARGS[$j]="$1" - j=$((j+1)) - if [ "$1" = "-headless" ] ; then - SPLASH="false" - fi - ;; - esac - shift -done - -k=0 -COMMAND[k]="${JAVA}" -k=$((k+1)) -if [ "$SPLASH" = "true" ] ; then -COMMAND[k]="-splash:${SPLASH_LOCATION}" -k=$((k+1)) -fi; -COMMAND[k]="${LAUNCHER_BOOTCLASSPATH}" -k=$((k+1)) -COMMAND[k]="${LAUNCHER_FLAGS}" -k=$((k+1)) -i=0 -while [ "$i" -lt "${#JAVA_ARGS[@]}" ]; do - COMMAND[k]="${JAVA_ARGS[$i]}" - i=$((i+1)) - k=$((k+1)) -done -COMMAND[k]="-classpath" -k=$((k+1)) -COMMAND[k]="${CP}" -k=$((k+1)) -COMMAND[k]="-Dicedtea-web.bin.name=${PROGRAM_NAME}" -k=$((k+1)) -COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}" -k=$((k+1)) -COMMAND[k]="${CLASSNAME}" -k=$((k+1)) -j=0 -while [ "$j" -lt "${#ARGS[@]}" ]; do - COMMAND[k]="${ARGS[$j]}" - j=$((j+1)) - k=$((k+1)) -done - -exec -a "javaws" "${COMMAND[@]}" - -exit $? diff -r 3dd0ae4efe78 -r 9e1f7dc48c20 launcher/launchers.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/launcher/launchers.in Mon May 20 16:22:44 2013 +0200 @@ -0,0 +1,91 @@ +#!/bin/sh + +JAVA=@JAVA@ +LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ +LAUNCHER_FLAGS=-Xms8m +CLASSNAME=@MAIN_CLASS@ +BINARY_LOCATION=@BIN_LOCATION@ +SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ +PROGRAM_NAME=@PROGRAM_NAME@ +CP=@JRE@/lib/rt.jar + +PROPERTY_NAME=deployment.jre.dir +CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" +CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +if [ "x$CUSTOM_JRE" = "x" ] ; then + CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +fi; +if [ "x$CUSTOM_JRE" != "x" ] ; then + if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" -a -e "$CUSTOM_JRE/lib/rt.jar" ] ; then + JAVA=$CUSTOM_JRE/bin/java + CP=$CUSTOM_JRE/lib/rt.jar + else + echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this." + fi +fi; + +JAVA_ARGS=( ) +ARGS=( ) +COMMAND=() + +i=0 +j=0 + +SPLASH="false" +if [ "x$ICEDTEA_WEB_SPLASH" = "x" ] ; then +SPLASH="true" +fi; +while [ "$#" -gt "0" ]; do + case "$1" in + -J*) + JAVA_ARGS[$i]="${1##-J}" + i=$((i+1)) + ;; + *) + ARGS[$j]="$1" + j=$((j+1)) + if [ "$1" = "-headless" ] ; then + SPLASH="false" + fi + ;; + esac + shift +done + +k=0 +COMMAND[k]="${JAVA}" +k=$((k+1)) +if [ "$SPLASH" = "true" ] ; then +COMMAND[k]="-splash:${SPLASH_LOCATION}" +k=$((k+1)) +fi; +COMMAND[k]="${LAUNCHER_BOOTCLASSPATH}" +k=$((k+1)) +COMMAND[k]="${LAUNCHER_FLAGS}" +k=$((k+1)) +i=0 +while [ "$i" -lt "${#JAVA_ARGS[@]}" ]; do + COMMAND[k]="${JAVA_ARGS[$i]}" + i=$((i+1)) + k=$((k+1)) +done +COMMAND[k]="-classpath" +k=$((k+1)) +COMMAND[k]="${CP}" +k=$((k+1)) +COMMAND[k]="-Dicedtea-web.bin.name=${PROGRAM_NAME}" +k=$((k+1)) +COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}" +k=$((k+1)) +COMMAND[k]="${CLASSNAME}" +k=$((k+1)) +j=0 +while [ "$j" -lt "${#ARGS[@]}" ]; do + COMMAND[k]="${ARGS[$j]}" + j=$((j+1)) + k=$((k+1)) +done + +exec -a "$PROGRAM_NAME" "${COMMAND[@]}" + +exit $? From jvanek at redhat.com Mon May 20 09:47:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 18:47:00 +0200 Subject: [icedtea-web][rfc] Added de localized man page for javaws In-Reply-To: <5194FDCF.9080005@redhat.com> References: <201305161400.r4GE0W03023363@mail-web01.excite.co.jp> <5194FDCF.9080005@redhat.com> Message-ID: <519A5384.3060804@redhat.com> On 05/16/2013 05:39 PM, Jiri Vanek wrote: > On 05/16/2013 04:00 PM, Jacob Wisor wrote: >> "Jacob Wisor" wrote: >>> "Stefan Ring" wrote: >>>>> Happy reviewing! >>>> >>>> You might want to amend this. I've only touched the UTF-8 version. >>> >>> Yes, agreed on almost everything, thank you. Although I would disagree on >>> >>> -Prüfe auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung >>> +Prüft auf Aktualisierungen, falls Sekunden vergangen seit der letzten Prüfung >>> >>> because the source does not say "checks for update". I interpret that "check" as being in the imperative form. But, those sentences are semantically equivalent. >>> >>> Regards, >>> Jacob >>> >>> ps: I have updated the iso-8859-1 version too. >> >> Sorry, webmailer has dropped the attachment again :-\ > > Hi! Looks ok. Thank you very much! > However - is the non utf version needed? I'm for dropipng it. If it is necessary, then I'm for generating from utf-8 version. > > > J. One more nit - you are not removing old javaws man page in patch (sorry for late notice). (- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1 + ${INSTALL_DATA} $(NETX_SRCDIR)/man/man1/javaws.1 $(DESTDIR)$(mandir)/man1) Also - how big nonsense is to have also utf-8 default man page? And as for the new de - I'm for no duplication here, but for generation via new target (into build dir) via iconv or enca (will need the configure check:( ) from UTF-8 to whatever - and then to install it. J. From jvanek at redhat.com Mon May 20 12:11:41 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 20 May 2013 21:11:41 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification Message-ID: <519A756D.9030308@redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=947647 Hi! This fix is migrating us to ~/.config/icedtea and ~/.cache/icedtea instead of ~/.icedtea. I have not jet deeply tested this patch, but I hope for some early feedback before tomorrow O:) To be honest I don't like this patch, but do not have better idea :( J. -------------- next part -------------- diff -r 9e1f7dc48c20 launcher/launchers.in --- a/launcher/launchers.in Mon May 20 16:22:44 2013 +0200 +++ b/launcher/launchers.in Mon May 20 21:01:58 2013 +0200 @@ -11,7 +11,12 @@ PROPERTY_NAME=deployment.jre.dir CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" -CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.config/icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +#now check in legacy one +if [ "x$CUSTOM_JRE" = "x" ] ; then + CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` +fi; +#now check in global one if [ "x$CUSTOM_JRE" = "x" ] ; then CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` fi; diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Mon May 20 21:01:58 2013 +0200 @@ -62,7 +62,7 @@ * @author Andrew Su (asu at redhat.com, andrew.su at utoronto.ca) * */ -enum CacheLRUWrapper { +public enum CacheLRUWrapper { INSTANCE; private int lockCount = 0; @@ -80,8 +80,10 @@ * accessed) followed by folder of item. value = path to file. */ private PropertiesFile cacheOrder = new PropertiesFile( - new File(cacheDir + File.separator + "recently_used")); + new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME)); + public static final String CACHE_INDEX_FILE_NAME = "recently_used"; + private CacheLRUWrapper(){ File f = cacheOrder.getStoreFile(); if (!f.exists()) { diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/config/Defaults.java --- a/netx/net/sourceforge/jnlp/config/Defaults.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Mon May 20 21:01:58 2013 +0200 @@ -51,28 +51,26 @@ * This class stores the default configuration */ public class Defaults { + + final static String SYSTEM_HOME = System.getProperty("java.home"); + final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; + final static String USER_CONFIG_HOME = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CONFIG_DIR; + final static String USER_CACHE_HOME = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CACHE_DIR; + final static String USER_SECURITY = USER_CONFIG_HOME + File.separator + "security"; + final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator + + System.getProperty("user.name") + File.separator + "netx" + File.separator + + "locks"; + final static File userFile = new File(USER_CONFIG_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES); /** * Get the default settings for deployment */ public static Map> getDefaults() { - File userFile = new File(System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR - + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES); - SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkRead(userFile.toString()); } - final String SYSTEM_HOME = System.getProperty("java.home"); - final String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; - - final String USER_HOME = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR; - final String USER_SECURITY = USER_HOME + File.separator + "security"; - - final String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator - + System.getProperty("user.name") + File.separator + "netx" + File.separator - + "locks"; /* * This is more or less a straight copy from the deployment @@ -90,12 +88,12 @@ { DeploymentConfiguration.KEY_USER_CACHE_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "cache" + USER_CACHE_HOME + File.separator + "cache" }, { DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "pcache" + USER_CACHE_HOME + File.separator + "pcache" }, { DeploymentConfiguration.KEY_SYSTEM_CACHE_DIR, @@ -105,12 +103,12 @@ { DeploymentConfiguration.KEY_USER_LOG_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "log" + USER_CONFIG_HOME + File.separator + "log" }, { DeploymentConfiguration.KEY_USER_TMP_DIR, BasicValueValidators.getFilePathValidator(), - USER_HOME + File.separator + "tmp" + USER_CACHE_HOME + File.separator + "tmp" }, { DeploymentConfiguration.KEY_USER_LOCKS_DIR, diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon May 20 21:01:58 2013 +0200 @@ -36,6 +36,7 @@ import java.util.Set; import javax.naming.ConfigurationException; +import net.sourceforge.jnlp.cache.CacheLRUWrapper; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.FileUtils; @@ -48,8 +49,10 @@ */ public final class DeploymentConfiguration { - public static final String DEPLOYMENT_DIR = ".icedtea"; - public static final String DEPLOYMENT_CONFIG = "deployment.config"; + public static final String DEPLOYMENT_SUBDIR_DIR = "icedtea"; + public static final String DEPLOYMENT_CACHE_DIR = ".cache" + File.separator + DEPLOYMENT_SUBDIR_DIR; + public static final String DEPLOYMENT_CONFIG_DIR = ".config" + File.separator + DEPLOYMENT_SUBDIR_DIR; + public static final String DEPLOYMENT_CONFIG_FILE = "deployment.config"; public static final String DEPLOYMENT_PROPERTIES = "deployment.properties"; public static final String APPLET_TRUST_SETTINGS = ".appletTrustSettings"; @@ -181,7 +184,7 @@ private File userPropertiesFile = null; /*default user file*/ - public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR + public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_CONFIG_DIR + File.separator + DEPLOYMENT_PROPERTIES); /** the current deployment properties */ @@ -206,7 +209,7 @@ } public static File getAppletTrustUserSettingsPath() { - return new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR + return new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_CONFIG_DIR + File.separator + APPLET_TRUST_SETTINGS); } @@ -251,7 +254,7 @@ if (systemConfigFile != null) { if (loadSystemConfiguration(systemConfigFile)) { if (JNLPRuntime.isDebug()) { - System.out.println("System level " + DEPLOYMENT_CONFIG + " is mandatory: " + systemPropertiesMandatory); + System.out.println("System level " + DEPLOYMENT_CONFIG_FILE + " is mandatory: " + systemPropertiesMandatory); } /* Second, read the System level deployment.properties file */ systemProperties = loadProperties(ConfigType.System, systemPropertiesFile, @@ -414,7 +417,7 @@ */ private File findSystemConfigFile() { File etcFile = new File(File.separator + "etc" + File.separator + ".java" + File.separator - + "deployment" + File.separator + DEPLOYMENT_CONFIG); + + "deployment" + File.separator + DEPLOYMENT_CONFIG_FILE); if (etcFile.isFile()) { return etcFile; } @@ -433,10 +436,10 @@ File jreFile; if (jrePath != null) { jreFile = new File(jrePath + File.separator + "lib" - + File.separator + DEPLOYMENT_CONFIG); + + File.separator + DEPLOYMENT_CONFIG_FILE); } else { jreFile = new File(System.getProperty("java.home") + File.separator + "lib" - + File.separator + DEPLOYMENT_CONFIG); + + File.separator + DEPLOYMENT_CONFIG_FILE); } if (jreFile.isFile()) { return jreFile; @@ -676,4 +679,118 @@ + (value.isLocked() ? " [LOCKED]" : "")); } } + + public static void move14AndOlderFilesTo15StructureCatched() { + try{ + move14AndOlderFilesTo15Structure(); + }catch(Throwable t){ + System.err.println("Critical error during converting old files to new. Continuing"); + t.printStackTrace(); + } + + } + private static void move14AndOlderFilesTo15Structure() { + int errors = 0; + String PRE_15_DEPLOYMENT_DIR = ".icedtea"; + String LEGACY_USER_HOME = System.getProperty("user.home") + File.separator + PRE_15_DEPLOYMENT_DIR; + File legacyUserDir = new File(LEGACY_USER_HOME); + if (legacyUserDir.exists()) { + System.out.println("Legacy configuration and cache found. Those will be now transported to new location"); + System.out.println("You should not see this message next time you run icedtea-web!"); + System.out.println("Your custom dirs will not be touched and will work"); + System.out.println("-----------------------------------------------"); + + System.out.println("Preparing new directories:"); + System.out.println(" "+Defaults.USER_CONFIG_HOME); + File f1 = new File(Defaults.USER_CONFIG_HOME); + errors += resultToStd(f1.mkdirs()); + System.out.println(" "+Defaults.USER_CACHE_HOME); + File f2 = new File(Defaults.USER_CACHE_HOME); + errors += resultToStd(f2.mkdirs()); + + String legacySecurity = LEGACY_USER_HOME + File.separator + "security"; + String currentSecurity = Defaults.USER_SECURITY; + errors += moveLegacyToCurrent(legacySecurity, currentSecurity); + + String legacyCache = LEGACY_USER_HOME + File.separator + "cache"; + String currentCache = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_CACHE_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyCache, currentCache); + System.out.println("Adapting " + CacheLRUWrapper.CACHE_INDEX_FILE_NAME + " to new destination"); + //replace all legacyCache by currentCache in new recently_used + try { + File f = new File(currentCache,CacheLRUWrapper.CACHE_INDEX_FILE_NAME); + String s = FileUtils.loadFileAsString(f); + s = s.replace(legacyCache, currentCache); + FileUtils.saveFile(s, f); + } catch (IOException ex) { + ex.printStackTrace(); + errors++; + } + + String legacyPcahceDir = LEGACY_USER_HOME + File.separator + "pcache"; + String currentPcacheDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyPcahceDir, currentPcacheDir); + + String legacyLogDir = LEGACY_USER_HOME + File.separator + "log"; + String currentLogDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_LOG_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyLogDir, currentLogDir); + + String legacyProperties = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES; + String currentProperties = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES; + errors += moveLegacyToCurrent(legacyProperties, currentProperties); + + String legacyPropertiesOld = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old"; + String currentPropertiesOld = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old"; + errors += moveLegacyToCurrent(legacyPropertiesOld, currentPropertiesOld); + + + String legacyAppletTrust = LEGACY_USER_HOME + File.separator + APPLET_TRUST_SETTINGS; + String currentAppletTrust = getAppletTrustUserSettingsPath().getAbsolutePath(); + errors += moveLegacyToCurrent(legacyAppletTrust, currentAppletTrust); + + String legacyTmp = LEGACY_USER_HOME + File.separator + "tmp"; + String currentTmp = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_TMP_DIR).getDefaultValue(); + errors += moveLegacyToCurrent(legacyTmp, currentTmp); + + System.out.println("Removing now empty " + LEGACY_USER_HOME); + errors+=resultToStd(legacyUserDir.delete()); + + if (errors!=0){ + System.out.println("There occureed "+errors+" errors"); + System.out.println("Please double check content of old data in "+LEGACY_USER_HOME+" with "); + System.out.println("new "+Defaults.USER_CONFIG_HOME+" and "+Defaults.USER_CACHE_HOME); + System.out.println("To disable this check again, please remove "+LEGACY_USER_HOME); + } + + } + + } + + private static int moveLegacyToCurrent(String legacy, String current) { + System.out.println("Moving " + legacy + " to " + current); + File cf = new File(current); + File old = new File(legacy); + if (cf.exists()){ + System.out.println("Warning! Destination "+current+" exists!"); + } + if (old.exists()) { + boolean moved = old.renameTo(cf); + return resultToStd(moved); + } else { + System.out.println("Source "+legacy+" do not exists, nothing to do"); + return 0; + } + + } + + private static int resultToStd(boolean securityMove) { + if (securityMove) { + System.out.println("OK"); + return 0; + } else { + System.out.println("ERROR"); + return 1; + } + } + } diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/controlpanel/CachePane.java --- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Mon May 20 21:01:58 2013 +0200 @@ -49,6 +49,7 @@ import javax.swing.table.TableRowSorter; import net.sourceforge.jnlp.cache.CacheDirectory; +import net.sourceforge.jnlp.cache.CacheLRUWrapper; import net.sourceforge.jnlp.cache.DirectoryNode; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; @@ -202,7 +203,7 @@ } private void updateRecentlyUsed(File f) { - File recentlyUsedFile = new File(location + File.separator + "recently_used"); + File recentlyUsedFile = new File(location + File.separator + CacheLRUWrapper.CACHE_INDEX_FILE_NAME); PropertiesFile pf = new PropertiesFile(recentlyUsedFile); pf.load(); Enumeration en = pf.keys(); diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/controlpanel/CommandLine.java --- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Mon May 20 21:01:58 2013 +0200 @@ -453,6 +453,7 @@ * @param args the command line arguments to this program */ public static void main(String[] args) throws Exception { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); if (args.length == 0) { ControlPanel.main(new String[] {}); } else { diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon May 20 21:01:58 2013 +0200 @@ -399,6 +399,7 @@ } public static void main(String[] args) throws Exception { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); final DeploymentConfiguration config = new DeploymentConfiguration(); try { config.load(); diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Mon May 20 21:01:58 2013 +0200 @@ -33,6 +33,7 @@ import net.sourceforge.jnlp.ParserSettings; import net.sourceforge.jnlp.cache.CacheUtil; import net.sourceforge.jnlp.cache.UpdatePolicy; +import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; @@ -113,6 +114,7 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); args = argsIn; if (null != getOption("-viewer")) { diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/runtime/Boot13.java --- a/netx/net/sourceforge/jnlp/runtime/Boot13.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot13.java Mon May 20 21:01:58 2013 +0200 @@ -19,6 +19,7 @@ import java.lang.reflect.*; import java.net.*; import java.security.*; +import net.sourceforge.jnlp.config.DeploymentConfiguration; /** * Allows a Policy and SecurityManager to be set in JRE1.3 without @@ -70,6 +71,7 @@ } public static void main(final String args[]) throws Exception { + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); URL cs = Boot13.class.getProtectionDomain().getCodeSource().getLocation(); // instead of using a custom loadClass search order, we could // put the classes in a boot/ subdir of the JAR and load diff -r 9e1f7dc48c20 netx/net/sourceforge/jnlp/util/FileUtils.java --- a/netx/net/sourceforge/jnlp/util/FileUtils.java Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/util/FileUtils.java Mon May 20 21:01:58 2013 +0200 @@ -16,12 +16,20 @@ package net.sourceforge.jnlp.util; +import java.io.BufferedReader; +import java.io.BufferedWriter; import static net.sourceforge.jnlp.runtime.Translator.R; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.RandomAccessFile; +import java.io.Writer; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; @@ -369,4 +377,67 @@ } return lock; } + + /** + * helping dummy method to save String as file + * + * @param content + * @param f + * @throws IOException + */ + public static void saveFile(String content, File f) throws IOException { + saveFile(content, f, "utf-8"); + } + public static void saveFile(String content, File f,String encoding) throws IOException { + Writer output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f),encoding)); + output.write(content); + output.flush(); + output.close(); + } + + /** + * utility method which can read from any stream as one long String + * + * @param input stream + * @return stream as string + * @throws IOException if connection can't be established or resource does not exist + */ + public static String getContentOfStream(InputStream is,String encoding) throws IOException { + try { + BufferedReader br = new BufferedReader(new InputStreamReader(is, encoding)); + StringBuilder sb = new StringBuilder(); + while (true) { + String s = br.readLine(); + if (s == null) { + break; + } + sb.append(s).append("\n"); + + } + return sb.toString(); + } finally { + is.close(); + } + + } + + /** + * utility method which can read from any stream as one long String + * + * @param input stream + * @return stream as string + * @throws IOException if connection can't be established or resource does not exist + */ + public static String getContentOfStream(InputStream is) throws IOException { + return getContentOfStream(is, "UTF-8"); + + } + + public static String loadFileAsString(File f) throws IOException { + return getContentOfStream(new FileInputStream(f)); + } + + public static String loadFileAsString(File f, String encoding) throws IOException { + return getContentOfStream(new FileInputStream(f), encoding); + } } diff -r 9e1f7dc48c20 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon May 20 16:22:44 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Mon May 20 21:01:58 2013 +0200 @@ -98,7 +98,7 @@ System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); } - + DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched(); try { PluginStreamHandler streamHandler = connect(args[0], args[1]); boolean redirectStreams = System.getenv().containsKey("ICEDTEAPLUGIN_DEBUG"); diff -r 9e1f7dc48c20 tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java Mon May 20 16:22:44 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java Mon May 20 21:01:58 2013 +0200 @@ -55,7 +55,7 @@ .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath(); // does no DeploymentConfiguration exist for this file name? - private final String cacheIndexFileName = "recently_used"; + private final String cacheIndexFileName = CacheLRUWrapper.CACHE_INDEX_FILE_NAME; private final int noEntriesCacheFile = 1000; diff -r 9e1f7dc48c20 tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java Mon May 20 16:22:44 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java Mon May 20 21:01:58 2013 +0200 @@ -43,6 +43,7 @@ import java.io.IOException; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; +import net.sourceforge.jnlp.cache.CacheLRUWrapper; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -61,7 +62,7 @@ .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath(); // does no DeploymentConfiguration exist for this file name? - private final String cacheIndexFileName = "recently_used"; + private final String cacheIndexFileName = CacheLRUWrapper.CACHE_INDEX_FILE_NAME; private final PropertiesFile cacheIndexFile = new PropertiesFile(new File(cacheDir + File.separatorChar + cacheIndexFileName)); private final int noEntriesCacheFile = 1000; diff -r 9e1f7dc48c20 tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java --- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Mon May 20 16:22:44 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Mon May 20 21:01:58 2013 +0200 @@ -60,6 +60,7 @@ import net.sourceforge.jnlp.browsertesting.Browsers; import net.sourceforge.jnlp.closinglisteners.AutoErrorClosingListener; import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; +import net.sourceforge.jnlp.util.FileUtils; import org.junit.Assert; /** @@ -418,22 +419,7 @@ * @throws IOException if connection can't be established or resource does not exist */ public static String getContentOfStream(InputStream is,String encoding) throws IOException { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(is, encoding)); - StringBuilder sb = new StringBuilder(); - while (true) { - String s = br.readLine(); - if (s == null) { - break; - } - sb.append(s).append("\n"); - - } - return sb.toString(); - } finally { - is.close(); - } - + return FileUtils.getContentOfStream(is, encoding); } /** @@ -444,7 +430,7 @@ * @throws IOException if connection can't be established or resource does not exist */ public static String getContentOfStream(InputStream is) throws IOException { - return getContentOfStream(is, "UTF-8"); + return FileUtils.getContentOfStream(is); } @@ -491,13 +477,10 @@ * @throws IOException */ public static void saveFile(String content, File f) throws IOException { - saveFile(content, f, "utf-8"); + FileUtils.saveFile(content, f); } public static void saveFile(String content, File f,String encoding) throws IOException { - Writer output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f),encoding)); - output.write(content); - output.flush(); - output.close(); + FileUtils.saveFile(content, f, encoding); } /** From gitne at excite.co.jp Mon May 20 16:30:39 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 21 May 2013 08:30:39 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBNb3JlIGNvbXBsZXRlIE5ldFggamFyIGZpbGUgbWFuaWZlc3Q=?= Message-ID: <201305202330.r4KNUdfO012246@mail-web01.excite.co.jp> "Jiri Vanek" wrote: > On 05/03/2013 03:33 PM, Jiri Vanek wrote: > > On 05/02/2013 07:03 PM, Omair Majid wrote: > >> On 05/02/2013 12:57 PM, Jacob Wisor wrote: > >>> "Omair Majid" wrote: > >>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: > >>>>> "Jacob Wisor" wrote: > >>>>>>> I would like to propose to make the jar file manifest more > >>>>>>> complete, though I am not sure about the "Implementation-Vendor" > >>>>>>> attribute's (key) value. > >>>> > >>>> I would use "IcedTea" > >>>> > >>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web > >>>> > >>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. > >>> > >>> Setting IcedTea as vendor and then setting "Implementation-URL" to > >>> @PACKAGE_URL@ does not compute. How about setting > >>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding > >>> it to the build script, hence "IcedTea" being the default for > >>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the > >>> default for @PACKAGE_URL@? > >> > >> That sounds fine to me. I went with @PACKAGE_URL@ since it's already > >> defined, and used in only a few places, whereas the string IcedTea is > >> probably present in every file already (along the lines of "This file is > >> part of IcedTea"). > >> > >> I would like to hear what others think about "IcedTea" as the vendor, > >> before we decide to use it. > > > > I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be > > nicely consistent. > > > > Thank you for taking this review! > > > > J. > > > > diff -r 3dd0ae4efe78 netx.manifest.in > --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 > +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 > @@ -1,2 +1,8 @@ > Implementation-Title: @PACKAGE_NAME@ > Implementation-Version: @FULL_VERSION@ > +Implementation-URL: @PACKAGE_URL@ > +Implementation-Vendor: IcedTea What about the vendor? This acutally should be a distro's or publisher's name. It is the same as with the title and url. In my understanding only an unmodified release may/should bear the label IcedTea as vendor, hence especially major or commercial distros should adjust this key for thier release, even more, should they modify an IcedTea release before releasing a binary. But, this is only my interpretation of the jar manifest file specification, and maybe I am taking this too seriously. :) > +Specification-Title: JSR56: Java Network Launching Protocol and API > +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 > +Specification-Vendor: Java Community Process > +Specification-Version: 6.0 > > > May I push? > > J. Regards, Jacob From omajid at redhat.com Mon May 20 18:38:47 2013 From: omajid at redhat.com (Omair Majid) Date: Mon, 20 May 2013 21:38:47 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <519A756D.9030308@redhat.com> References: <519A756D.9030308@redhat.com> Message-ID: <519AD027.4050105@redhat.com> Hi Jiri, On 05/20/2013 03:11 PM, Jiri Vanek wrote: > This fix is migrating us to ~/.config/icedtea and ~/.cache/icedtea > instead of ~/.icedtea. We decided on the current paths (and files and formats) to stay as close to the proprietary JREs as possible. We have deviated from this in the past (the contents of the cache directory, for example), but it's either because of something not (yet) implemented in icedtea-web, or something the user should never have to care about (like cache directory layout). I am not sure if that decision was perfect, but if we are going to change this now, I would like us to weigh all the pros and cons. As far as the patch itself goes, two things jump out to me: 1. We need to stay backwards compatible, if possible. For things like configuration files, we should check the old locations too. For the persistence cache, not reading the old data is like throwing away user's data. 2. The patch seems to be missing support for using the environment variables (such as $XDG_CONFIG_DIRS) to specify the locations of the directories. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at redhat.com Tue May 21 01:19:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 21 May 2013 10:19:00 +0200 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <201305202330.r4KNUdfO012246@mail-web01.excite.co.jp> References: <201305202330.r4KNUdfO012246@mail-web01.excite.co.jp> Message-ID: <519B2DF4.8040207@redhat.com> On 05/21/2013 01:30 AM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 05/03/2013 03:33 PM, Jiri Vanek wrote: >>> On 05/02/2013 07:03 PM, Omair Majid wrote: >>>> On 05/02/2013 12:57 PM, Jacob Wisor wrote: >>>>> "Omair Majid" wrote: >>>>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: >>>>>>> "Jacob Wisor" wrote: >>>>>>>>> I would like to propose to make the jar file manifest more >>>>>>>>> complete, though I am not sure about the "Implementation-Vendor" >>>>>>>>> attribute's (key) value. >>>>>> >>>>>> I would use "IcedTea" >>>>>> >>>>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >>>>>> >>>>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. >>>>> >>>>> Setting IcedTea as vendor and then setting "Implementation-URL" to >>>>> @PACKAGE_URL@ does not compute. How about setting >>>>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding >>>>> it to the build script, hence "IcedTea" being the default for >>>>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the >>>>> default for @PACKAGE_URL@? >>>> >>>> That sounds fine to me. I went with @PACKAGE_URL@ since it's already >>>> defined, and used in only a few places, whereas the string IcedTea is >>>> probably present in every file already (along the lines of "This file is >>>> part of IcedTea"). >>>> >>>> I would like to hear what others think about "IcedTea" as the vendor, >>>> before we decide to use it. >>> >>> I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be >>> nicely consistent. >>> >>> Thank you for taking this review! >>> >>> J. >>> >> >> diff -r 3dd0ae4efe78 netx.manifest.in >> --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 >> +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 >> @@ -1,2 +1,8 @@ >> Implementation-Title: @PACKAGE_NAME@ >> Implementation-Version: @FULL_VERSION@ >> +Implementation-URL: @PACKAGE_URL@ >> +Implementation-Vendor: IcedTea > > What about the vendor? This acutally should be a distro's or publisher's name. It is the same as with the title and url. In my understanding only an unmodified release may/should bear the label IcedTea as vendor, hence especially major or commercial distros should adjust this key for thier release, even more, should they modify an IcedTea release before releasing a binary. > > But, this is only my interpretation of the jar manifest file specification, and maybe I am taking this too seriously. :) We are forwarding the distribution via configure - eg http://pkgs.fedoraproject.org/cgit/icedtea-web.git/tree/icedtea-web.spec#n103 My interpretation of Implementation-Vendor is the person/organisation who actually implemented the specification. Thanx for hints! > >> +Specification-Title: JSR56: Java Network Launching Protocol and API >> +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 >> +Specification-Vendor: Java Community Process >> +Specification-Version: 6.0 >> >> >> May I push? >> >> J. > > Regards, > Jacob > From ptisnovs at icedtea.classpath.org Tue May 21 02:14:48 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 21 May 2013 09:14:48 +0000 Subject: /hg/rhino-tests: Updated two tests in CompilableClassTest for (O... Message-ID: changeset c4adcc4e0eb0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c4adcc4e0eb0 author: Pavel Tisnovsky date: Tue May 21 11:18:13 2013 +0200 Updated two tests in CompilableClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/CompilableClassTest.java | 74 +++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 4 deletions(-) diffs (132 lines): diff -r a4b6ee7d30e6 -r c4adcc4e0eb0 ChangeLog --- a/ChangeLog Mon May 20 10:08:26 2013 +0200 +++ b/ChangeLog Tue May 21 11:18:13 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-21 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Updated two tests in CompilableClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-05-20 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r a4b6ee7d30e6 -r c4adcc4e0eb0 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Mon May 20 10:08:26 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Tue May 21 11:18:13 2013 +0200 @@ -609,6 +609,11 @@ "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException", + "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException", + }; + // get all inherited methods Method[] methods = this.compilableClass.getMethods(); // and transform the array into a list of method names @@ -616,7 +621,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -639,6 +657,11 @@ "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException", + "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException", + }; + // get all declared methods Method[] declaredMethods = this.compilableClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -646,7 +669,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -667,7 +703,22 @@ methodsThatShouldExist_jdk7.put("compile", new Class[] {java.lang.String.class}); methodsThatShouldExist_jdk7.put("compile", new Class[] {java.io.Reader.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("compile", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("compile", new Class[] {java.io.Reader.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -701,7 +752,22 @@ methodsThatShouldExist_jdk7.put("compile", new Class[] {java.lang.String.class}); methodsThatShouldExist_jdk7.put("compile", new Class[] {java.io.Reader.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("compile", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("compile", new Class[] {java.io.Reader.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From ptisnovs at icedtea.classpath.org Tue May 21 02:39:25 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 21 May 2013 09:39:25 +0000 Subject: /hg/gfx-test: One helper method and five new tests added into Message-ID: changeset b683ef37b88a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b683ef37b88a author: Pavel Tisnovsky date: Tue May 21 11:42:52 2013 +0200 One helper method and five new tests added into ClippingCircleByEllipseShape test suite. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java | 115 +++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diffs (145 lines): diff -r 47183195d9f0 -r b683ef37b88a ChangeLog --- a/ChangeLog Mon May 20 10:18:01 2013 +0200 +++ b/ChangeLog Tue May 21 11:42:52 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-21 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: + One helper method and five new tests added into + ClippingCircleByEllipseShape test suite. + 2013-05-20 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByConvexPolygonalShape.java: diff -r 47183195d9f0 -r b683ef37b88a src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Mon May 20 10:18:01 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Tue May 21 11:42:52 2013 +0200 @@ -120,6 +120,31 @@ /** * Draw circle clipped by an ellipse shape. Circle is drawn using alpha + * paint with black color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByEllipseShapeAlphaPaintBlack(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip ellipse + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillBlackColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingEllipseShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by an ellipse shape. Circle is drawn using alpha * paint with red color and selected transparency. * * @param image @@ -307,6 +332,96 @@ /** * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with black color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintBlack000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 0% transparency + drawCircleClippedByEllipseShapeAlphaPaintBlack(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with black color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintBlack025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 25% transparency + drawCircleClippedByEllipseShapeAlphaPaintBlack(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with black color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintBlack050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 50% transparency + drawCircleClippedByEllipseShapeAlphaPaintBlack(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with black color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintBlack075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 75% transparency + drawCircleClippedByEllipseShapeAlphaPaintBlack(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with black color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintBlack100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 100% transparency + drawCircleClippedByEllipseShapeAlphaPaintBlack(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is * rendered using alpha paint with red color at 0% transparency. * * @param image From jvanek at redhat.com Tue May 21 03:53:53 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 21 May 2013 12:53:53 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <519AD027.4050105@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> Message-ID: <519B5241.7010407@redhat.com> On 05/21/2013 03:38 AM, Omair Majid wrote: > Hi Jiri, > > On 05/20/2013 03:11 PM, Jiri Vanek wrote: >> This fix is migrating us to ~/.config/icedtea and ~/.cache/icedtea >> instead of ~/.icedtea. Hello Omair! Thank you very much for feedback. Thou you have unwillingly fell into endless discussion :) //which hopefully will lead to best solution ;) > > We decided on the current paths (and files and formats) to stay as close > to the proprietary JREs as possible. We have deviated from this in the I was not aware of this, but maybe there is time to revalidate. - What benefits we have from keeping the like-proprietary plugin structure? - Are we still close enough to it? - What benefits we can have fro moving to new one? - and how to achieve this painlessly... So my answers: - none - have no idea ;) - All our main "customers" are using the XDG and bug have been already filled - https://bugzilla.redhat.com/show_bug.cgi?id=947647#c4 - is explaining more deeply (second link) TBH - I liked the old structure :) note - I do not insist on this patch. It was proposed to 1.5 - http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 - and Deepak Agreed - but this can be of ocurse reverted - as I noted, I do not insists. - I have hard-coded the paths - It was because of my ideas appeared to be in dead end, and so in good condition to initialise the patch Can we support both, or at least "both" ? Need to support the 1.4 and older is a msut of course. > past (the contents of the cache directory, for example), but it's either > because of something not (yet) implemented in icedtea-web, or something > the user should never have to care about (like cache directory layout). > > I am not sure if that decision was perfect, but if we are going to > change this now, I would like us to weigh all the pros and cons. > > As far as the patch itself goes, two things jump out to me: > > 1. We need to stay backwards compatible, if possible. For things like > configuration files, we should check the old locations too. For the > persistence cache, not reading the old data is like throwing away user's > data. ouch. 99% of this patch is focussed on backward compatibility. see the move14AndOlderFilesTo15Structure() method (and its usages)! And launchers.... > > 2. The patch seems to be missing support for using the environment > variables (such as $XDG_CONFIG_DIRS) to specify the locations of the > directories. Yes, this was intentional. It will need more tuning and more adaptations. Currently there are specified relative paths : $XDG_DATA_HOME -user-specific data files $XDG_CONFIG_HOME - user-specific configuration $XDG_CACHE_HOME - There is a single base directory relative to which user-specific non-essential (cached) data should be written. $XDG_RUNTIME_DIR - user-specific runtime files and other file Fromthose I have used $XDG_CONFIG_HOME - for deployment.properties(.old), security and .appletTrustSettings and log $XDG_CACHE_HOME - for cache, tmp and pcache (persistence) Some of them are worthy to other XDG, but I'm not fan of such a crumble [rfc] ? Some more thoughts about this: - eg I have non XDG variable set, but many applications have already started to use theirs default values. - If we decide to move to ./config and ./cache: if used XDG* variables are set, then use them. otherwise use ./config and ./cache if they change, user is on his own? - If we decide to not to move to ./config and ./cache: if used XDG* variables are set, then use them. otherwise use ./icedtea if they change, user is on his own? - how about xdg not following systems (windows) ? Keep .icedtea or move to ./config and ./cache ? Thanx for any hints J. From bugzilla-daemon at icedtea.classpath.org Tue May 21 04:43:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 11:43:06 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED CC| |jvanek at redhat.com Resolution|FIXED |--- --- Comment #9 from JiriVanek --- Please backport to 1.4 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/acd02a7f/attachment.html From adomurad at icedtea.classpath.org Tue May 21 06:30:42 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 21 May 2013 13:30:42 +0000 Subject: /hg/release/icedtea-web-1.4: 2 new changesets Message-ID: changeset d340d2f2ac7c in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=d340d2f2ac7c author: Adam Domurad date: Tue May 21 09:11:41 2013 -0400 Fix PR854: Resizing an applet several times causes 100% CPU load changeset b5b5f59833e2 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=b5b5f59833e2 author: Adam Domurad date: Tue May 21 09:31:57 2013 -0400 Reproducer for PR854: Resizing an applet several times causes 100% CPU load diffstat: ChangeLog | 16 ++ NEWS | 2 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 13 +- tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html | 57 +++++++ tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java | 72 ++++++++++ tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java | 65 +++++++++ 6 files changed, 213 insertions(+), 12 deletions(-) diffs (264 lines): diff -r 838e90afbbb8 -r b5b5f59833e2 ChangeLog --- a/ChangeLog Mon May 20 15:42:42 2013 +0200 +++ b/ChangeLog Tue May 21 09:31:57 2013 -0400 @@ -1,3 +1,19 @@ +2013-05-21 Adam Domurad + + Reproducer for PR854. + * tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html: + Resizes applet from Javascript. + * tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java: + Simple applet with a few helper methods. + * tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java: + Test applet resizing. + +2013-05-14 Adam Domurad + + Fix PR854: Resizing an applet several times causes 100% CPU load + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Replace buggy initialization wait. + 2013-05-20 Jiri Vanek Fixed possible deadlock for applet->js->applet call diff -r 838e90afbbb8 -r b5b5f59833e2 NEWS --- a/NEWS Mon May 20 15:42:42 2013 +0200 +++ b/NEWS Tue May 21 09:31:57 2013 -0400 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.4.1 (2013-XX-YY): +* Plugin + - PR854: Resizing an applet several times causes 100% CPU load New in release 1.4 (2013-05-02): * Added cs localization diff -r 838e90afbbb8 -r b5b5f59833e2 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 20 15:42:42 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue May 21 09:31:57 2013 -0400 @@ -681,18 +681,7 @@ if (message.startsWith("width")) { // Wait for panel to come alive - long maxTimeToSleep = APPLET_TIMEOUT; - statusLock.lock(); - try { - while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && - maxTimeToSleep > 0) { - maxTimeToSleep -= waitTillTimeout(statusLock, initComplete, - maxTimeToSleep); - } - } - finally { - statusLock.unlock(); - } + waitForAppletInit(panel); // 0 => width, 1=> width_value, 2 => height, 3=> height_value String[] dimMsg = message.split(" "); diff -r 838e90afbbb8 -r b5b5f59833e2 tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html Tue May 21 09:31:57 2013 -0400 @@ -0,0 +1,57 @@ + + +

+

+ + + + + diff -r 838e90afbbb8 -r b5b5f59833e2 tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java Tue May 21 09:31:57 2013 -0400 @@ -0,0 +1,72 @@ + +import java.applet.Applet; + +/* AppletTest.java +Copyright (C) 2011 Red Hat, Inc. + +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, version 2. + +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. + */ +public class ResizeApplet extends Applet { + + /* Make sures the process is exited if we stall */ + private static class StallTimeoutThread extends Thread { + private static final int MILLISECONDS_TO_SLEEP = 5000; + @Override + public void run() { + try { + Thread.sleep(MILLISECONDS_TO_SLEEP); + System.out.println("*** APPLET FINISHED ***"); + } catch (InterruptedException ie) { + } + } + } + + @Override + public void init() { + new StallTimeoutThread().start(); + } + + /* Utility for Javascript-side */ + public void print(String str) { + System.out.println(str); + } + + /* Utility for Javascript-side */ + public synchronized void sleep(int time) { + try { + wait(time); + } catch (InterruptedException e) { + } + } +} diff -r 838e90afbbb8 -r b5b5f59833e2 tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java Tue May 21 09:31:57 2013 -0400 @@ -0,0 +1,65 @@ +/* AppletTestTests.java +Copyright (C) 2011 Red Hat, Inc. + +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, version 2. + +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. + */ + +import static org.junit.Assert.assertTrue; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess.AutoClose; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; + +import org.junit.Test; + +public class ResizeAppletTests extends BrowserTest { + + void assertContains(String source, String message, String substring) { + assertTrue(source + " should contain '" + substring + "' but did not!", + message.contains(substring)); + } + + @Test + @TestInBrowsers(testIn = { Browsers.all }) + @NeedsDisplay + public void testResizing() throws Exception { + ProcessResult pr = server.executeBrowser("/ResizeApplet.html", AutoClose.CLOSE_ON_CORRECT_END); + assertContains("stdout", pr.stdout, AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING); + assertContains("stdout", pr.stdout, "Resizing to 500 by 500"); + } +} From bugzilla-daemon at icedtea.classpath.org Tue May 21 06:30:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 13:30:53 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 --- Comment #10 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea-web-1.4?cmd=changeset;node=d340d2f2ac7c author: Adam Domurad date: Tue May 21 09:11:41 2013 -0400 Fix PR854: Resizing an applet several times causes 100% CPU load -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/55c258fd/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 21 06:31:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 13:31:02 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 --- Comment #11 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea-web-1.4?cmd=changeset;node=b5b5f59833e2 author: Adam Domurad date: Tue May 21 09:31:57 2013 -0400 Reproducer for PR854: Resizing an applet several times causes 100% CPU load -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/4e03db2c/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 21 06:59:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 13:59:57 +0000 Subject: [Bug 854] Resizing an applet several times causes 100% CPU load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution|--- |FIXED --- Comment #12 from Adam Domurad --- Sorry, I thought I did. Thanks, did that now. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/c6d38f9b/attachment.html From omajid at redhat.com Tue May 21 07:55:43 2013 From: omajid at redhat.com (Omair Majid) Date: Tue, 21 May 2013 10:55:43 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <519B5241.7010407@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <519B5241.7010407@redhat.com> Message-ID: <519B8AEF.8020104@redhat.com> On 05/21/2013 06:53 AM, Jiri Vanek wrote: > On 05/21/2013 03:38 AM, Omair Majid wrote: >> 1. We need to stay backwards compatible, if possible. For things like >> configuration files, we should check the old locations too. For the >> persistence cache, not reading the old data is like throwing away user's >> data. > > ouch. 99% of this patch is focussed on backward compatibility. see the > move14AndOlderFilesTo15Structure() method (and its usages)! And > launchers.... Whoops. Sorry! I skimmed over the patch and did not notice this at all (I was looking for these changes in another part of the code). This seems good enough. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From gnu.andrew at redhat.com Tue May 21 09:01:27 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 21 May 2013 12:01:27 -0400 (EDT) Subject: Utility "jar" changes file permissions In-Reply-To: References: Message-ID: <364799699.5409089.1369152087030.JavaMail.root@redhat.com> ----- Original Message ----- > Hello, > > When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the > following jar file gets wrong file permissions (not "go" readable): > > % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar > -rw------- 1 root root 2.5M May 15 08:33 > /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar > > I found the "jar" utility has already had such issue as reported here [0] > [1]. > > I can reproduce the wrong behavior explained in Sun's bug report [1]: > > % touch newjar.jar > % echo New >> newManifest > % echo OneMore >> oneMoreManifest > > % jar -cfM0 newjar.jar newManifest > > % ls -l newjar.jar > -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar > > % jar uf newjar.jar oneMoreManifest > > % ls -l newjar.jar > -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar > > There is a unit test called UpdateJar.java in OpenJDK for that. > > Is it worth opening a bug report? > Yes. Please file one at http://icedtea.classpath.org/bugzilla 7175845 is present in the 2.1.x, 2.2.x and 2.3.x series of releases, and the first two don't show this issue. Something, however, has caused it to regress again in 2.3.x, as I'm seeing the same thing here. I don't see it in 3.x but then it's hard to compare as the OpenJDK 8 build system is completely different. > [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 > [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 > > Thanks! > > -- > Guillaume > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From omajid at redhat.com Tue May 21 09:16:30 2013 From: omajid at redhat.com (Omair Majid) Date: Tue, 21 May 2013 12:16:30 -0400 Subject: Utility "jar" changes file permissions In-Reply-To: References: Message-ID: <519B9DDE.6030205@redhat.com> Hi, On 05/20/2013 06:33 AM, Guillaume ALAUX wrote: > I found the "jar" utility has already had such issue as reported here [0] [1]. As comment 4 in that bugzilla states, this was fixed in 2.3.3. If you seeing it again, it sounds like a regression. Can you reproduce with an upstream icedtea7/icedtea7-forest build? Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at redhat.com Tue May 21 09:23:47 2013 From: omajid at redhat.com (Omair Majid) Date: Tue, 21 May 2013 12:23:47 -0400 Subject: Utility "jar" changes file permissions In-Reply-To: <364799699.5409089.1369152087030.JavaMail.root@redhat.com> References: <364799699.5409089.1369152087030.JavaMail.root@redhat.com> Message-ID: <519B9F93.5060608@redhat.com> On 05/21/2013 12:01 PM, Andrew Hughes wrote: > Something, however, has caused > it to regress again in 2.3.x, as I'm seeing the same thing here. Same problem here: $ java -version java version "1.7.0_19" OpenJDK Runtime Environment (fedora-2.3.9.3.fc17-x86_64) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) Fedora uses an icedtea7-forest-based build. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From gnu.andrew at redhat.com Tue May 21 09:35:37 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 21 May 2013 12:35:37 -0400 (EDT) Subject: Utility "jar" changes file permissions In-Reply-To: <519B9DDE.6030205@redhat.com> References: <519B9DDE.6030205@redhat.com> Message-ID: <63144090.5422136.1369154137483.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > On 05/20/2013 06:33 AM, Guillaume ALAUX wrote: > > I found the "jar" utility has already had such issue as reported here [0] > > [1]. > > As comment 4 in that bugzilla states, this was fixed in 2.3.3. If you > seeing it again, it sounds like a regression. Can you reproduce with an > upstream icedtea7/icedtea7-forest build? > It's in HEAD too, if that's what you mean. > Thanks, > Omair > > -- > PGP Key: 66484681 (http://pgp.mit.edu/) > Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From neugens at redhat.com Tue May 21 10:00:46 2013 From: neugens at redhat.com (Mario Torre) Date: Tue, 21 May 2013 19:00:46 +0200 Subject: XRender changed proposal Message-ID: <1369155646.5931.77.camel@galactica.localdomain> Hi all! I thought I would forward here this mail since it will likely have an effect for Linux distributions, so packagers and system integrators should be aware (and I'm not sure most follow all the mailing lists): http://mail.openjdk.java.net/pipermail/2d-dev/2013-May/003351.html Cheers, Mario From bugzilla-daemon at icedtea.classpath.org Tue May 21 11:57:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 18:57:04 +0000 Subject: [Bug 1437] New: [regression] utility "jar" changes file permissions Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 Bug ID: 1437 Summary: [regression] utility "jar" changes file permissions Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: guillaume at archlinux.org CC: unassigned at icedtea.classpath.org When building OpenJDK 7u21 with Icedtea 2.3.9 (for Arch Linux) the following jar file gets wrong file permissions (not "go" readable): % ls -Ahl /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar -rw------- 1 root root 2.5M May 15 08:33 /usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar I found the "jar" utility has already had such issue as reported here [0] [1]. I can reproduce the wrong behavior explained in Sun's bug report [1]: % touch newjar.jar % echo New >> newManifest % echo OneMore >> oneMoreManifest % jar -cfM0 newjar.jar newManifest % ls -l newjar.jar -rw-r--r-- 1 guillaume users 132 May 20 12:18 newjar.jar % jar uf newjar.jar oneMoreManifest % ls -l newjar.jar -rw------- 1 guillaume users 264 May 20 12:20 newjar.jar There is a unit test called UpdateJar.java in OpenJDK for that. Discussion on distro-pkg-dev list: [3] [0] https://bugzilla.redhat.com/show_bug.cgi?id=855977 [1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845 [3] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-May/023345.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/099fce37/attachment.html From guillaume at archlinux.org Tue May 21 11:58:27 2013 From: guillaume at archlinux.org (Guillaume ALAUX) Date: Tue, 21 May 2013 20:58:27 +0200 Subject: Utility "jar" changes file permissions In-Reply-To: <63144090.5422136.1369154137483.JavaMail.root@redhat.com> References: <519B9DDE.6030205@redhat.com> <63144090.5422136.1369154137483.JavaMail.root@redhat.com> Message-ID: On 21 May 2013 18:35, Andrew Hughes wrote: > ----- Original Message ----- >> Hi, >> >> On 05/20/2013 06:33 AM, Guillaume ALAUX wrote: >> > I found the "jar" utility has already had such issue as reported here [0] >> > [1]. >> >> As comment 4 in that bugzilla states, this was fixed in 2.3.3. If you >> seeing it again, it sounds like a regression. Can you reproduce with an >> upstream icedtea7/icedtea7-forest build? >> > > It's in HEAD too, if that's what you mean. > >> Thanks, >> Omair >> >> -- >> PGP Key: 66484681 (http://pgp.mit.edu/) >> Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 >> > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > OK, filed this bug report: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 -- Guillaume From bugzilla-daemon at icedtea.classpath.org Tue May 21 13:44:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 21 May 2013 20:44:43 +0000 Subject: [Bug 1437] [regression] utility "jar" changes file permissions In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Version|unspecified |2.3.9 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/e811a9b9/attachment.html From ptisnovs at icedtea.classpath.org Wed May 22 01:15:31 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 22 May 2013 08:15:31 +0000 Subject: /hg/gfx-test: Fixed test names and added five helper methods into Message-ID: changeset f9cf11fe37b7 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f9cf11fe37b7 author: Pavel Tisnovsky date: Wed May 22 10:18:54 2013 +0200 Fixed test names and added five helper methods into ClippingCircleByRectangleArea. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java | 157 ++++++++- 2 files changed, 147 insertions(+), 16 deletions(-) diffs (292 lines): diff -r b683ef37b88a -r f9cf11fe37b7 ChangeLog --- a/ChangeLog Tue May 21 11:42:52 2013 +0200 +++ b/ChangeLog Wed May 22 10:18:54 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-22 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java: + Fixed test names and added five helper methods into + ClippingCircleByRectangleArea. + 2013-05-21 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: diff -r b683ef37b88a -r f9cf11fe37b7 src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java Tue May 21 11:42:52 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java Wed May 22 10:18:54 2013 +0200 @@ -119,7 +119,32 @@ } /** - * Draw circle clipped by a rectangle area. Circle is drawn using alpha paint with + * Draw circle clipped by rectangle area. Circle is drawn using alpha paint with + * black color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAreaAlphaPaintBlack(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillBlackColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by a rectangle area. Circle is drawn using alpha paint with * red color and selected transparency. * * @param image @@ -194,6 +219,106 @@ } /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * magenta color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAreaAlphaPaintMagenta(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillMagentaColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * cyan color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAreaAlphaPaintCyan(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillCyanColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * yellow color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAreaAlphaPaintYellow(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillYellowColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * white color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAreaAlphaPaintWhite(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillWhiteColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** * Check if circle shape could be clipped by a rectangle area. Circle is * rendered using stroke paint. * @@ -315,7 +440,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintRed000(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintRed000(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 0% transparency drawCircleClippedByRectangleAreaAlphaPaintRed(image, graphics2d, 0); @@ -333,7 +458,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintRed025(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintRed025(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 25% transparency drawCircleClippedByRectangleAreaAlphaPaintRed(image, graphics2d, 25); @@ -351,7 +476,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintRed050(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintRed050(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 50% transparency drawCircleClippedByRectangleAreaAlphaPaintRed(image, graphics2d, 50); @@ -369,7 +494,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintRed075(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintRed075(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 75% transparency drawCircleClippedByRectangleAreaAlphaPaintRed(image, graphics2d, 75); @@ -387,7 +512,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintRed100(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintRed100(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 100% transparency drawCircleClippedByRectangleAreaAlphaPaintRed(image, graphics2d, 100); @@ -405,7 +530,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintGreen000(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintGreen000(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 0% transparency drawCircleClippedByRectangleAreaAlphaPaintGreen(image, graphics2d, 0); @@ -423,7 +548,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintGreen025(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintGreen025(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 25% transparency drawCircleClippedByRectangleAreaAlphaPaintGreen(image, graphics2d, 25); @@ -441,7 +566,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintGreen050(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintGreen050(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 50% transparency drawCircleClippedByRectangleAreaAlphaPaintGreen(image, graphics2d, 50); @@ -459,7 +584,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintGreen075(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintGreen075(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 75% transparency drawCircleClippedByRectangleAreaAlphaPaintGreen(image, graphics2d, 75); @@ -477,7 +602,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintGreen100(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintGreen100(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 100% transparency drawCircleClippedByRectangleAreaAlphaPaintGreen(image, graphics2d, 100); @@ -495,7 +620,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintBlue000(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintBlue000(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 0% transparency drawCircleClippedByRectangleAreaAlphaPaintBlue(image, graphics2d, 0); @@ -513,7 +638,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintBlue025(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintBlue025(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 25% transparency drawCircleClippedByRectangleAreaAlphaPaintBlue(image, graphics2d, 25); @@ -531,7 +656,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintBlue050(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintBlue050(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 50% transparency drawCircleClippedByRectangleAreaAlphaPaintBlue(image, graphics2d, 50); @@ -549,7 +674,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintBlue075(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintBlue075(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 75% transparency drawCircleClippedByRectangleAreaAlphaPaintBlue(image, graphics2d, 75); @@ -567,7 +692,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCircleByRectangleShapeAlphaPaintBlue100(TestImage image, Graphics2D graphics2d) + public TestResult testClipCircleByRectangleAreaAlphaPaintBlue100(TestImage image, Graphics2D graphics2d) { // draw circle clipped by rectangle area using alpha paint with 100% transparency drawCircleClippedByRectangleAreaAlphaPaintBlue(image, graphics2d, 100); From ptisnovs at icedtea.classpath.org Wed May 22 01:25:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 22 May 2013 08:25:42 +0000 Subject: /hg/rhino-tests: Updated four tests in SimpleScriptContextClassT... Message-ID: changeset dcd99aa87cdd in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=dcd99aa87cdd author: Pavel Tisnovsky date: Wed May 22 10:29:08 2013 +0200 Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 8 +- src/org/RhinoTests/SimpleScriptContextClassTest.java | 139 ++++++++++++++++++- 2 files changed, 142 insertions(+), 5 deletions(-) diffs (202 lines): diff -r c4adcc4e0eb0 -r dcd99aa87cdd ChangeLog --- a/ChangeLog Tue May 21 11:18:13 2013 +0200 +++ b/ChangeLog Wed May 22 10:29:08 2013 +0200 @@ -1,7 +1,13 @@ +2013-05-22 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-05-21 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: - Updated two tests in CompilableClassTest for (Open)JDK8 API: + Updated four tests in CompilableClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. 2013-05-20 Pavel Tisnovsky diff -r c4adcc4e0eb0 -r dcd99aa87cdd src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Tue May 21 11:18:13 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Wed May 22 10:29:08 2013 +0200 @@ -730,6 +730,32 @@ "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public boolean java.lang.Object.equals(java.lang.Object)", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)", + "public java.io.Reader javax.script.SimpleScriptContext.getReader()", + "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()", + "public java.io.Writer javax.script.SimpleScriptContext.getWriter()", + "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)", + "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)", + "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)", + "public java.lang.String java.lang.Object.toString()", + "public java.util.List javax.script.SimpleScriptContext.getScopes()", + "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)", + "public native int java.lang.Object.hashCode()", + "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)", + "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)", + "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)", + "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)", + "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)", + }; + // get all inherited methods Method[] methods = this.simpleScriptContextClass.getMethods(); // and transform the array into a list of method names @@ -737,7 +763,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -784,6 +823,23 @@ "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)", + "public java.io.Reader javax.script.SimpleScriptContext.getReader()", + "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()", + "public java.io.Writer javax.script.SimpleScriptContext.getWriter()", + "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)", + "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)", + "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)", + "public java.util.List javax.script.SimpleScriptContext.getScopes()", + "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)", + "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)", + "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)", + "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)", + "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)", + "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)", + }; + // get all declared methods Method[] declaredMethods = this.simpleScriptContextClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -792,7 +848,19 @@ methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -855,7 +923,43 @@ methodsThatShouldExist_jdk7.put("notify", new Class[] {}); methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("getWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("getReader", new Class[] {}); + methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getScopes", new Class[] {}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -913,7 +1017,34 @@ methodsThatShouldExist_jdk7.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); methodsThatShouldExist_jdk7.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("getWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("getReader", new Class[] {}); + methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getScopes", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From aazores at redhat.com Wed May 22 06:25:03 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 22 May 2013 09:25:03 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about Message-ID: <519CC72F.30107@redhat.com> Removed applications.html and references to it in "jawas -about" Changelog: extra/net/sourceforge/javaws/about/Main.java: Removed applications tab extra/net/sourceforge/javaws/about/resources/applications.html: Removed unneeded file -------------- next part -------------- A non-text attachment was scrubbed... Name: remove_application_tab.patch Type: text/x-patch Size: 4365 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130522/4f84c6d5/remove_application_tab.patch From jvanek at redhat.com Wed May 22 07:22:41 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 22 May 2013 16:22:41 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <519CC72F.30107@redhat.com> References: <519CC72F.30107@redhat.com> Message-ID: <519CD4B1.3030708@redhat.com> On 05/22/2013 03:25 PM, Andrew Azores wrote: > Removed applications.html and references to it in "jawas -about" > > Changelog: > > extra/net/sourceforge/javaws/about/Main.java: Removed applications tab > extra/net/sourceforge/javaws/about/resources/applications.html: Removed unneeded file Hi! To be honest - I'm for complete removal of this "about". Or at least of much more havy refactoring Also to be honest(2) this is so deeply needed that it deserves an line in http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 table. It should work at least somehow in headless mode, and should be generated from already existing resources (eg authors, news...) So in short - get rid of "extras" jar (and it logic in makefile) and write specialised about dialogue inisde netx itself:) Feel free to be inspired by existing one, but avoid duplicated resources. if you want to bother with it (+1!) then please assign yourself on http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5, and go on! Best regards from CZ! J. From andrew at icedtea.classpath.org Wed May 22 09:32:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:32:52 +0000 Subject: /hg/release/icedtea7-forest-2.4: 82 new changesets Message-ID: changeset c67be67c39ca in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c67be67c39ca author: coffeys date: Mon Jan 14 07:28:39 2013 -0800 Merge changeset a0cb83ca395c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a0cb83ca395c author: lana date: Tue Jan 15 19:31:51 2013 -0800 Merge changeset 2d8fdaa5bb55 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2d8fdaa5bb55 author: katleman date: Wed Jan 16 13:59:18 2013 -0800 Added tag jdk7u14-b10 for changeset 745a15bb6d94 changeset 0aa3727598fd in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0aa3727598fd author: lana date: Tue Jan 22 22:42:41 2013 -0800 Merge changeset 69c9e0572736 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=69c9e0572736 author: katleman date: Wed Jan 23 14:01:06 2013 -0800 Added tag jdk7u14-b11 for changeset 2d8fdaa5bb55 changeset 594dbbbb84ad in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=594dbbbb84ad author: lana date: Mon Jan 28 11:13:17 2013 -0800 Merge changeset ae5c1b29297d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ae5c1b29297d author: katleman date: Fri Feb 01 09:56:27 2013 -0800 Added tag jdk7u14-b12 for changeset 594dbbbb84ad changeset e716c92a031d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e716c92a031d author: katleman date: Fri Feb 01 10:25:14 2013 -0800 Added tag jdk7u13-b20 for changeset 3b7815df113f changeset 18056eea9d44 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=18056eea9d44 author: ewendeli date: Sun Feb 03 22:33:29 2013 +0100 Merge changeset 87f5de90fa2e in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=87f5de90fa2e author: ewendeli date: Fri Feb 08 15:01:50 2013 +0100 Merge changeset 3ad64008994c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3ad64008994c author: katleman date: Wed Feb 13 17:56:36 2013 -0800 Added tag jdk7u14-b13 for changeset ae5c1b29297d changeset bb97ad0c9e5a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bb97ad0c9e5a author: lana date: Tue Feb 19 20:35:03 2013 -0800 Merge changeset 527d3cf769ec in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=527d3cf769ec author: katleman date: Tue Jan 29 14:14:24 2013 -0800 Added tag jdk7u13-b10 for changeset 3b7815df113f changeset aaee40fd1cc9 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=aaee40fd1cc9 author: katleman date: Fri Feb 01 10:31:25 2013 -0800 Added tag jdk7u13-b30 for changeset 527d3cf769ec changeset 0e52db2d9bb8 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0e52db2d9bb8 author: ewendeli date: Fri Feb 01 23:26:16 2013 +0100 Merge changeset 0324fca94d07 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0324fca94d07 author: katleman date: Thu Feb 07 14:17:33 2013 -0800 Added tag jdk7u15-b01 for changeset 0e52db2d9bb8 changeset 25a9d44cebf2 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=25a9d44cebf2 author: katleman date: Fri Feb 08 10:46:08 2013 -0800 Added tag jdk7u15-b02 for changeset 0324fca94d07 changeset 1abae9a1e7c1 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1abae9a1e7c1 author: ewendeli date: Wed Feb 13 19:43:33 2013 +0100 Merge changeset 6aed332c1b72 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6aed332c1b72 author: ewendeli date: Wed Feb 20 19:48:42 2013 +0100 Merge changeset f37a75bd3959 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f37a75bd3959 author: katleman date: Wed Feb 13 18:19:15 2013 -0800 Added tag jdk7u15-b30 for changeset 25a9d44cebf2 changeset aa9931279a52 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=aa9931279a52 author: katleman date: Mon Feb 18 12:09:02 2013 -0800 Added tag jdk7u15-b03 for changeset f37a75bd3959 changeset dc6aac68b246 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=dc6aac68b246 author: katleman date: Mon Feb 18 12:28:29 2013 -0800 Added tag jdk7u15-b32 for changeset 2412f7b8551e changeset 0c2b2dae93e7 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0c2b2dae93e7 author: katleman date: Mon Feb 18 12:42:37 2013 -0800 Merge changeset 8e49ff2feda3 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8e49ff2feda3 author: katleman date: Tue Feb 26 12:41:41 2013 -0800 Added tag jdk7u17-b01 for changeset 0c2b2dae93e7 changeset 933d424580f9 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=933d424580f9 author: katleman date: Fri Mar 01 11:55:08 2013 -0800 Added tag jdk7u17-b02 for changeset 8e49ff2feda3 changeset 5bb6978e985a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5bb6978e985a author: coffeys date: Sat Mar 02 17:23:38 2013 +0000 Merge changeset 8a86b5c8db29 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8a86b5c8db29 author: mduigou date: Tue Mar 05 09:57:34 2013 -0800 8004726: webrev.ksh still generating monaco URL instead of JIRA 8008629: webrev.ksh needs to quote bug title it gets back from scraping bugs.sun.com Reviewed-by: coffeys changeset b534282bd377 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b534282bd377 author: katleman date: Wed Feb 27 16:51:36 2013 -0800 Added tag jdk7u14-b14 for changeset bb97ad0c9e5a changeset 54ec51d80889 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=54ec51d80889 author: lana date: Tue Mar 05 16:49:21 2013 -0800 Merge changeset ad8af6660843 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ad8af6660843 author: katleman date: Thu Mar 07 11:08:21 2013 -0800 Added tag jdk7u14-b15 for changeset b534282bd377 changeset 210f464368db in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=210f464368db author: lana date: Mon Mar 11 14:50:26 2013 -0700 Merge changeset f07712232642 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f07712232642 author: katleman date: Wed Mar 13 17:17:47 2013 -0700 Added tag jdk7u14-b16 for changeset 210f464368db changeset 9e2a9a2c5b24 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9e2a9a2c5b24 author: katleman date: Wed Mar 20 14:47:27 2013 -0700 Added tag jdk7u14-b17 for changeset f07712232642 changeset 8714dddd443a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8714dddd443a author: andrew date: Wed Apr 03 14:16:46 2013 +0100 Merge jdk7u14-b17 changeset ca5bfe0a4ecc in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ca5bfe0a4ecc author: katleman date: Wed Mar 27 16:18:01 2013 -0700 Added tag jdk7u14-b18 for changeset 9e2a9a2c5b24 changeset 1d2e3280c9cc in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1d2e3280c9cc author: tbell date: Wed Mar 20 14:47:03 2013 -0700 8007815: extend HAVE_JPRT_SAVE_BUNDLES from product builds to all builds 8007878: Need to move fast-debug bundle targets to top-level makefiles Reviewed-by: cgruszka, katleman changeset 4cfd1375f85f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=4cfd1375f85f author: cgruszka date: Thu Mar 21 23:23:51 2013 -0400 Merge changeset d9d4dc020cb3 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d9d4dc020cb3 author: cgruszka date: Tue Apr 02 13:11:15 2013 -0400 Merge changeset b4b7795ef804 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b4b7795ef804 author: katleman date: Wed Apr 03 15:15:46 2013 -0700 Added tag jdk7u14-b19 for changeset d9d4dc020cb3 changeset f413e7a22c19 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f413e7a22c19 author: katleman date: Fri Apr 05 09:10:18 2013 -0700 Added tag jdk7u14-b19 for changeset b4b7795ef804 changeset 41686e19d818 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=41686e19d818 author: katleman date: Wed Apr 10 10:29:41 2013 -0700 Added tag jdk7u14-b20 for changeset f413e7a22c19 changeset 0201e35d7311 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0201e35d7311 author: katleman date: Thu Feb 07 14:19:51 2013 -0800 Added tag jdk7u21-b01 for changeset 527d3cf769ec changeset bc264b362dc7 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bc264b362dc7 author: ewendeli date: Mon Feb 11 21:05:57 2013 +0100 Merge changeset 20603c659295 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=20603c659295 author: katleman date: Thu Feb 14 14:10:47 2013 -0800 Added tag jdk7u21-b02 for changeset bc264b362dc7 changeset 18be0eedaa4f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=18be0eedaa4f author: katleman date: Tue Feb 19 17:13:10 2013 -0800 Added tag jdk7u21-b03 for changeset 20603c659295 changeset ab9dea896baa in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=ab9dea896baa author: ohair date: Thu May 10 08:26:26 2012 -0700 7167593: Changed get_source.sh to allow for getting full oracle jdk repo forest Reviewed-by: erikj, asaha, chegar, sla, dholmes, mbykov, coleenp changeset a2d8b628b24b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2d8b628b24b author: ohair date: Fri May 11 17:52:57 2012 -0700 7167976: Fix broken get_source.sh script Reviewed-by: tbell changeset dd037cebb1da in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=dd037cebb1da author: ohair date: Fri Jun 08 17:25:46 2012 -0700 7170091: Fix missing wait between repo cloning in hgforest.sh Reviewed-by: strarup changeset d2b1fdd8ee0a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d2b1fdd8ee0a author: ohair date: Mon Jul 16 11:37:13 2012 -0700 7184406: Adjust get_source/hgforest script to allow for trailing // characters Reviewed-by: tbell changeset df8768f7e1a4 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=df8768f7e1a4 author: katleman date: Tue Feb 26 12:44:51 2013 -0800 Added tag jdk7u21-b04 for changeset d2b1fdd8ee0a changeset d247cdeb828f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d247cdeb828f author: katleman date: Tue Oct 16 14:54:17 2012 -0700 Added tag jdk7u9-b31 for changeset 81f8b620894e changeset 701b88b298ca in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=701b88b298ca author: katleman date: Wed Oct 31 10:10:17 2012 -0700 Added tag jdk7u9-b32 for changeset d247cdeb828f changeset bfa3eca34a8c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bfa3eca34a8c author: asaha date: Tue Dec 04 11:38:26 2012 -0800 Merge changeset 337ce65c8c35 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=337ce65c8c35 author: asaha date: Wed Dec 05 15:22:05 2012 -0800 Merge changeset df3d89e37fa0 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=df3d89e37fa0 author: katleman date: Fri Dec 07 08:18:53 2012 -0800 Added tag jdk7u10-b31 for changeset 337ce65c8c35 changeset 7c0710ed65b0 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=7c0710ed65b0 author: ewendeli date: Tue Jan 15 08:20:58 2013 +0100 Merge changeset 61cee7a518a4 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=61cee7a518a4 author: katleman date: Wed Jan 16 13:56:59 2013 -0800 Added tag jdk7u11-b32 for changeset 7c0710ed65b0 changeset 450ec9324779 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=450ec9324779 author: katleman date: Tue Jan 29 14:10:09 2013 -0800 Added tag jdk7u11-b33 for changeset 61cee7a518a4 changeset 842639ef7d4d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=842639ef7d4d author: asaha date: Fri Feb 08 19:09:38 2013 -0800 Merge changeset 5c1b2900a65b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5c1b2900a65b author: asaha date: Mon Feb 11 11:13:27 2013 -0800 Merge changeset c90cc9883460 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c90cc9883460 author: katleman date: Tue Feb 12 12:32:26 2013 -0800 Added tag jdk7u15-b31 for changeset 5c1b2900a65b changeset e7adbfbcd837 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e7adbfbcd837 author: asaha date: Thu Feb 14 13:17:03 2013 -0800 Merge changeset 769634fc19c3 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=769634fc19c3 author: katleman date: Tue Feb 19 12:02:51 2013 -0800 Added tag jdk7u15-b33 for changeset e7adbfbcd837 changeset 617616a02705 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=617616a02705 author: asaha date: Fri Mar 01 16:05:40 2013 -0800 Merge changeset b9bb888ef4e5 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b9bb888ef4e5 author: cl date: Sat Mar 02 09:47:23 2013 -0800 Added tag jdk7u17-b30 for changeset 933d424580f9 changeset 790582955edb in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=790582955edb author: asaha date: Sat Mar 02 14:33:28 2013 -0800 Merge changeset 941539a9f644 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=941539a9f644 author: cl date: Sat Mar 02 18:53:53 2013 -0800 Added tag jdk7u17-b31 for changeset 790582955edb changeset 2d6657f92359 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2d6657f92359 author: asaha date: Mon Mar 04 10:34:06 2013 -0800 Merge changeset 14522481739d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=14522481739d author: katleman date: Tue Mar 05 16:45:01 2013 -0800 Added tag jdk7u21-b05 for changeset 2d6657f92359 changeset 0df382e8c17b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0df382e8c17b author: katleman date: Tue Mar 12 14:43:56 2013 -0700 Added tag jdk7u21-b06 for changeset 14522481739d changeset 1aff32a21aba in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1aff32a21aba author: katleman date: Tue Mar 19 14:33:20 2013 -0700 Added tag jdk7u21-b07 for changeset 0df382e8c17b changeset a2e0099b4cf7 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2e0099b4cf7 author: katleman date: Wed Mar 20 14:47:06 2013 -0700 Added tag jdk7u21-b08 for changeset 1aff32a21aba changeset 602ad1a5b09f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=602ad1a5b09f author: katleman date: Tue Mar 26 15:00:04 2013 -0700 Added tag jdk7u21-b09 for changeset a2e0099b4cf7 changeset fa322ca37832 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=fa322ca37832 author: katleman date: Sun Mar 31 03:46:21 2013 -0700 Added tag jdk7u21-b10 for changeset 602ad1a5b09f changeset 450e8dde919d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=450e8dde919d author: katleman date: Thu Apr 04 15:47:56 2013 -0700 Added tag jdk7u21-b11 for changeset fa322ca37832 changeset 170520883597 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=170520883597 author: katleman date: Fri Apr 05 12:48:37 2013 -0700 Added tag jdk7u21-b30 for changeset 450e8dde919d changeset 83925fc0e910 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=83925fc0e910 author: katleman date: Sun Apr 07 16:34:45 2013 -0700 Added tag jdk7u21-b12 for changeset 170520883597 changeset 4c001e883e37 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=4c001e883e37 author: coffeys date: Tue Apr 16 11:49:36 2013 +0100 Merge changeset 3311f9d46513 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3311f9d46513 author: katleman date: Fri Apr 19 12:44:04 2013 -0700 6983966: remove lzma and upx from repository JDK7u Reviewed-by: ngthomas, cgruszka, tbell changeset 6579f526e5e4 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6579f526e5e4 author: andrew date: Tue Apr 23 23:14:58 2013 +0100 Merge jdk7u14-b20 changeset 78c6b2167b94 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=78c6b2167b94 author: andrew date: Wed May 22 16:10:13 2013 +0100 Remove jcheck changeset 30065a72715f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=30065a72715f author: andrew date: Wed May 22 17:02:40 2013 +0100 Merge with HEAD diffstat: .hgtags | 64 +++++++++++++++++++++++++++++++++++++++++++++++ .jcheck/conf | 2 - Makefile | 22 +++++++++++----- make/Defs-internal.gmk | 3 +- make/deploy-rules.gmk | 32 +----------------------- make/install-rules.gmk | 20 ++++++++++++++- make/jprt.gmk | 6 +-- make/scripts/webrev.ksh | 66 +++++++++++++++++++++++++++++------------------- 8 files changed, 143 insertions(+), 72 deletions(-) diffs (truncated from 533 to 500 lines): diff -r 1a03ef4794dc -r 30065a72715f .hgtags --- a/.hgtags Fri Dec 28 10:10:52 2012 -0800 +++ b/.hgtags Wed May 22 17:02:40 2013 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -191,6 +197,7 @@ 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -213,6 +220,8 @@ dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 +81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31 +d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32 d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 @@ -223,6 +232,21 @@ 494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30 +337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31 +c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20 +168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21 +7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32 +61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33 +c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03 +0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04 +e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05 +f6abff072aabfee866342d9f7f4aac7d13450ddf jdk7u11-b06 +80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07 +e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09 +3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30 +3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20 1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01 d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03 @@ -239,3 +263,43 @@ eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05 a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06 c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 +1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 +87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint +745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 +2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 +594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 +ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13 +bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14 +b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15 +0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 +0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 +25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 +5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31 +e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33 +f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 +0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 +8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 +933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 +790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 +bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 +20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 +d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04 +2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05 +14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06 +0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07 +1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08 +a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09 +602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 +fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 +450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 +170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16 +f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17 +9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18 +d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 +d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 +b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 +f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 diff -r 1a03ef4794dc -r 30065a72715f .jcheck/conf --- a/.jcheck/conf Fri Dec 28 10:10:52 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 1a03ef4794dc -r 30065a72715f Makefile --- a/Makefile Fri Dec 28 10:10:52 2012 -0800 +++ b/Makefile Wed May 22 17:02:40 2013 +0100 @@ -164,16 +164,23 @@ clobber:: deploy-clobber endif +ifeq ($(BUILD_INSTALL_BUNDLES), true) + generic_build_repo_series:: install-binaries-jdk-debug + clobber:: install-binaries-jdk-debug-clobber +endif + generic_build_repo_series:: @$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build)) # The debug build, fastdebug or debug. Needs special handling. -# Note that debug builds do NOT do INSTALL steps, but must be done -# after the product build and before the INSTALL step of the product build. +# +# Note that debug builds do NOT do INSTALL steps aside from the +# install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets. # # DEBUG_NAME is fastdebug or debug # ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix # The resulting image directory (j2sdk-image) is used by the install makefiles +# (only if debug files are present when install checks for them) # to create a debug install bundle jdk-*-debug-** bundle (tar or zip) # which will install in the debug or fastdebug subdirectory of the # normal product install area. @@ -189,7 +196,7 @@ ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR) - + create_fresh_product_bootdir: FRC $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ GENERATE_DOCS=false \ @@ -218,7 +225,7 @@ ifeq ($(DO_BOOT_CYCLE),true) - + # Create the bootdir to use in the build product_build:: create_fresh_product_bootdir debug_build:: create_fresh_debug_bootdir @@ -256,6 +263,8 @@ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ + BUILD_INSTALL_BUNDLES=true \ + CREATE_DEBUGINFO_BUNDLES=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ generic_build_repo_series @@ -540,8 +549,8 @@ ################################################################ .PHONY: all test test_run test_start test_summary test_clean \ - generic_build_repo_series \ - what clobber insane \ + generic_build_repo_series \ + what clobber insane \ dev dev-build dev-sanity dev-clobber \ product_build \ fastdebug_build \ @@ -556,4 +565,3 @@ # Force target FRC: - diff -r 1a03ef4794dc -r 30065a72715f make/Defs-internal.gmk --- a/make/Defs-internal.gmk Fri Dec 28 10:10:52 2012 -0800 +++ b/make/Defs-internal.gmk Wed May 22 17:02:40 2013 +0100 @@ -322,7 +322,8 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + STATIC_CXX=$(STATIC_CXX) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) diff -r 1a03ef4794dc -r 30065a72715f make/deploy-rules.gmk --- a/make/deploy-rules.gmk Fri Dec 28 10:10:52 2012 -0800 +++ b/make/deploy-rules.gmk Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. 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 @@ -42,20 +42,6 @@ endif DEPLOY_BUILD_TARGETS = sanity deploy -# Only build 7-Zip LZMA file compression if it is available -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - DEPLOY_BUILD_TARGETS += extra-comp-all - endif - endif -endif ifneq ($(JQS), off) ifeq ($(ARCH_DATA_MODEL), 32) @@ -65,22 +51,6 @@ endif endif -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - # Only set up to use UPX compression if it is available - UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(UP_TMP), true) - DEPLOY_BUILD_TARGETS += cmd-comp-all - endif - endif -endif - - - ifndef DEV_ONLY DEPLOY_BUILD_TARGETS += images else diff -r 1a03ef4794dc -r 30065a72715f make/install-rules.gmk --- a/make/install-rules.gmk Fri Dec 28 10:10:52 2012 -0800 +++ b/make/install-rules.gmk Wed May 22 17:02:40 2013 +0100 @@ -97,6 +97,23 @@ @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all + +install-binaries-jdk-debug: +ifeq ($(BUILD_INSTALL_BUNDLES), true) + @$(call MakeStart,install,binaries-jdk-debug) + ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \ + $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish,install,binaries-jdk-debug) +endif + +install-binaries-jdk-debug-clobber: +ifeq ($(BUILD_INSTALL_BUNDLES), true) + @$(call MakeStart,install,binaries-jdk-debug-clobber) + ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \ + $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish,install,binaries-jdk-debug-clobber) +endif + install-clobber: ifeq ($(BUILD_INSTALL), true) @$(call MakeStart,install,clobber) @@ -116,4 +133,5 @@ ###################################### .PHONY: install install-build install-clobber install-sanity \ - update-installer update-patchgen installer + update-installer update-patchgen installer \ + install-binaries-jdk-debug install-binaries-jdk-debug-clobber diff -r 1a03ef4794dc -r 30065a72715f make/jprt.gmk --- a/make/jprt.gmk Fri Dec 28 10:10:52 2012 -0800 +++ b/make/jprt.gmk Wed May 22 17:02:40 2013 +0100 @@ -30,11 +30,9 @@ # To get all the bundles from JPRT, use: # jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ... -DEFAULT_BUILD_FLAVOR=product - # JPRT will define these when it builds -JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip -JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip +JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip +JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip ifeq ($(PLATFORM),windows) ZIPFLAGS=-q diff -r 1a03ef4794dc -r 30065a72715f make/scripts/webrev.ksh --- a/make/scripts/webrev.ksh Fri Dec 28 10:10:52 2012 -0800 +++ b/make/scripts/webrev.ksh Wed May 22 17:02:40 2013 +0100 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # Use is subject to license terms. # # This script takes a file list and a workspace and builds a set of html files @@ -27,7 +27,7 @@ # Documentation is available via 'webrev -h'. # -WEBREV_UPDATED=23.18-hg +WEBREV_UPDATED=23.18-hg+jbs HTML=' &|g' + sed -e 's|[0-9]\{5,\}|&|g' } # @@ -230,8 +230,8 @@ # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ # new/usr/src/tools/scripts/webrev.sh \ # webrev.sh usr/src/tools/scripts \ -# ' -# 1234567 my bugid' > .html +# ' +# JDK-1234567 my bugid' > .html # # framed_sdiff() is then called which creates $2.frames.html # in the webrev tree. @@ -1160,7 +1160,7 @@ print "$comm" return fi - + print "$comm" | html_quote | bug2url | sac2url ) fi @@ -1418,7 +1418,7 @@ next;} END {for (tree in trees) { rev=revs[trees[tree]]; - if (rev > 0) + if (rev > 0) {printf("%s %d\n",trees[tree],rev-1)} }}' | while read LINE do @@ -1459,7 +1459,7 @@ { TREE=$1 HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" - + $HGCMD -mdn 2>/dev/null | $FILTER | while read F do echo $TREE/$F @@ -1543,7 +1543,7 @@ if (n == 0) { printf("A %s/%s\n",tree,$2)} else - { printf("A %s\n",$2)}; + { printf("A %s\n",$2)}; next} /^ / {n=index($1,tree); if (n == 0) @@ -1604,7 +1604,7 @@ # We need at least one of default-push or default paths set in .hg/hgrc # If neither are set we don't know who to compare with. -function flist_from_mercurial +function flist_from_mercurial { # if [ "${PWS##ssh://}" != "$PWS" -o \ # "${PWS##http://}" != "$PWS" -o \ @@ -1757,7 +1757,7 @@ elif [[ "$OS" == "Linux" ]]; then DEVTOOLS="/java/devtools/linux/bin" fi - + ppath=$PATH ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin @@ -1844,7 +1844,7 @@ ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` fi - + } function build_old_new_mercurial @@ -2096,7 +2096,7 @@ PARENT_REV=$OPTARG;; v) print "$0 version: $WEBREV_UPDATED";; - + ?) usage;; esac @@ -2338,7 +2338,7 @@ # [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` - + if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then print -u2 "$codemgr_ws: no such workspace" exit 1 @@ -2521,10 +2521,16 @@ # Bug IDs will be replaced by a URL. Order of precedence # is: default location, $WEBREV_BUGURL, the -O flag. # -BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' +BUGURL='https://jbs.oracle.com/bugs/browse/' [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" -[[ -n "$Oflag" ]] && \ +if [[ -n "$Oflag" ]]; then + CRID=`echo $CRID | sed -e 's/JDK-//'` BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' + IDPREFIX='' +else + IDPREFIX='JDK-' +fi + # # Likewise, ARC cases will be replaced by a URL. Order of precedence @@ -2561,7 +2567,7 @@ # # Should we ignore changes in white spaces when generating diffs? -# +# if [[ -n $bflag ]]; then DIFFOPTS="-t" else @@ -2748,7 +2754,7 @@ fi fi else - + # # If we have old and new versions of the file then run the # appropriate diffs. This is complicated by a couple of factors: @@ -3000,22 +3006,31 @@ # external URL has a like: # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection # while internal URL has like: -# <title>6641309: Wrong Cookie separator used in HttpURLConnection +# [#JDK-6641309] Wrong Cookie separator used in HttpURLConnection # if [[ -n $CRID ]]; then for id in $CRID do + if [[ -z "$Oflag" ]]; then From andrew at icedtea.classpath.org Wed May 22 09:32:59 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:32:59 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: 78 new changesets Message-ID: changeset 39198050e22f in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=39198050e22f author: coffeys date: Mon Jan 14 07:29:42 2013 -0800 Merge changeset 22c8baea6d15 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=22c8baea6d15 author: lana date: Tue Jan 15 19:32:22 2013 -0800 Merge changeset 3bd891cd9877 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3bd891cd9877 author: katleman date: Wed Jan 16 13:59:22 2013 -0800 Added tag jdk7u14-b10 for changeset 3877f9ae971e changeset 2a6c7c63f9a0 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2a6c7c63f9a0 author: lana date: Tue Jan 22 22:44:32 2013 -0800 Merge changeset 2f07113262e4 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2f07113262e4 author: katleman date: Wed Jan 23 14:01:11 2013 -0800 Added tag jdk7u14-b11 for changeset 3bd891cd9877 changeset fbb83600db33 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fbb83600db33 author: lana date: Mon Jan 28 11:13:53 2013 -0800 Merge changeset cd7aaec5accf in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cd7aaec5accf author: katleman date: Fri Feb 01 09:56:29 2013 -0800 Added tag jdk7u14-b12 for changeset fbb83600db33 changeset f9a20c477c97 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f9a20c477c97 author: katleman date: Fri Feb 01 10:25:16 2013 -0800 Added tag jdk7u13-b20 for changeset b9ab9b203a41 changeset 6bbe5a7732db in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6bbe5a7732db author: ewendeli date: Sun Feb 03 22:43:34 2013 +0100 Merge changeset 08e281a52adf in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=08e281a52adf author: ewendeli date: Fri Feb 08 15:01:55 2013 +0100 Merge changeset b0b39a52b324 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b0b39a52b324 author: katleman date: Wed Feb 13 17:56:40 2013 -0800 Added tag jdk7u14-b13 for changeset cd7aaec5accf changeset 9e8bde2586a1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9e8bde2586a1 author: lana date: Tue Feb 19 20:35:29 2013 -0800 Merge changeset f5ef46204dba in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f5ef46204dba author: katleman date: Tue Jan 29 14:14:28 2013 -0800 Added tag jdk7u13-b10 for changeset b9ab9b203a41 changeset c3d891ebfc80 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c3d891ebfc80 author: katleman date: Fri Feb 01 10:31:27 2013 -0800 Added tag jdk7u13-b30 for changeset f5ef46204dba changeset 622e370c2d1e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=622e370c2d1e author: ewendeli date: Fri Feb 01 23:26:31 2013 +0100 Merge changeset 301883880483 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=301883880483 author: katleman date: Thu Feb 07 14:17:39 2013 -0800 Added tag jdk7u15-b01 for changeset 622e370c2d1e changeset 7f0e7ce088ff in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7f0e7ce088ff author: katleman date: Fri Feb 08 10:46:13 2013 -0800 Added tag jdk7u15-b02 for changeset 301883880483 changeset 0f949226b529 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0f949226b529 author: ewendeli date: Wed Feb 13 19:45:59 2013 +0100 Merge changeset 6b4a200b700b in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6b4a200b700b author: ewendeli date: Wed Feb 20 19:49:12 2013 +0100 Merge changeset e5b996dabec6 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e5b996dabec6 author: katleman date: Wed Feb 13 18:19:16 2013 -0800 Added tag jdk7u15-b30 for changeset 7f0e7ce088ff changeset 19106da7a087 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=19106da7a087 author: katleman date: Mon Feb 18 12:09:10 2013 -0800 Added tag jdk7u15-b03 for changeset e5b996dabec6 changeset 5863908fe0e7 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5863908fe0e7 author: katleman date: Mon Feb 18 12:28:30 2013 -0800 Added tag jdk7u15-b32 for changeset b192d1487319 changeset 94e8b9b0e0ef in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=94e8b9b0e0ef author: katleman date: Mon Feb 18 12:40:51 2013 -0800 Merge changeset e82d31e1f118 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e82d31e1f118 author: katleman date: Tue Feb 26 12:41:43 2013 -0800 Added tag jdk7u17-b01 for changeset 94e8b9b0e0ef changeset d4366e557c4c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d4366e557c4c author: katleman date: Fri Mar 01 11:55:12 2013 -0800 Added tag jdk7u17-b02 for changeset e82d31e1f118 changeset 839474f32e79 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=839474f32e79 author: coffeys date: Sat Mar 02 17:23:53 2013 +0000 Merge changeset a5bae874e7cd in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a5bae874e7cd author: katleman date: Wed Feb 27 16:51:38 2013 -0800 Added tag jdk7u14-b14 for changeset 9e8bde2586a1 changeset 691a9cf25f75 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=691a9cf25f75 author: mfang date: Wed Feb 27 19:47:43 2013 -0800 8008764: 7uX l10n resource file translation update Reviewed-by: naoto changeset 2b1fcbe4e785 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2b1fcbe4e785 author: mfang date: Wed Feb 27 21:00:42 2013 -0800 Merge changeset 8b8eada4ad76 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8b8eada4ad76 author: lana date: Tue Mar 05 16:50:53 2013 -0800 Merge changeset 98abbee5dd5e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=98abbee5dd5e author: dmeetry date: Tue Mar 12 21:56:22 2013 +0400 7199858: Marshal exception is wrong Reviewed-by: lancea changeset 2410de9c2fb1 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2410de9c2fb1 author: katleman date: Thu Mar 07 11:08:22 2013 -0800 Added tag jdk7u14-b15 for changeset 2b1fcbe4e785 changeset 38282b734dae in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=38282b734dae author: lana date: Mon Mar 11 14:49:27 2013 -0700 Merge changeset 8b1d77697ca4 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8b1d77697ca4 author: katleman date: Wed Mar 13 17:17:51 2013 -0700 Added tag jdk7u14-b16 for changeset 38282b734dae changeset 07408c9598d3 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=07408c9598d3 author: lana date: Mon Mar 18 10:14:57 2013 -0700 Merge changeset 1c57c2f102c5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1c57c2f102c5 author: katleman date: Wed Mar 20 14:47:28 2013 -0700 Added tag jdk7u14-b17 for changeset 8b1d77697ca4 changeset 862b43d26e03 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=862b43d26e03 author: lana date: Mon Mar 25 10:29:56 2013 -0700 Merge changeset 04ad0a30f564 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=04ad0a30f564 author: andrew date: Wed Apr 03 14:17:36 2013 +0100 Merge jdk7u14-b17 changeset bfbaab73969d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bfbaab73969d author: katleman date: Wed Mar 27 16:18:08 2013 -0700 Added tag jdk7u14-b18 for changeset 862b43d26e03 changeset a921b45a1f90 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a921b45a1f90 author: katleman date: Wed Apr 03 15:15:47 2013 -0700 Added tag jdk7u14-b19 for changeset bfbaab73969d changeset 54320e5d9da6 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=54320e5d9da6 author: katleman date: Fri Apr 05 09:10:20 2013 -0700 Added tag jdk7u14-b19 for changeset a921b45a1f90 changeset fb590ca4de9a in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fb590ca4de9a author: katleman date: Wed Apr 10 10:29:44 2013 -0700 Added tag jdk7u14-b20 for changeset 54320e5d9da6 changeset 97f3860de6f3 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=97f3860de6f3 author: katleman date: Thu Feb 07 14:19:54 2013 -0800 Added tag jdk7u21-b01 for changeset f5ef46204dba changeset 17ecd70a2247 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=17ecd70a2247 author: ewendeli date: Mon Feb 11 21:06:19 2013 +0100 Merge changeset bf0877613aeb in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bf0877613aeb author: katleman date: Thu Feb 14 14:10:51 2013 -0800 Added tag jdk7u21-b02 for changeset 17ecd70a2247 changeset 3e39240d7314 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3e39240d7314 author: katleman date: Tue Feb 19 17:13:17 2013 -0800 Added tag jdk7u21-b03 for changeset bf0877613aeb changeset 3d0f2d5b1866 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3d0f2d5b1866 author: katleman date: Tue Feb 26 12:44:53 2013 -0800 Added tag jdk7u21-b04 for changeset 3e39240d7314 changeset 0fa70374aa25 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0fa70374aa25 author: katleman date: Tue Oct 16 14:54:24 2012 -0700 Added tag jdk7u9-b31 for changeset b426254b45bc changeset afa47e72c532 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=afa47e72c532 author: katleman date: Wed Oct 31 10:10:26 2012 -0700 Added tag jdk7u9-b32 for changeset 0fa70374aa25 changeset caba1031dc5d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=caba1031dc5d author: asaha date: Tue Dec 04 11:39:27 2012 -0800 Merge changeset 2723612f5983 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2723612f5983 author: asaha date: Wed Dec 05 15:22:56 2012 -0800 Merge changeset b3288e910e58 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b3288e910e58 author: katleman date: Fri Dec 07 08:19:01 2012 -0800 Added tag jdk7u10-b31 for changeset 2723612f5983 changeset 24f8cb8a0a61 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=24f8cb8a0a61 author: ewendeli date: Tue Jan 15 08:21:17 2013 +0100 Merge changeset 4bfef14df261 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4bfef14df261 author: katleman date: Wed Jan 16 13:57:00 2013 -0800 Added tag jdk7u11-b32 for changeset 24f8cb8a0a61 changeset c13469259b39 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c13469259b39 author: katleman date: Tue Jan 29 14:10:19 2013 -0800 Added tag jdk7u11-b33 for changeset 4bfef14df261 changeset 77c765b54496 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=77c765b54496 author: asaha date: Fri Feb 08 19:10:07 2013 -0800 Merge changeset 3714b558333e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3714b558333e author: asaha date: Mon Feb 11 11:13:47 2013 -0800 Merge changeset 8d524ccfc97b in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8d524ccfc97b author: katleman date: Tue Feb 12 12:32:33 2013 -0800 Added tag jdk7u15-b31 for changeset 3714b558333e changeset f0c038610b6d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f0c038610b6d author: asaha date: Thu Feb 14 13:17:38 2013 -0800 Merge changeset ddf597f14512 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ddf597f14512 author: katleman date: Tue Feb 19 12:02:52 2013 -0800 Added tag jdk7u15-b33 for changeset f0c038610b6d changeset 8d1452e09015 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8d1452e09015 author: asaha date: Fri Mar 01 16:06:21 2013 -0800 Merge changeset a287afb78f76 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a287afb78f76 author: cl date: Sat Mar 02 09:47:27 2013 -0800 Added tag jdk7u17-b30 for changeset d4366e557c4c changeset a6f066dd2cd5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a6f066dd2cd5 author: asaha date: Sat Mar 02 14:33:57 2013 -0800 Merge changeset 6401c6b99d2d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6401c6b99d2d author: cl date: Sat Mar 02 18:54:04 2013 -0800 Added tag jdk7u17-b31 for changeset a6f066dd2cd5 changeset f5a291dc9d21 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f5a291dc9d21 author: asaha date: Mon Mar 04 10:18:46 2013 -0800 Merge changeset 94f2ebfccc5e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=94f2ebfccc5e author: katleman date: Tue Mar 05 16:45:12 2013 -0800 Added tag jdk7u21-b05 for changeset f5a291dc9d21 changeset 23a57aceeb69 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=23a57aceeb69 author: katleman date: Tue Mar 12 14:44:01 2013 -0700 Added tag jdk7u21-b06 for changeset 94f2ebfccc5e changeset ebedf04bfffe in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ebedf04bfffe author: katleman date: Tue Mar 19 14:33:23 2013 -0700 Added tag jdk7u21-b07 for changeset 23a57aceeb69 changeset b8f92ad1f0cc in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b8f92ad1f0cc author: katleman date: Wed Mar 20 14:47:08 2013 -0700 Added tag jdk7u21-b08 for changeset ebedf04bfffe changeset b2adfd931a25 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b2adfd931a25 author: katleman date: Tue Mar 26 15:00:09 2013 -0700 Added tag jdk7u21-b09 for changeset b8f92ad1f0cc changeset 61e2e2d9cfce in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=61e2e2d9cfce author: katleman date: Sun Mar 31 03:46:27 2013 -0700 Added tag jdk7u21-b10 for changeset b2adfd931a25 changeset 3c774492beaa in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3c774492beaa author: katleman date: Thu Apr 04 15:48:01 2013 -0700 Added tag jdk7u21-b11 for changeset 61e2e2d9cfce changeset fa2a377ce52d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fa2a377ce52d author: katleman date: Fri Apr 05 12:48:40 2013 -0700 Added tag jdk7u21-b30 for changeset 3c774492beaa changeset 7cc2d5ba6eb2 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7cc2d5ba6eb2 author: katleman date: Sun Apr 07 16:34:46 2013 -0700 Added tag jdk7u21-b12 for changeset fa2a377ce52d changeset 21b0a5a7abc8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=21b0a5a7abc8 author: coffeys date: Tue Apr 16 11:49:41 2013 +0100 Merge changeset 4366e0fe59d5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4366e0fe59d5 author: andrew date: Tue Apr 23 23:14:59 2013 +0100 Merge jdk7u14-b20 changeset fd00f67b65c4 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fd00f67b65c4 author: andrew date: Wed May 22 16:12:01 2013 +0100 Remove jcheck changeset 47084105fe83 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=47084105fe83 author: andrew date: Wed May 22 17:02:40 2013 +0100 Merge with HEAD diffstat: .hgtags | 64 + .jcheck/conf | 2 - make/Makefile | 2 +- make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 14 +- make/common/shared/Platform.gmk | 9 + src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java | 8 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 6 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java | 61 +- src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java | 20 +- src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java | 130 +- src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java | 85 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +- src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 6 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 2 +- src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java | 57 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java | 54 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java | 68 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java | 66 - src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 38 +- src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java | 6 +- src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java | 177 - src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java | 177 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java | 108 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java | 102 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java | 53 +- src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java | 990 --------- src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java | 1065 ---------- src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java | 251 -- src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java | 77 - src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 37 +- src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp | 4 +- src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp | 2 +- src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp | 2 +- src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp | 2 +- src/share/classes/sun/corba/JavaCorbaAccess.java | 32 + src/share/classes/sun/corba/SharedSecrets.java | 60 + 38 files changed, 314 insertions(+), 3546 deletions(-) diffs (truncated from 4512 to 500 lines): diff -r 6f4d4c7a254d -r 47084105fe83 .hgtags --- a/.hgtags Fri Dec 28 10:10:44 2012 -0800 +++ b/.hgtags Wed May 22 17:02:40 2013 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -191,6 +197,7 @@ 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -213,6 +220,8 @@ ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02 268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04 a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05 +b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31 +0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32 ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10 a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11 e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12 @@ -223,6 +232,21 @@ 57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17 f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18 22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30 +2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31 +e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20 +dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21 +24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32 +4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33 +96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03 +1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04 +5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05 +30057c20fbb3caa61857656d05421e56731184f2 jdk7u11-b06 +9d9440d1fa2dd872c2a2b564fc5fa4d3555afab6 jdk7u11-b07 +983fac5b27376839142ac5a8770461e4e48c2dc8 jdk7u11-b08 +b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u13-b09 +b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10 +f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30 +b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20 353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01 d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02 7c62cfa17e9613bf69d4f9b2ae74f3724d7a2955 jdk7u8-b03 @@ -239,3 +263,43 @@ 2516fd4adf4af010c217e073cdb0a1fa9eefd827 jdk7u12-b05 16287175b517e48da9b24d31a3e9da200b6bc563 jdk7u12-b06 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 +6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 +c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint +3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 +3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 +fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 +cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13 +9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14 +2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15 +622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 +30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 +7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30 +3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31 +f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33 +e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03 +b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32 +94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 +e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02 +d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30 +a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31 +f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01 +17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02 +bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03 +3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04 +f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05 +94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06 +23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07 +ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08 +b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09 +b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 +61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 +3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16 +8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17 +862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18 +bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 +bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 +a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 +54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 diff -r 6f4d4c7a254d -r 47084105fe83 .jcheck/conf --- a/.jcheck/conf Fri Dec 28 10:10:44 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 6f4d4c7a254d -r 47084105fe83 make/Makefile --- a/make/Makefile Fri Dec 28 10:10:44 2012 -0800 +++ b/make/Makefile Wed May 22 17:02:40 2013 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r 6f4d4c7a254d -r 47084105fe83 make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Fri Dec 28 10:10:44 2012 -0800 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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 @@ -29,10 +29,6 @@ com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \ com/sun/corba/se/impl/orbutil/GetPropertyAction.java \ com/sun/corba/se/impl/orbutil/HexOutputStream.java \ - com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \ - com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \ - com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java \ - com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java \ com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \ com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \ com/sun/corba/se/impl/orbutil/LogKeywords.java \ @@ -45,19 +41,11 @@ com/sun/corba/se/impl/orbutil/ORBUtility.java \ com/sun/corba/se/impl/orbutil/ORBClassLoader.java \ com/sun/corba/se/impl/orbutil/RepIdDelegator.java \ - com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java \ - com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \ - com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java \ - com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \ com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \ - com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java \ - com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java \ com/sun/corba/se/impl/orbutil/StackImpl.java \ - com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java \ - com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java \ com/sun/corba/se/impl/orbutil/closure/Future.java \ com/sun/corba/se/impl/orbutil/closure/Constant.java \ com/sun/corba/se/impl/orbutil/concurrent/Sync.java \ diff -r 6f4d4c7a254d -r 47084105fe83 make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Fri Dec 28 10:10:44 2012 -0800 +++ b/make/common/shared/Platform.gmk Wed May 22 17:02:40 2013 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -169,6 +172,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -196,6 +202,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -322,9 +322,9 @@ com.sun.corba.se.spi.activation._ServerImplBase { private ORB orb; - private Method installMethod ; - private Method uninstallMethod ; - private Method shutdownMethod ; + private transient Method installMethod ; + private transient Method uninstallMethod ; + private transient Method shutdownMethod ; private Object methodArgs[] ; ServerCallback(ORB orb, Method installMethod, Method uninstallMethod, diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -1218,7 +1218,7 @@ // See bug 4391648 for more info about the tcORB in this // case. RepositoryIdStrings repStrs - = RepositoryIdFactory.getRepIdStringsFactory(tcORB); + = RepositoryIdFactory.getRepIdStringsFactory(); // Assertion: c instanceof Serializable? @@ -1251,7 +1251,7 @@ // Anything else // We know that this is a TypeCodeImpl since it is our ORB classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass( - tcORB, c, ORBUtility.createValueHandler(tcORB)); + tcORB, c, ORBUtility.createValueHandler()); // Intruct classTC to store its buffer classTC.setCaching(true); // Update the cache diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed May 22 17:02:40 2013 +0100 @@ -2189,10 +2189,7 @@ if (labelIndex == _unionLabels.length) { // check if label has not been found - if (_defaultIndex == -1) - // throw exception if default was not expected - throw wrapper.unexpectedUnionDefault() ; - else + if (_defaultIndex != -1) // must be of the default branch type _memberTypes[_defaultIndex].copy(src, dst); } diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -269,8 +269,8 @@ private final void createRepositoryIdHandlers() { - repIdUtil = RepositoryIdFactory.getRepIdUtility(orb); - repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(orb); + repIdUtil = RepositoryIdFactory.getRepIdUtility(); + repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } public GIOPVersion getGIOPVersion() { @@ -564,10 +564,7 @@ checkForNegativeLength(len); - if (orb != null && ORBUtility.isLegacyORB((ORB)orb)) - return legacyReadString(len); - else - return internalReadString(len); + return internalReadString(len); } private final String internalReadString(int len) { @@ -588,54 +585,6 @@ return new String(result, 0, getCharConverter().getNumChars()); } - private final String legacyReadString(int len) { - - // - // Workaround for ORBs which send string lengths of - // zero to mean empty string. - // - // - // IMPORTANT: Do not replace 'new String("")' with "", it may result - // in a Serialization bug (See serialization.zerolengthstring) and - // bug id: 4728756 for details - if (len == 0) - return new String(""); - - len--; - char[] c = new char[len]; - - int n = 0; - while (n < len) { - int avail; - int bytes; - int wanted; - - avail = bbwi.buflen - bbwi.position(); - if (avail <= 0) { - grow(1, 1); - avail = bbwi.buflen - bbwi.position(); - } - wanted = len - n; - bytes = (wanted < avail) ? wanted : avail; - // Microbenchmarks are showing a loop of ByteBuffer.get(int) being - // faster than ByteBuffer.get(byte[], int, int). - for (int i=0; i bbwi.buflen) - alignAndCheck(1, 1); - bbwi.position(bbwi.position() + 1); - - return new String(c); - } - public final String read_string() { return readStringOrIndirection(false); } @@ -1045,7 +994,7 @@ try { if (valueHandler == null) - valueHandler = ORBUtility.createValueHandler(orb); + valueHandler = ORBUtility.createValueHandler(); value = valueHandler.readValue(parent, indirection, diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -189,18 +189,8 @@ private final void createRepositoryIdHandlers() { - if (orb != null) { - // Get the appropriate versions based on the ORB version. The - // ORB versioning info is only in the core ORB. - repIdUtil - = RepositoryIdFactory.getRepIdUtility(orb); - repIdStrs - = RepositoryIdFactory.getRepIdStringsFactory(orb); - } else { - // Get the latest versions - repIdUtil = RepositoryIdFactory.getRepIdUtility(); - repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); - } + repIdUtil = RepositoryIdFactory.getRepIdUtility(); + repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } public BufferManagerWrite getBufferManager() @@ -705,7 +695,7 @@ private void writeArray(Serializable array, Class clazz) { if (valueHandler == null) - valueHandler = ORBUtility.createValueHandler(orb); //d11638 + valueHandler = ORBUtility.createValueHandler(); //d11638 // Write value_tag int indirection = writeValueTag(mustChunk, true, @@ -768,7 +758,7 @@ private void writeRMIIIOPValueType(Serializable object, Class clazz) { if (valueHandler == null) - valueHandler = ORBUtility.createValueHandler(orb); //d11638 + valueHandler = ORBUtility.createValueHandler(); //d11638 Serializable key = object; diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java --- a/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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 @@ -86,7 +86,7 @@ // default to using the current ORB version in case the // vhandler is not set if (vhandler == null) { - vhandler = new ValueHandlerImpl(false); + vhandler = ValueHandlerImpl.getInstance(false); } // Util.getCodebase may return null which would @@ -120,7 +120,7 @@ // default to using the current ORB version in case the // vhandler is not set if (vhandler == null) { - vhandler = new ValueHandlerImpl(false); + vhandler = ValueHandlerImpl.getInstance(false); } try{ @@ -161,7 +161,7 @@ // default to using the current ORB version in case the // vhandler is not set if (vhandler == null) { - vhandler = new ValueHandlerImpl(false); + vhandler = ValueHandlerImpl.getInstance(false); } Stack repIds = new Stack(); diff -r 6f4d4c7a254d -r 47084105fe83 src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java --- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Fri Dec 28 10:10:44 2012 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. 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 @@ -25,7 +25,7 @@ /* * Licensed Materials - Property of IBM * RMI-IIOP v1.0 - * Copyright IBM Corp. 1998 1999 All Rights Reserved + * Copyright IBM Corp. 1998 2012 All Rights Reserved * */ @@ -56,7 +56,8 @@ import java.util.Arrays; import java.util.Comparator; -import java.util.Hashtable; +import java.util.concurrent.ConcurrentHashMap; From andrew at icedtea.classpath.org Wed May 22 09:33:15 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:33:15 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: 75 new changesets Message-ID: changeset 9622a9c72c9d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9622a9c72c9d author: dbuck date: Fri Jan 11 07:54:23 2013 -0800 8003147: port fix for BCEL bug 39695 Summary: Added support for Local Variable Type Table so that BCEL library can be used to modify methods with generics-related debug data without violating class file format Reviewed-by: lancea changeset e677bc4fc5e9 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e677bc4fc5e9 author: coffeys date: Mon Jan 14 07:39:02 2013 -0800 Merge changeset 50067976e379 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=50067976e379 author: lana date: Tue Jan 15 19:49:19 2013 -0800 Merge changeset 825eda755359 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=825eda755359 author: katleman date: Wed Jan 16 13:59:34 2013 -0800 Added tag jdk7u14-b10 for changeset 23191c790e12 changeset 798a97097eef in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=798a97097eef author: lana date: Tue Jan 22 22:47:19 2013 -0800 Merge changeset 84a2e51821a8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=84a2e51821a8 author: katleman date: Wed Jan 23 14:01:41 2013 -0800 Added tag jdk7u14-b11 for changeset 825eda755359 changeset 560e5cf5b57f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=560e5cf5b57f author: lana date: Mon Jan 28 11:13:06 2013 -0800 Merge changeset 937bae61a48f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=937bae61a48f author: katleman date: Fri Feb 01 09:56:57 2013 -0800 Added tag jdk7u14-b12 for changeset 560e5cf5b57f changeset 596e328459ad in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=596e328459ad author: katleman date: Fri Feb 01 10:25:36 2013 -0800 Added tag jdk7u13-b20 for changeset f9fe0d38b110 changeset 639d1cc5b2e9 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=639d1cc5b2e9 author: ewendeli date: Sun Feb 03 23:52:22 2013 +0100 Merge changeset d42f74a0593c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d42f74a0593c author: ewendeli date: Fri Feb 08 15:02:28 2013 +0100 Merge changeset 4424f7498747 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4424f7498747 author: katleman date: Wed Feb 13 17:56:51 2013 -0800 Added tag jdk7u14-b13 for changeset 937bae61a48f changeset 7038ca4959e5 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7038ca4959e5 author: lana date: Tue Feb 19 20:36:51 2013 -0800 Merge changeset 0a6a09e5174a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0a6a09e5174a author: katleman date: Tue Jan 29 14:15:05 2013 -0800 Added tag jdk7u13-b10 for changeset f9fe0d38b110 changeset ba14f96944cd in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ba14f96944cd author: katleman date: Fri Feb 01 10:31:51 2013 -0800 Added tag jdk7u13-b30 for changeset 0a6a09e5174a changeset 99c114990b19 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=99c114990b19 author: ewendeli date: Fri Feb 01 23:29:16 2013 +0100 Merge changeset edbaa584f09a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=edbaa584f09a author: katleman date: Thu Feb 07 14:18:07 2013 -0800 Added tag jdk7u15-b01 for changeset 99c114990b19 changeset 14a9b60a2086 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=14a9b60a2086 author: katleman date: Fri Feb 08 10:46:42 2013 -0800 Added tag jdk7u15-b02 for changeset edbaa584f09a changeset 12d2e49286f7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=12d2e49286f7 author: ewendeli date: Wed Feb 13 19:54:40 2013 +0100 Merge changeset 094d274ad5db in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=094d274ad5db author: ewendeli date: Wed Feb 20 19:52:58 2013 +0100 Merge changeset a55f67cfe182 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a55f67cfe182 author: katleman date: Wed Feb 13 18:19:32 2013 -0800 Added tag jdk7u15-b30 for changeset 14a9b60a2086 changeset f31f23bc074a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f31f23bc074a author: katleman date: Mon Feb 18 12:09:43 2013 -0800 Added tag jdk7u15-b03 for changeset a55f67cfe182 changeset 5d87e5fdd88a in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5d87e5fdd88a author: katleman date: Mon Feb 18 12:29:15 2013 -0800 Added tag jdk7u15-b32 for changeset eb9d57159e51 changeset 8a9867ee4294 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8a9867ee4294 author: katleman date: Mon Feb 18 12:42:24 2013 -0800 Merge changeset 7863a60ae4b4 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7863a60ae4b4 author: katleman date: Tue Feb 26 12:42:06 2013 -0800 Added tag jdk7u17-b01 for changeset 8a9867ee4294 changeset a5e6594fc1ae in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a5e6594fc1ae author: katleman date: Fri Mar 01 11:55:25 2013 -0800 Added tag jdk7u17-b02 for changeset 7863a60ae4b4 changeset c784823f769f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c784823f769f author: coffeys date: Sat Mar 02 17:25:03 2013 +0000 Merge changeset aa6fb94c5e7b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=aa6fb94c5e7b author: katleman date: Wed Feb 27 16:51:58 2013 -0800 Added tag jdk7u14-b14 for changeset 7038ca4959e5 changeset 791bd96e9e43 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=791bd96e9e43 author: lana date: Tue Mar 05 17:00:53 2013 -0800 Merge changeset c99d2ddabfb9 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c99d2ddabfb9 author: katleman date: Thu Mar 07 11:08:33 2013 -0800 Added tag jdk7u14-b15 for changeset aa6fb94c5e7b changeset 7b47e1a26f7c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7b47e1a26f7c author: lana date: Mon Mar 11 14:50:02 2013 -0700 Merge changeset 77ac1ef42b2f in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=77ac1ef42b2f author: katleman date: Wed Mar 13 17:18:06 2013 -0700 Added tag jdk7u14-b16 for changeset 7b47e1a26f7c changeset d47975f80a24 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d47975f80a24 author: katleman date: Wed Mar 20 14:47:42 2013 -0700 Added tag jdk7u14-b17 for changeset 77ac1ef42b2f changeset e17ab897041e in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e17ab897041e author: andrew date: Wed Apr 03 14:17:27 2013 +0100 Merge jdk7u14-b17 changeset 331e489ecb7b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=331e489ecb7b author: katleman date: Wed Mar 27 16:18:28 2013 -0700 Added tag jdk7u14-b18 for changeset d47975f80a24 changeset c3c9f04cf10c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c3c9f04cf10c author: katleman date: Wed Apr 03 15:15:53 2013 -0700 Added tag jdk7u14-b19 for changeset 331e489ecb7b changeset 5e1fee011646 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5e1fee011646 author: katleman date: Fri Apr 05 09:10:43 2013 -0700 Added tag jdk7u14-b19 for changeset c3c9f04cf10c changeset d1c8bb1cbc91 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d1c8bb1cbc91 author: katleman date: Wed Apr 10 10:30:06 2013 -0700 Added tag jdk7u14-b20 for changeset 5e1fee011646 changeset f0dc96219b29 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f0dc96219b29 author: katleman date: Thu Feb 07 14:20:30 2013 -0800 Added tag jdk7u21-b01 for changeset 0a6a09e5174a changeset 99ed1a3d2950 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=99ed1a3d2950 author: ewendeli date: Mon Feb 11 21:08:36 2013 +0100 Merge changeset 06a2338c0fb7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=06a2338c0fb7 author: katleman date: Thu Feb 14 14:11:20 2013 -0800 Added tag jdk7u21-b02 for changeset 99ed1a3d2950 changeset 38d4d23d167c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=38d4d23d167c author: joehw date: Sat Feb 16 18:03:23 2013 -0800 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset acde12ee462d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=acde12ee462d author: katleman date: Tue Feb 19 17:13:50 2013 -0800 Added tag jdk7u21-b03 for changeset 38d4d23d167c changeset 5704dc942da6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5704dc942da6 author: katleman date: Tue Feb 26 12:45:10 2013 -0800 Added tag jdk7u21-b04 for changeset acde12ee462d changeset d80a8e81fef0 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d80a8e81fef0 author: katleman date: Tue Oct 16 14:55:00 2012 -0700 Added tag jdk7u9-b31 for changeset 039b21e98d2b changeset 3941eb25e61e in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3941eb25e61e author: katleman date: Wed Oct 31 10:11:34 2012 -0700 Added tag jdk7u9-b32 for changeset d80a8e81fef0 changeset 07dd5e5caa67 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=07dd5e5caa67 author: asaha date: Tue Dec 04 11:44:49 2012 -0800 Merge changeset ec1e8ead41ee in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ec1e8ead41ee author: asaha date: Wed Dec 05 15:28:55 2012 -0800 Merge changeset cfc86ae2a559 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=cfc86ae2a559 author: katleman date: Fri Dec 07 08:19:17 2012 -0800 Added tag jdk7u10-b31 for changeset ec1e8ead41ee changeset 71353182d3f7 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=71353182d3f7 author: ewendeli date: Tue Jan 15 08:23:10 2013 +0100 Merge changeset af8f33c558d0 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=af8f33c558d0 author: katleman date: Wed Jan 16 13:57:24 2013 -0800 Added tag jdk7u11-b32 for changeset 71353182d3f7 changeset 839dfbb430fa in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=839dfbb430fa author: katleman date: Tue Jan 29 14:10:48 2013 -0800 Added tag jdk7u11-b33 for changeset af8f33c558d0 changeset 94b6491fa3ae in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=94b6491fa3ae author: asaha date: Fri Feb 08 19:23:55 2013 -0800 Merge changeset de6df3c10ebc in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=de6df3c10ebc author: asaha date: Mon Feb 11 11:16:16 2013 -0800 Merge changeset be739fd7b723 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=be739fd7b723 author: katleman date: Tue Feb 12 12:32:58 2013 -0800 Added tag jdk7u15-b31 for changeset de6df3c10ebc changeset 039c31ff1fe6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=039c31ff1fe6 author: asaha date: Thu Feb 14 13:21:49 2013 -0800 Merge changeset b08325d4a195 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b08325d4a195 author: katleman date: Tue Feb 19 12:03:07 2013 -0800 Added tag jdk7u15-b33 for changeset 039c31ff1fe6 changeset b3ce6fdffb2b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b3ce6fdffb2b author: asaha date: Fri Mar 01 16:10:54 2013 -0800 Merge changeset 1f39cb70d337 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1f39cb70d337 author: cl date: Sat Mar 02 09:47:47 2013 -0800 Added tag jdk7u17-b30 for changeset a5e6594fc1ae changeset 8fb34202383e in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8fb34202383e author: asaha date: Sat Mar 02 14:37:49 2013 -0800 Merge changeset f7d8d2c003a1 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f7d8d2c003a1 author: cl date: Sat Mar 02 18:55:23 2013 -0800 Added tag jdk7u17-b31 for changeset 8fb34202383e changeset 56b1ad031df9 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=56b1ad031df9 author: asaha date: Mon Mar 04 11:43:45 2013 -0800 Merge changeset ab51202418c1 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ab51202418c1 author: katleman date: Tue Mar 05 16:45:44 2013 -0800 Added tag jdk7u21-b05 for changeset 56b1ad031df9 changeset 3ab71deee4a4 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3ab71deee4a4 author: katleman date: Tue Mar 12 14:44:12 2013 -0700 Added tag jdk7u21-b06 for changeset ab51202418c1 changeset f5ef2e76669b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f5ef2e76669b author: katleman date: Tue Mar 19 14:33:43 2013 -0700 Added tag jdk7u21-b07 for changeset 3ab71deee4a4 changeset 65977091d010 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=65977091d010 author: katleman date: Wed Mar 20 14:47:27 2013 -0700 Added tag jdk7u21-b08 for changeset f5ef2e76669b changeset bf2d62ea518d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bf2d62ea518d author: katleman date: Tue Mar 26 15:00:29 2013 -0700 Added tag jdk7u21-b09 for changeset 65977091d010 changeset 3e0e331bdfb8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3e0e331bdfb8 author: katleman date: Sun Mar 31 03:46:45 2013 -0700 Added tag jdk7u21-b10 for changeset bf2d62ea518d changeset 980fe893d8fd in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=980fe893d8fd author: katleman date: Thu Apr 04 15:48:20 2013 -0700 Added tag jdk7u21-b11 for changeset 3e0e331bdfb8 changeset a320a590b4ca in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a320a590b4ca author: katleman date: Fri Apr 05 12:48:56 2013 -0700 Added tag jdk7u21-b30 for changeset 980fe893d8fd changeset 08808837d120 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=08808837d120 author: katleman date: Sun Apr 07 16:34:55 2013 -0700 Added tag jdk7u21-b12 for changeset a320a590b4ca changeset 4dd5acf482e8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4dd5acf482e8 author: coffeys date: Tue Apr 16 11:50:02 2013 +0100 Merge changeset 5a11895b645d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5a11895b645d author: andrew date: Tue Apr 23 23:15:00 2013 +0100 Merge jdk7u14-b20 changeset 7dc9a882c6f8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7dc9a882c6f8 author: andrew date: Wed May 22 16:11:24 2013 +0100 Remove jcheck changeset 7f04ed6cb0c3 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7f04ed6cb0c3 author: andrew date: Wed May 22 17:02:40 2013 +0100 Merge with HEAD diffstat: .hgtags | 64 ++ .jcheck/conf | 2 - src/com/sun/org/apache/bcel/internal/Constants.java | 32 +- src/com/sun/org/apache/bcel/internal/classfile/Attribute.java | 3 + src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java | 6 + src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java | 1 + src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java | 6 +- src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java | 146 ++++++ src/com/sun/org/apache/bcel/internal/classfile/Visitor.java | 1 + src/com/sun/org/apache/bcel/internal/generic/MethodGen.java | 17 + src/com/sun/org/apache/bcel/internal/util/Class2HTML.java | 3 +- src/com/sun/org/apache/bcel/internal/util/ClassPath.java | 20 +- src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java | 3 +- src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java | 223 ++++++++++ src/com/sun/org/apache/xalan/internal/res/XSLMessages.java | 106 ++-- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java | 63 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java | 64 -- src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java | 11 +- src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java | 98 +++- src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java | 11 +- src/com/sun/org/apache/xalan/internal/xslt/Process.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java | 10 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java | 14 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java | 7 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java | 16 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java | 12 + src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java | 14 +- src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java | 15 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 3 +- src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java | 4 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java | 11 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java | 5 +- src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SecurityManager.java | 70 +- src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java | 13 +- src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java | 36 + src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java | 8 +- src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 3 +- src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 67 --- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLMessages.java | 65 +-- src/com/sun/org/apache/xml/internal/resolver/Catalog.java | 5 +- src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java | 17 +- src/com/sun/org/apache/xml/internal/resolver/Resolver.java | 5 +- src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/Encodings.java | 4 +- src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/ToStream.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java | 100 +---- src/com/sun/org/apache/xml/internal/utils/TreeWalker.java | 7 +- src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java | 141 +---- src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java | 5 +- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java | 216 ++++---- src/com/sun/xml/internal/stream/XMLEntityStorage.java | 3 +- src/com/sun/xml/internal/stream/writers/WriterUtility.java | 3 +- src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java | 3 +- src/javax/xml/datatype/FactoryFinder.java | 62 ++- src/javax/xml/parsers/FactoryFinder.java | 10 +- src/javax/xml/stream/FactoryFinder.java | 77 ++- src/javax/xml/transform/FactoryFinder.java | 11 +- src/javax/xml/validation/SchemaFactoryFinder.java | 43 +- src/javax/xml/xpath/XPathFactoryFinder.java | 30 +- src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java | 13 +- src/org/xml/sax/helpers/NewInstance.java | 38 +- src/org/xml/sax/helpers/ParserAdapter.java | 5 +- src/org/xml/sax/helpers/ParserFactory.java | 13 +- src/org/xml/sax/helpers/SecuritySupport.java | 108 ++++ src/org/xml/sax/helpers/XMLReaderFactory.java | 62 +- 120 files changed, 1392 insertions(+), 3219 deletions(-) diffs (truncated from 7278 to 500 lines): diff -r 427a603569db -r 7f04ed6cb0c3 .hgtags --- a/.hgtags Fri Dec 28 10:11:31 2012 -0800 +++ b/.hgtags Wed May 22 17:02:40 2013 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -191,6 +197,7 @@ 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -213,6 +220,8 @@ 78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u9-b02 b12a2d557c5e302b614c5f7e25ad6c8a0e138742 jdk7u9-b04 ab4bbb93b3831aca230c62431f7fe02b56793450 jdk7u9-b05 +039b21e98d2b2d0b26a19c325b37ce522bae39de jdk7u9-b31 +d80a8e81fef0bc6e0bdb7891895bda527853add1 jdk7u9-b32 254ed6ae237ee631179819570cf7fb265c6fb3a8 jdk7u10-b10 c1df39bcc9c1bcdfb2a92682650264b3b7771ce8 jdk7u10-b11 00cfd60368048c4969785eb52ec50cf5691c4367 jdk7u10-b12 @@ -223,6 +232,21 @@ 86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17 162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18 c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30 +ec1e8ead41ee49d2b3f84a26ae0fac88e226692d jdk7u10-b31 +853059839d38432f86e345ba951397ede235a374 jdk7u11-b20 +453a52320a1b8bd425fdb55e14b64067b536f1e2 jdk7u11-b21 +71353182d3f7c237047c5386d9f31186a5bd1519 jdk7u11-b32 +af8f33c558d05aacdff5b5787be0cbaba9f10e98 jdk7u11-b33 +5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03 +6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04 +3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05 +86d0250b62bbb4aabab2a7c249aeb14847be2631 jdk7u11-b06 +225aa78c36e9b776c87e585329bbb7ee0e3259a3 jdk7u11-b07 +48491f5a58172f0fbdf9b774842c2ec1a42f609a jdk7u11-b08 +eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u13-b09 +f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b10 +0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u13-b30 +f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b20 1365e7472a3b737dda4a73e06ad41718d667d9be jdk7u8-b01 0a313d4307930be3a64106b9b8c90f9342673aa0 jdk7u8-b02 36cba5ea434944cef64fa281112b158fae93c0fa jdk7u8-b03 @@ -239,3 +263,43 @@ 3db0cfb507771458da8978248de7598ebe7c20d8 jdk7u12-b05 c84c463893504a93a38f4abfa4d057869e9ae918 jdk7u12-b06 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 +427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 +366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint +23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 +825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 +560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 +937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13 +7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14 +aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15 +99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 +edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 +14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 +de6df3c10ebc0f8c704a11ad86c8eea1e1cc1442 jdk7u15-b31 +039c31ff1fe6789859f2f55588218147623a9a9f jdk7u15-b33 +a55f67cfe182dc42a86aae836674eb8ba5b79891 jdk7u15-b03 +eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u15-b32 +8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01 +7863a60ae4b4a0c7d762a95e77e589fafa4e50ae jdk7u17-b02 +a5e6594fc1ae20101b5d69632f65078d7a99b76d jdk7u17-b30 +8fb34202383ece5386acecc3a6c1dac68dccbf05 jdk7u17-b31 +0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u21-b01 +99ed1a3d29509fee659aabec4810c896b7234d80 jdk7u21-b02 +38d4d23d167c5a623e6d771a15b1fe2ee771ce38 jdk7u21-b03 +acde12ee462d650d34cc148d9d3649f9a9bbca8a jdk7u21-b04 +56b1ad031df90d20c52941c15ceae0e5a90893b8 jdk7u21-b05 +ab51202418c1c96e01a45893a26829a2d9c7b956 jdk7u21-b06 +3ab71deee4a4477d89530ee9e92a36017a6092fa jdk7u21-b07 +f5ef2e76669bc3179f17dac42a8a407fb6bd4d91 jdk7u21-b08 +65977091d010402ccbed41c96748866a1d50f0c4 jdk7u21-b09 +bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10 +3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11 +980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30 +a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12 +7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16 +77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17 +d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18 +331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 +331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 +c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19 +5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20 diff -r 427a603569db -r 7f04ed6cb0c3 .jcheck/conf --- a/.jcheck/conf Fri Dec 28 10:11:31 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/Constants.java --- a/src/com/sun/org/apache/bcel/internal/Constants.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/Constants.java Wed May 22 17:02:40 2013 +0100 @@ -746,27 +746,29 @@ /** Attributes and their corresponding names. */ - public static final byte ATTR_UNKNOWN = -1; - public static final byte ATTR_SOURCE_FILE = 0; - public static final byte ATTR_CONSTANT_VALUE = 1; - public static final byte ATTR_CODE = 2; - public static final byte ATTR_EXCEPTIONS = 3; - public static final byte ATTR_LINE_NUMBER_TABLE = 4; - public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5; - public static final byte ATTR_INNER_CLASSES = 6; - public static final byte ATTR_SYNTHETIC = 7; - public static final byte ATTR_DEPRECATED = 8; - public static final byte ATTR_PMG = 9; - public static final byte ATTR_SIGNATURE = 10; - public static final byte ATTR_STACK_MAP = 11; + public static final byte ATTR_UNKNOWN = -1; + public static final byte ATTR_SOURCE_FILE = 0; + public static final byte ATTR_CONSTANT_VALUE = 1; + public static final byte ATTR_CODE = 2; + public static final byte ATTR_EXCEPTIONS = 3; + public static final byte ATTR_LINE_NUMBER_TABLE = 4; + public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5; + public static final byte ATTR_INNER_CLASSES = 6; + public static final byte ATTR_SYNTHETIC = 7; + public static final byte ATTR_DEPRECATED = 8; + public static final byte ATTR_PMG = 9; + public static final byte ATTR_SIGNATURE = 10; + public static final byte ATTR_STACK_MAP = 11; + public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 12; - public static final short KNOWN_ATTRIBUTES = 12; + public static final short KNOWN_ATTRIBUTES = 13; public static final String[] ATTRIBUTE_NAMES = { "SourceFile", "ConstantValue", "Code", "Exceptions", "LineNumberTable", "LocalVariableTable", "InnerClasses", "Synthetic", "Deprecated", - "PMGClass", "Signature", "StackMap" + "PMGClass", "Signature", "StackMap", + "LocalVariableTypeTable" }; /** Constants used in the StackMap attribute. diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/Attribute.java --- a/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java Wed May 22 17:02:40 2013 +0100 @@ -206,6 +206,9 @@ case Constants.ATTR_LOCAL_VARIABLE_TABLE: return new LocalVariableTable(name_index, length, file, constant_pool); + case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE: + return new LocalVariableTypeTable(name_index, length, file, constant_pool); + case Constants.ATTR_INNER_CLASSES: return new InnerClasses(name_index, length, file, constant_pool); diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java --- a/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Wed May 22 17:02:40 2013 +0100 @@ -210,6 +210,12 @@ stack.pop(); } + public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + public void visitStackMap(StackMap table) { stack.push(table); table.accept(visitor); diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java --- a/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java Wed May 22 17:02:40 2013 +0100 @@ -98,6 +98,7 @@ public void visitLineNumberTable(LineNumberTable obj) {} public void visitLocalVariable(LocalVariable obj) {} public void visitLocalVariableTable(LocalVariableTable obj) {} + public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {} public void visitMethod(Method obj) {} public void visitSignature(Signature obj) {} public void visitSourceFile(SourceFile obj) {} diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java --- a/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Wed May 22 17:02:40 2013 +0100 @@ -63,6 +63,7 @@ import com.sun.org.apache.bcel.internal.util.ClassVector; import com.sun.org.apache.bcel.internal.util.ClassQueue; import com.sun.org.apache.bcel.internal.generic.Type; +import com.sun.org.apache.xalan.internal.utils.SecuritySupport; import java.io.*; import java.util.StringTokenizer; @@ -77,6 +78,7 @@ * class file. Those interested in programatically generating classes * should see the ClassGen class. + * @version $Id: JavaClass.java,v 1.4 2007-07-19 04:34:42 ofung Exp $ * @see com.sun.org.apache.bcel.internal.generic.ClassGen * @author M. Dahm */ @@ -451,9 +453,9 @@ String debug = null, sep = null; try { - debug = System.getProperty("JavaClass.debug"); + debug = SecuritySupport.getSystemProperty("JavaClass.debug"); // Get path separator either / or \ usually - sep = System.getProperty("file.separator"); + sep = SecuritySupport.getSystemProperty("file.separator"); } catch (SecurityException e) { // falls through diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java Wed May 22 17:02:40 2013 +0100 @@ -0,0 +1,146 @@ +/* + * reserved comment block + * DO NOT REMOVE OR ALTER! + */ +package com.sun.org.apache.bcel.internal.classfile; +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import com.sun.org.apache.bcel.internal.Constants; +import java.io.*; + +// The new table is used when generic types are about... + +//LocalVariableTable_attribute { +// u2 attribute_name_index; +// u4 attribute_length; +// u2 local_variable_table_length; +// { u2 start_pc; +// u2 length; +// u2 name_index; +// u2 descriptor_index; +// u2 index; +// } local_variable_table[local_variable_table_length]; +// } + +//LocalVariableTypeTable_attribute { +// u2 attribute_name_index; +// u4 attribute_length; +// u2 local_variable_type_table_length; +// { +// u2 start_pc; +// u2 length; +// u2 name_index; +// u2 signature_index; +// u2 index; +// } local_variable_type_table[local_variable_type_table_length]; +// } +// J5TODO: Needs some testing ! +public class LocalVariableTypeTable extends Attribute { + private static final long serialVersionUID = -1082157891095177114L; +private int local_variable_type_table_length; // Table of local + private LocalVariable[] local_variable_type_table; // variables + + public LocalVariableTypeTable(LocalVariableTypeTable c) { + this(c.getNameIndex(), c.getLength(), c.getLocalVariableTypeTable(), + c.getConstantPool()); + } + + public LocalVariableTypeTable(int name_index, int length, + LocalVariable[] local_variable_table, + ConstantPool constant_pool) + { + super(Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool); + setLocalVariableTable(local_variable_table); + } + + LocalVariableTypeTable(int nameIdx, int len, DataInputStream dis,ConstantPool cpool) throws IOException { + this(nameIdx, len, (LocalVariable[])null, cpool); + + local_variable_type_table_length = (dis.readUnsignedShort()); + local_variable_type_table = new LocalVariable[local_variable_type_table_length]; + + for(int i=0; i < local_variable_type_table_length; i++) + local_variable_type_table[i] = new LocalVariable(dis, cpool); + } + + @Override +public void accept(Visitor v) { + v.visitLocalVariableTypeTable(this); + } + + @Override +public final void dump(DataOutputStream file) throws IOException + { + super.dump(file); + file.writeShort(local_variable_type_table_length); + for(int i=0; i < local_variable_type_table_length; i++) + local_variable_type_table[i].dump(file); + } + + public final LocalVariable[] getLocalVariableTypeTable() { + return local_variable_type_table; + } + + public final LocalVariable getLocalVariable(int index) { + for(int i=0; i < local_variable_type_table_length; i++) + if(local_variable_type_table[i].getIndex() == index) + return local_variable_type_table[i]; + + return null; + } + + public final void setLocalVariableTable(LocalVariable[] local_variable_table) + { + this.local_variable_type_table = local_variable_table; + local_variable_type_table_length = (local_variable_table == null)? 0 : + local_variable_table.length; + } + + /** + * @return String representation. + */ + @Override +public final String toString() { + StringBuilder buf = new StringBuilder(); + + for(int i=0; i < local_variable_type_table_length; i++) { + buf.append(local_variable_type_table[i].toString()); + + if(i < local_variable_type_table_length - 1) buf.append('\n'); + } + + return buf.toString(); + } + + /** + * @return deep copy of this attribute + */ + @Override +public Attribute copy(ConstantPool constant_pool) { + LocalVariableTypeTable c = (LocalVariableTypeTable)clone(); + + c.local_variable_type_table = new LocalVariable[local_variable_type_table_length]; + for(int i=0; i < local_variable_type_table_length; i++) + c.local_variable_type_table[i] = local_variable_type_table[i].copy(); + + c.constant_pool = constant_pool; + return c; + } + + public final int getTableLength() { return local_variable_type_table_length; } +} diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/classfile/Visitor.java --- a/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java Wed May 22 17:02:40 2013 +0100 @@ -94,6 +94,7 @@ public void visitLineNumberTable(LineNumberTable obj); public void visitLocalVariable(LocalVariable obj); public void visitLocalVariableTable(LocalVariableTable obj); + public void visitLocalVariableTypeTable(LocalVariableTypeTable obj); public void visitMethod(Method obj); public void visitSignature(Signature obj); public void visitSourceFile(SourceFile obj); diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/generic/MethodGen.java --- a/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Wed May 22 17:02:40 2013 +0100 @@ -258,6 +258,23 @@ addLocalVariable(l.getName(), Type.getType(l.getSignature()), l.getIndex(), start, end); } + } else if (a instanceof LocalVariableTypeTable) { + LocalVariable[] lv = ((LocalVariableTypeTable) a).getLocalVariableTypeTable(); + removeLocalVariables(); + for (int k = 0; k < lv.length; k++) { + LocalVariable l = lv[k]; + InstructionHandle start = il.findHandle(l.getStartPC()); + InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength()); + // Repair malformed handles + if (null == start) { + start = il.getStart(); + } + if (null == end) { + end = il.getEnd(); + } + addLocalVariable(l.getName(), Type.getType(l.getSignature()), l + .getIndex(), start, end); + } } else addCodeAttribute(a); } diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/util/Class2HTML.java --- a/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java Wed May 22 17:02:40 2013 +0100 @@ -82,6 +82,7 @@ * method in the Method's frame will jump to the appropiate method in * the Code frame. * + * @version $Id: Class2HTML.java,v 1.3 2007-07-19 04:34:52 ofung Exp $ * @author M. Dahm */ public class Class2HTML implements Constants @@ -137,7 +138,7 @@ ClassParser parser=null; JavaClass java_class=null; String zip_file = null; - char sep = System.getProperty("file.separator").toCharArray()[0]; + char sep = SecuritySupport.getSystemProperty("file.separator").toCharArray()[0]; String dir = "." + sep; // Where to store HTML files try { diff -r 427a603569db -r 7f04ed6cb0c3 src/com/sun/org/apache/bcel/internal/util/ClassPath.java --- a/src/com/sun/org/apache/bcel/internal/util/ClassPath.java Fri Dec 28 10:11:31 2012 -0800 +++ b/src/com/sun/org/apache/bcel/internal/util/ClassPath.java Wed May 22 17:02:40 2013 +0100 @@ -66,6 +66,7 @@ * Responsible for loading (class) files from the CLASSPATH. Inspired by * sun.tools.ClassPath. * + * @version $Id: ClassPath.java,v 1.4 2007-07-19 04:34:52 ofung Exp $ * @author M. Dahm */ public class ClassPath implements Serializable { @@ -83,7 +84,7 @@ ArrayList vec = new ArrayList(); for(StringTokenizer tok=new StringTokenizer(class_path, - System.getProperty("path.separator")); + SecuritySupport.getSystemProperty("path.separator")); tok.hasMoreTokens();) { String path = tok.nextToken(); @@ -92,7 +93,7 @@ File file = new File(path); try { - if(file.exists()) { + if(SecuritySupport.getFileExists(file)) { if(file.isDirectory()) vec.add(new Dir(path)); else @@ -143,8 +144,9 @@ String name = tok.nextToken(); File file = new File(name); From andrew at icedtea.classpath.org Wed May 22 09:33:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:33:37 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: 75 new changesets Message-ID: changeset 66c8b626c004 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=66c8b626c004 author: coffeys date: Mon Jan 14 07:39:47 2013 -0800 Merge changeset c40490f49396 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c40490f49396 author: lana date: Tue Jan 15 19:49:43 2013 -0800 Merge changeset 444aa84f38df in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=444aa84f38df author: katleman date: Wed Jan 16 13:59:35 2013 -0800 Added tag jdk7u14-b10 for changeset 9207c72345c9 changeset f155b99a15e5 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f155b99a15e5 author: lana date: Tue Jan 22 22:48:08 2013 -0800 Merge changeset 6f85b15cc2ef in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6f85b15cc2ef author: katleman date: Wed Jan 23 14:01:48 2013 -0800 Added tag jdk7u14-b11 for changeset 444aa84f38df changeset 40afea757379 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=40afea757379 author: lana date: Mon Jan 28 11:13:36 2013 -0800 Merge changeset 4fe9a362c327 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4fe9a362c327 author: katleman date: Fri Feb 01 09:57:00 2013 -0800 Added tag jdk7u14-b12 for changeset 40afea757379 changeset 7e55d4bdff8b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7e55d4bdff8b author: katleman date: Fri Feb 01 10:25:39 2013 -0800 Added tag jdk7u13-b20 for changeset 1d2eb88cadaf changeset 574de0bcc1fe in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=574de0bcc1fe author: ewendeli date: Sun Feb 03 23:52:49 2013 +0100 Merge changeset f4872bc28fc1 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f4872bc28fc1 author: ewendeli date: Fri Feb 08 15:02:32 2013 +0100 Merge changeset 78e3d16cb9ff in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=78e3d16cb9ff author: katleman date: Wed Feb 13 17:56:52 2013 -0800 Added tag jdk7u14-b13 for changeset 4fe9a362c327 changeset a2b2e716637a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a2b2e716637a author: lana date: Tue Feb 19 20:41:30 2013 -0800 Merge changeset 21dbdd72a46a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=21dbdd72a46a author: katleman date: Tue Jan 29 14:15:08 2013 -0800 Added tag jdk7u13-b10 for changeset 1d2eb88cadaf changeset 2e6341e42bef in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=2e6341e42bef author: katleman date: Fri Feb 01 10:31:54 2013 -0800 Added tag jdk7u13-b30 for changeset 21dbdd72a46a changeset abcaebcead60 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=abcaebcead60 author: ewendeli date: Fri Feb 01 23:29:29 2013 +0100 Merge changeset 62f9e7f5eb64 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=62f9e7f5eb64 author: katleman date: Thu Feb 07 14:18:10 2013 -0800 Added tag jdk7u15-b01 for changeset abcaebcead60 changeset ed9f270009f2 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ed9f270009f2 author: katleman date: Fri Feb 08 10:46:48 2013 -0800 Added tag jdk7u15-b02 for changeset 62f9e7f5eb64 changeset 7dab68ded8df in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7dab68ded8df author: ewendeli date: Wed Feb 13 20:03:18 2013 +0100 Merge changeset 077803ea38d6 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=077803ea38d6 author: ewendeli date: Wed Feb 20 19:53:09 2013 +0100 Merge changeset eaf9b2990670 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=eaf9b2990670 author: katleman date: Wed Feb 13 18:19:35 2013 -0800 Added tag jdk7u15-b30 for changeset ed9f270009f2 changeset 3af2a68c85d1 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3af2a68c85d1 author: katleman date: Mon Feb 18 12:09:48 2013 -0800 Added tag jdk7u15-b03 for changeset eaf9b2990670 changeset 892b6c71045f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=892b6c71045f author: katleman date: Mon Feb 18 12:29:22 2013 -0800 Added tag jdk7u15-b32 for changeset c7ea4220ad61 changeset b8496d1dc005 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=b8496d1dc005 author: katleman date: Mon Feb 18 12:42:27 2013 -0800 Merge changeset defde3ef0360 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=defde3ef0360 author: katleman date: Tue Feb 26 12:42:10 2013 -0800 Added tag jdk7u17-b01 for changeset b8496d1dc005 changeset ae4272d61bc7 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ae4272d61bc7 author: katleman date: Fri Mar 01 11:55:26 2013 -0800 Added tag jdk7u17-b02 for changeset defde3ef0360 changeset 11c8d0328907 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=11c8d0328907 author: coffeys date: Sat Mar 02 17:25:11 2013 +0000 Merge changeset b5c8ac5253ef in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=b5c8ac5253ef author: katleman date: Wed Feb 27 16:52:00 2013 -0800 Added tag jdk7u14-b14 for changeset a2b2e716637a changeset d1c632b4ff92 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d1c632b4ff92 author: lana date: Tue Mar 05 17:02:11 2013 -0800 Merge changeset 5845433c8c5c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5845433c8c5c author: katleman date: Thu Mar 07 11:08:36 2013 -0800 Added tag jdk7u14-b15 for changeset b5c8ac5253ef changeset a367ebf0c215 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a367ebf0c215 author: lana date: Mon Mar 11 14:49:04 2013 -0700 Merge changeset 74c34f35912d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=74c34f35912d author: katleman date: Wed Mar 13 17:18:08 2013 -0700 Added tag jdk7u14-b16 for changeset a367ebf0c215 changeset c93a35b3638f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c93a35b3638f author: katleman date: Wed Mar 20 14:47:45 2013 -0700 Added tag jdk7u14-b17 for changeset 74c34f35912d changeset 7169780eff51 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7169780eff51 author: andrew date: Wed Apr 03 14:17:32 2013 +0100 Merge jdk7u14-b17 changeset 82be38857de3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=82be38857de3 author: katleman date: Wed Mar 27 16:18:33 2013 -0700 Added tag jdk7u14-b18 for changeset c93a35b3638f changeset d63b21e6c3d2 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d63b21e6c3d2 author: katleman date: Wed Apr 03 15:15:54 2013 -0700 Added tag jdk7u14-b19 for changeset 82be38857de3 changeset dd695ad6c5ec in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=dd695ad6c5ec author: katleman date: Fri Apr 05 09:10:46 2013 -0700 Added tag jdk7u14-b19 for changeset d63b21e6c3d2 changeset 97bbac299eb8 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=97bbac299eb8 author: katleman date: Wed Apr 10 10:30:09 2013 -0700 Added tag jdk7u14-b20 for changeset dd695ad6c5ec changeset e07c518282ba in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e07c518282ba author: mkos date: Fri Feb 01 15:56:12 2013 +0100 8003543: Improve processing of MTOM attachments Summary: old File API replaced by NIO API; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset 26242a7a2a36 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=26242a7a2a36 author: katleman date: Thu Feb 07 14:20:34 2013 -0800 Added tag jdk7u21-b01 for changeset e07c518282ba changeset 0c1365d2fefb in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=0c1365d2fefb author: ewendeli date: Mon Feb 11 21:09:01 2013 +0100 Merge changeset 017171d6bc21 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=017171d6bc21 author: katleman date: Thu Feb 14 14:11:24 2013 -0800 Added tag jdk7u21-b02 for changeset 0c1365d2fefb changeset 914a2fa3675d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=914a2fa3675d author: katleman date: Tue Feb 19 17:13:52 2013 -0800 Added tag jdk7u21-b03 for changeset 017171d6bc21 changeset 68e8364feffc in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=68e8364feffc author: mkos date: Wed Feb 20 22:42:04 2013 +0100 8005432: Update access to JAX-WS Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset 238b59ffddce in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=238b59ffddce author: katleman date: Tue Feb 26 12:45:15 2013 -0800 Added tag jdk7u21-b04 for changeset 68e8364feffc changeset 987bb65e7b73 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=987bb65e7b73 author: katleman date: Tue Oct 16 14:55:05 2012 -0700 Added tag jdk7u9-b31 for changeset 5e5703e9d18d changeset 5039fcf14267 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5039fcf14267 author: katleman date: Wed Oct 31 10:11:40 2012 -0700 Added tag jdk7u9-b32 for changeset 987bb65e7b73 changeset 1e29414580be in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1e29414580be author: asaha date: Tue Dec 04 11:45:41 2012 -0800 Merge changeset 29d469fac910 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=29d469fac910 author: asaha date: Wed Dec 05 15:29:39 2012 -0800 Merge changeset 7903fcde23ca in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7903fcde23ca author: katleman date: Fri Dec 07 08:19:19 2012 -0800 Added tag jdk7u10-b31 for changeset 29d469fac910 changeset ac21be8046e0 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ac21be8046e0 author: ewendeli date: Tue Jan 15 08:23:23 2013 +0100 Merge changeset 41abf18b24e9 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=41abf18b24e9 author: katleman date: Wed Jan 16 13:57:29 2013 -0800 Added tag jdk7u11-b32 for changeset ac21be8046e0 changeset efde7cd105da in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=efde7cd105da author: katleman date: Tue Jan 29 14:10:54 2013 -0800 Added tag jdk7u11-b33 for changeset 41abf18b24e9 changeset 59c3e3755d5f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=59c3e3755d5f author: asaha date: Fri Feb 08 19:24:27 2013 -0800 Merge changeset 297240e69d8f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=297240e69d8f author: asaha date: Mon Feb 11 11:16:37 2013 -0800 Merge changeset 6316fb89c6fe in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6316fb89c6fe author: katleman date: Tue Feb 12 12:33:00 2013 -0800 Added tag jdk7u15-b31 for changeset 297240e69d8f changeset 4fda3b01c75e in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4fda3b01c75e author: asaha date: Thu Feb 14 13:22:24 2013 -0800 Merge changeset 5eb5d0114067 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5eb5d0114067 author: katleman date: Tue Feb 19 12:03:08 2013 -0800 Added tag jdk7u15-b33 for changeset 4fda3b01c75e changeset df8ad37350f7 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=df8ad37350f7 author: asaha date: Fri Mar 01 16:11:32 2013 -0800 Merge changeset 3770451e6307 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3770451e6307 author: cl date: Sat Mar 02 09:47:51 2013 -0800 Added tag jdk7u17-b30 for changeset ae4272d61bc7 changeset 52c4fbd4f58f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=52c4fbd4f58f author: asaha date: Sat Mar 02 14:38:19 2013 -0800 Merge changeset 52810f8d2dc0 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=52810f8d2dc0 author: cl date: Sat Mar 02 18:55:36 2013 -0800 Added tag jdk7u17-b31 for changeset 52c4fbd4f58f changeset 8c43fd5d8cfe in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=8c43fd5d8cfe author: asaha date: Mon Mar 04 11:44:20 2013 -0800 Merge changeset dab51e98ee7d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=dab51e98ee7d author: katleman date: Tue Mar 05 16:45:49 2013 -0800 Added tag jdk7u21-b05 for changeset 8c43fd5d8cfe changeset 4a9533495068 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4a9533495068 author: katleman date: Tue Mar 12 14:44:15 2013 -0700 Added tag jdk7u21-b06 for changeset dab51e98ee7d changeset ab11cef1dfaa in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ab11cef1dfaa author: katleman date: Tue Mar 19 14:33:49 2013 -0700 Added tag jdk7u21-b07 for changeset 4a9533495068 changeset 53c87e8a2ac4 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=53c87e8a2ac4 author: katleman date: Wed Mar 20 14:47:31 2013 -0700 Added tag jdk7u21-b08 for changeset ab11cef1dfaa changeset 29c03ced9215 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=29c03ced9215 author: katleman date: Tue Mar 26 15:00:31 2013 -0700 Added tag jdk7u21-b09 for changeset 53c87e8a2ac4 changeset fe6f5b57b9e6 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=fe6f5b57b9e6 author: katleman date: Sun Mar 31 03:46:50 2013 -0700 Added tag jdk7u21-b10 for changeset 29c03ced9215 changeset 12183763c620 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=12183763c620 author: katleman date: Thu Apr 04 15:48:23 2013 -0700 Added tag jdk7u21-b11 for changeset fe6f5b57b9e6 changeset d4eba65d0f77 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d4eba65d0f77 author: katleman date: Fri Apr 05 12:48:59 2013 -0700 Added tag jdk7u21-b30 for changeset 12183763c620 changeset 709cc8201c1a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=709cc8201c1a author: katleman date: Sun Apr 07 16:34:57 2013 -0700 Added tag jdk7u21-b12 for changeset d4eba65d0f77 changeset 683cbe163bec in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=683cbe163bec author: coffeys date: Tue Apr 16 11:50:07 2013 +0100 Merge changeset 29619865cc64 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=29619865cc64 author: andrew date: Tue Apr 23 23:15:01 2013 +0100 Merge jdk7u14-b20 changeset ea9a36dfd4ee in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ea9a36dfd4ee author: andrew date: Wed May 22 16:11:59 2013 +0100 Remove jcheck changeset 426b7a73ab43 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=426b7a73ab43 author: andrew date: Wed May 22 17:02:40 2013 +0100 Merge with HEAD diffstat: .hgtags | 64 ++++ .jcheck/conf | 2 - src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 + src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java | 13 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java | 24 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java | 144 +++++++++ src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java | 46 ++- src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java | 157 ++++++--- src/share/jaxws_classes/javax/xml/soap/MessageFactory.java | 13 +- src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java | 10 +- 12 files changed, 400 insertions(+), 89 deletions(-) diffs (truncated from 852 to 500 lines): diff -r 66f36438f548 -r 426b7a73ab43 .hgtags --- a/.hgtags Fri Dec 28 10:10:31 2012 -0800 +++ b/.hgtags Wed May 22 17:02:40 2013 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -213,6 +220,8 @@ 45cf55bc1732e8495425dceb385740c6852c0fc8 jdk7u9-b02 66a2e01550a9e84e907a7f7b96e64ee90a4ec0e4 jdk7u9-b04 f3e42e044584b1b21de29eef1b82974d273c77dc jdk7u9-b05 +5e5703e9d18d66d7388057040d3c36e978488dc5 jdk7u9-b31 +987bb65e7b73ad94fb0edecce80d84ee5f8bda6e jdk7u9-b32 dd8e4098681aa581d0398ad7d2d1e2547517c7e5 jdk7u10-b10 1784290b63bcf021334b0accdb3868fdc4ca854e jdk7u10-b11 fde9a060a04d9f9b54f36d645e91ec9a2b40cb81 jdk7u10-b12 @@ -223,6 +232,21 @@ e63292c59ed8481864302cc3f53b498cbdea3470 jdk7u10-b17 6a372e9b4ae978cdaf0b95277db31827794e2c1f jdk7u10-b18 df3e4c85e26c651d098cddd546916a625fd777cd jdk7u10-b30 +29d469fac9106ce7c2f8656ee125e792908aca98 jdk7u10-b31 +846f4e01218ffe37b2dbceaf89c222c0aea43180 jdk7u11-b20 +1f06394ca182cb392e472ba7b63b28a40725629d jdk7u11-b21 +ac21be8046e06e5460d041b7e4f8140d635887fb jdk7u11-b32 +41abf18b24e9483de775bf938f8d5e673c08209d jdk7u11-b33 +ed609545e38c2e499437292c1541e4d1c2b8b992 jdk7u11-b03 +4e1dd1192649575e80d893bcab411077b77c9a0c jdk7u11-b04 +0e1eefefc2d0c8f0d0cd9e7fb7d78ae026aa8ba0 jdk7u11-b05 +7365410bb417d6a40996920bb4dbb44bdb1225a9 jdk7u11-b06 +66786f9d73c479ce70a306e14dd7f653f5b3a4f9 jdk7u11-b07 +a3cadd00459f1146fdcfa8702bbb29efdcd58960 jdk7u11-b08 +c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u13-b09 +1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b10 +21dbdd72a46a29c148ea3519268447c467540637 jdk7u13-b30 +1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b20 55dcda93e8c8b5c3170def946de35dd0407eab59 jdk7u8-b01 c025e953f655b375f27f8f94493ceeb43ef1d979 jdk7u8-b02 705b60b56ead99d64d1b7302cba3a200ab048ff7 jdk7u8-b03 @@ -239,3 +263,43 @@ 8df2f42e2628e7b8d2e0cd69786a1bdc2a8dbe32 jdk7u12-b05 01111bd50d31c89fe671bccb1400c62a67c7055e jdk7u12-b06 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 +66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 +c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint +9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 +444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 +40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 +4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13 +a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14 +b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15 +abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 +62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 +ed9f270009f2b8606e9e0f58aeedbed36e13963e jdk7u15-b30 +297240e69d8ffcf85fc68b12af6523f7ea16397e jdk7u15-b31 +4fda3b01c75ecd80dba505f6152c21f3e1db5cce jdk7u15-b33 +eaf9b299067069826a5acdc88e15402e5a22cb5d jdk7u15-b03 +c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u15-b32 +b8496d1dc0058341da1790bc2e7d2dbba6d4f90e jdk7u17-b01 +defde3ef03605b1660a246ea85d2e810e3fe4f6e jdk7u17-b02 +ae4272d61bc738e2d9265a68aefdc20ec648f22c jdk7u17-b30 +52c4fbd4f58f336dfdf4f680b7e7d7361ec0c3f8 jdk7u17-b31 +e07c518282bad3b315d8064da5fad222a5e3f7ed jdk7u21-b01 +0c1365d2fefb652aea34775749d68774c171ba1a jdk7u21-b02 +017171d6bc217f26e230503dd38bcf4473f339d2 jdk7u21-b03 +68e8364feffcc98b57d59675994dcb12e170ddf0 jdk7u21-b04 +8c43fd5d8cfef4d97bddc4fee7747f23a3c2bffa jdk7u21-b05 +dab51e98ee7d0f3a30b9e18b0d3591b944346868 jdk7u21-b06 +4a9533495068359d574da1060bc5a8fa6946cbc6 jdk7u21-b07 +ab11cef1dfaaec32281dc3d24a366f6691b51b7a jdk7u21-b08 +53c87e8a2ac494b57f6220bd7e25c7380aa7f418 jdk7u21-b09 +29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10 +fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11 +12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30 +d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12 +a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16 +74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17 +c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18 +82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 +82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 +d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 +dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 diff -r 66f36438f548 -r 426b7a73ab43 .jcheck/conf --- a/.jcheck/conf Fri Dec 28 10:10:31 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 66f36438f548 -r 426b7a73ab43 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Fri Dec 28 10:10:31 2012 -0800 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed May 22 17:02:40 2013 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { diff -r 66f36438f548 -r 426b7a73ab43 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Fri Dec 28 10:10:31 2012 -0800 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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 @@ -235,7 +235,7 @@ String pkg = nav.getPackageName(ci.getClazz()); if(!registries.containsKey(pkg)) { // insert the package's object factory - C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz()); + C c = loadObjectFactory(ci, pkg); if(c!=null) addRegistry(c,(Locatable)p); } @@ -264,6 +264,15 @@ return r; } + private C loadObjectFactory(ClassInfoImpl ci, String pkg) { + try { + return nav.findClass(pkg + ".ObjectFactory", ci.getClazz()); + } catch (SecurityException ignored) { + // treat SecurityException in same way as ClassNotFoundException in this case + return null; + } + } + /** * Checks the uniqueness of the type name. */ diff -r 66f36438f548 -r 426b7a73ab43 src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Fri Dec 28 10:10:31 2012 -0800 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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 @@ -28,6 +28,7 @@ import java.nio.ByteBuffer; import java.io.File; import java.io.IOException; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -50,41 +51,45 @@ } // size of the chunk given by the parser + @Override public int size() { return len; } + @Override public byte[] read() { return data; } + @Override public long writeTo(DataFile file) { return file.writeTo(data, 0, len); } /** - * * @param dataHead * @param buf * @return */ + @Override public Data createNext(DataHead dataHead, ByteBuffer buf) { if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) { try { String prefix = config.getTempFilePrefix(); String suffix = config.getTempFileSuffix(); - File dir = config.getTempDir(); - File tempFile = (dir == null) - ? File.createTempFile(prefix, suffix) - : File.createTempFile(prefix, suffix, dir); - LOGGER.fine("Created temp file = "+tempFile); + File tempFile = TempFiles.createTempFile(prefix, suffix, config.getTempDir()); + // delete the temp file when VM exits as a last resort for file clean up + tempFile.deleteOnExit(); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, "Created temp file = {0}", tempFile); + } dataHead.dataFile = new DataFile(tempFile); - } catch(IOException ioe) { + } catch (IOException ioe) { throw new MIMEParsingException(ioe); } if (dataHead.head != null) { - for(Chunk c=dataHead.head; c != null; c=c.next) { + for (Chunk c = dataHead.head; c != null; c = c.next) { long pointer = c.data.writeTo(dataHead.dataFile); c.data = new FileData(dataHead.dataFile, pointer, len); } @@ -94,4 +99,5 @@ return new MemoryData(buf, config); } } + } diff -r 66f36438f548 -r 426b7a73ab43 src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java Wed May 22 17:02:40 2013 +0100 @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.xml.internal.org.jvnet.mimepull; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Helper utility to support jdk <= jdk1.6. After jdk1.6 EOL reflection can be removed and API can be used directly. + */ +class TempFiles { + + private static final Logger LOGGER = Logger.getLogger(TempFiles.class.getName()); + + private static final Class CLASS_FILES; + private static final Class CLASS_PATH; + private static final Class CLASS_FILE_ATTRIBUTE; + private static final Class CLASS_FILE_ATTRIBUTES; + private static final Method METHOD_FILE_TO_PATH; + private static final Method METHOD_FILES_CREATE_TEMP_FILE; + private static final Method METHOD_FILES_CREATE_TEMP_FILE_WITHPATH; + + private static final Method METHOD_PATH_TO_FILE; + + private static boolean useJdk6API; + + static { + useJdk6API = isJdk6(); + + CLASS_FILES = safeGetClass("java.nio.file.Files"); + CLASS_PATH = safeGetClass("java.nio.file.Path"); + CLASS_FILE_ATTRIBUTE = safeGetClass("java.nio.file.attribute.FileAttribute"); + CLASS_FILE_ATTRIBUTES = safeGetClass("[Ljava.nio.file.attribute.FileAttribute;"); + METHOD_FILE_TO_PATH = safeGetMethod(File.class, "toPath"); + METHOD_FILES_CREATE_TEMP_FILE = safeGetMethod(CLASS_FILES, "createTempFile", String.class, String.class, CLASS_FILE_ATTRIBUTES); + METHOD_FILES_CREATE_TEMP_FILE_WITHPATH = safeGetMethod(CLASS_FILES, "createTempFile", CLASS_PATH, String.class, String.class, CLASS_FILE_ATTRIBUTES); + METHOD_PATH_TO_FILE = safeGetMethod(CLASS_PATH, "toFile"); + } + + private static boolean isJdk6() { + String javaVersion = System.getProperty("java.version"); + LOGGER.log(Level.FINEST, "Detected java version = {0}", javaVersion); + return javaVersion.startsWith("1.6."); + } + + private static Class safeGetClass(String className) { + // it is jdk 6 or something failed already before + if (useJdk6API) return null; + try { + return Class.forName(className); + } catch (ClassNotFoundException e) { + LOGGER.log(Level.SEVERE, "Exception cought", e); + LOGGER.log(Level.WARNING, "Class {0} not found. Temp files will be created using old java.io API.", className); + useJdk6API = true; + return null; + } + } + + private static Method safeGetMethod(Class clazz, String methodName, Class... parameterTypes) { + // it is jdk 6 or something failed already before + if (useJdk6API) return null; + try { + return clazz.getMethod(methodName, parameterTypes); + } catch (NoSuchMethodException e) { + LOGGER.log(Level.SEVERE, "Exception cought", e); + LOGGER.log(Level.WARNING, "Method {0} not found. Temp files will be created using old java.io API.", methodName); + useJdk6API = true; + return null; + } + } + + + static Object toPath(File f) throws InvocationTargetException, IllegalAccessException { + return METHOD_FILE_TO_PATH.invoke(f); + } + + static File toFile(Object path) throws InvocationTargetException, IllegalAccessException { + return (File) METHOD_PATH_TO_FILE.invoke(path); + } + + static File createTempFile(String prefix, String suffix, File dir) throws IOException { + + if (useJdk6API) { + LOGGER.log(Level.FINEST, "Jdk6 detected, temp file (prefix:{0}, suffix:{1}) being created using old java.io API.", new Object[]{prefix, suffix}); + return File.createTempFile(prefix, suffix, dir); + + } else { + + try { + if (dir != null) { + Object path = toPath(dir); + LOGGER.log(Level.FINEST, "Temp file (path: {0}, prefix:{1}, suffix:{2}) being created using NIO API.", new Object[]{dir.getAbsolutePath(), prefix, suffix}); + return toFile(METHOD_FILES_CREATE_TEMP_FILE_WITHPATH.invoke(null, path, prefix, suffix, Array.newInstance(CLASS_FILE_ATTRIBUTE, 0))); + } else { + LOGGER.log(Level.FINEST, "Temp file (prefix:{0}, suffix:{1}) being created using NIO API.", new Object[]{prefix, suffix}); + return toFile(METHOD_FILES_CREATE_TEMP_FILE.invoke(null, prefix, suffix, Array.newInstance(CLASS_FILE_ATTRIBUTE, 0))); + } + + } catch (IllegalAccessException e) { + LOGGER.log(Level.SEVERE, "Exception caught", e); + LOGGER.log(Level.WARNING, "Error invoking java.nio API, temp file (path: {0}, prefix:{1}, suffix:{2}) being created using old java.io API.", + new Object[]{dir != null ? dir.getAbsolutePath() : null, prefix, suffix}); + return File.createTempFile(prefix, suffix, dir); + + } catch (InvocationTargetException e) { + LOGGER.log(Level.SEVERE, "Exception caught", e); + LOGGER.log(Level.WARNING, "Error invoking java.nio API, temp file (path: {0}, prefix:{1}, suffix:{2}) being created using old java.io API.", + new Object[]{dir != null ? dir.getAbsolutePath() : null, prefix, suffix}); + return File.createTempFile(prefix, suffix, dir); + } + } + + } + + +} diff -r 66f36438f548 -r 426b7a73ab43 src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Fri Dec 28 10:10:31 2012 -0800 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Wed May 22 17:02:40 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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 @@ -22,7 +22,6 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - package com.sun.xml.internal.ws.client; import com.sun.istack.internal.NotNull; @@ -30,13 +29,11 @@ import com.sun.xml.internal.ws.Closeable; import com.sun.xml.internal.ws.api.BindingID; import com.sun.xml.internal.ws.api.EndpointAddress; -import com.sun.xml.internal.ws.api.WSBinding; import com.sun.xml.internal.ws.api.WSService; import com.sun.xml.internal.ws.api.addressing.WSEndpointReference; import com.sun.xml.internal.ws.api.client.ServiceInterceptor; import com.sun.xml.internal.ws.api.client.ServiceInterceptorFactory; -import com.sun.xml.internal.ws.api.model.SEIModel; -import com.sun.xml.internal.ws.api.pipe.*; +import com.sun.xml.internal.ws.api.pipe.Stubs; import com.sun.xml.internal.ws.api.server.Container; import com.sun.xml.internal.ws.api.server.ContainerResolver; import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension; @@ -45,8 +42,8 @@ import com.sun.xml.internal.ws.client.HandlerConfigurator.AnnotationConfigurator; import com.sun.xml.internal.ws.client.HandlerConfigurator.HandlerResolverImpl; import com.sun.xml.internal.ws.client.sei.SEIStub; +import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature; import com.sun.xml.internal.ws.developer.WSBindingProvider; -import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature; import com.sun.xml.internal.ws.model.AbstractSEIModelImpl; import com.sun.xml.internal.ws.model.RuntimeModeler; import com.sun.xml.internal.ws.model.SOAPSEIModel; @@ -59,7 +56,6 @@ import com.sun.xml.internal.ws.util.JAXWSUtils; import com.sun.xml.internal.ws.util.ServiceConfigurationError; import com.sun.xml.internal.ws.util.ServiceFinder; -import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver; import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser; import org.xml.sax.SAXException; @@ -74,16 +70,17 @@ import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.soap.AddressingFeature; import java.io.IOException; +import java.lang.RuntimePermission; import java.lang.reflect.Proxy; import java.net.MalformedURLException; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; +import java.security.*; import java.util.*; import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver; + /** * Service objects provide the client view of a Web service. * @@ -578,7 +575,7 @@ } } - private T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, Class portInterface, + private T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, final Class portInterface, WebServiceFeature[] webServiceFeatures, SEIPortInfo eif) { //fail if service doesnt have WSDL if (wsdlService == null) From andrew at icedtea.classpath.org Wed May 22 09:33:45 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:33:45 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: 79 new changesets Message-ID: changeset 45bc0a080133 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=45bc0a080133 author: coffeys date: Mon Jan 14 08:59:04 2013 -0800 Merge changeset 839c92c6d50e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=839c92c6d50e author: lana date: Tue Jan 15 19:52:38 2013 -0800 Merge changeset db94066df634 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=db94066df634 author: katleman date: Wed Jan 16 13:59:58 2013 -0800 Added tag jdk7u14-b10 for changeset e5b1403fa68a changeset 8f74ebe757f3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8f74ebe757f3 author: lana date: Tue Jan 22 22:58:33 2013 -0800 Merge changeset 464bc6b8376c in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=464bc6b8376c author: katleman date: Wed Jan 23 14:02:21 2013 -0800 Added tag jdk7u14-b11 for changeset db94066df634 changeset f9a326e92faf in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f9a326e92faf author: lana date: Mon Jan 28 11:12:02 2013 -0800 Merge changeset 5a52c6cc8db9 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5a52c6cc8db9 author: katleman date: Fri Feb 01 09:57:22 2013 -0800 Added tag jdk7u14-b12 for changeset f9a326e92faf changeset 6f47d66e3af1 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6f47d66e3af1 author: katleman date: Fri Feb 01 10:25:58 2013 -0800 Added tag jdk7u13-b20 for changeset 761b933e2696 changeset e79c085784c2 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e79c085784c2 author: ewendeli date: Mon Feb 04 00:29:20 2013 +0100 Merge changeset dd7c68e93717 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=dd7c68e93717 author: ewendeli date: Fri Feb 08 15:11:04 2013 +0100 Merge changeset bd71d446809f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bd71d446809f author: katleman date: Wed Feb 13 17:57:03 2013 -0800 Added tag jdk7u14-b13 for changeset 5a52c6cc8db9 changeset 5febc4e479fa in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5febc4e479fa author: lana date: Tue Feb 19 20:45:34 2013 -0800 Merge changeset 8a12629ea213 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8a12629ea213 author: katleman date: Tue Jan 29 14:15:55 2013 -0800 Added tag jdk7u13-b10 for changeset 761b933e2696 changeset 4d95b0e87666 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4d95b0e87666 author: katleman date: Fri Feb 01 10:32:09 2013 -0800 Added tag jdk7u13-b30 for changeset 8a12629ea213 changeset 1298307076c2 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1298307076c2 author: ewendeli date: Fri Feb 01 23:30:47 2013 +0100 Merge changeset 8db0105f00ce in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8db0105f00ce author: katleman date: Thu Feb 07 14:18:44 2013 -0800 Added tag jdk7u15-b01 for changeset 1298307076c2 changeset b00c1580ffa9 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b00c1580ffa9 author: katleman date: Fri Feb 08 10:47:18 2013 -0800 Added tag jdk7u15-b02 for changeset 8db0105f00ce changeset 558fd69e214f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=558fd69e214f author: ewendeli date: Wed Feb 13 20:04:08 2013 +0100 Merge changeset 5ee2c5e10882 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5ee2c5e10882 author: ewendeli date: Wed Feb 20 19:54:23 2013 +0100 Merge changeset c160d7d1616d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c160d7d1616d author: katleman date: Wed Feb 13 18:19:52 2013 -0800 Added tag jdk7u15-b30 for changeset b00c1580ffa9 changeset e358999b4426 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e358999b4426 author: katleman date: Mon Feb 18 12:10:37 2013 -0800 Added tag jdk7u15-b03 for changeset c160d7d1616d changeset be02fb01d696 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=be02fb01d696 author: katleman date: Mon Feb 18 12:30:00 2013 -0800 Added tag jdk7u15-b32 for changeset a778aaf53c52 changeset edfcf07c2877 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=edfcf07c2877 author: katleman date: Mon Feb 18 12:42:34 2013 -0800 Merge changeset 2782a1c60faf in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2782a1c60faf author: katleman date: Tue Feb 26 12:42:27 2013 -0800 Added tag jdk7u17-b01 for changeset edfcf07c2877 changeset 0abc443a6867 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0abc443a6867 author: katleman date: Fri Mar 01 11:55:37 2013 -0800 Added tag jdk7u17-b02 for changeset 2782a1c60faf changeset 7ac0b733ca9a in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7ac0b733ca9a author: coffeys date: Sat Mar 02 17:26:49 2013 +0000 Merge changeset d4e17c602f09 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d4e17c602f09 author: katleman date: Wed Feb 27 16:52:14 2013 -0800 Added tag jdk7u14-b14 for changeset 5febc4e479fa changeset ffc0d9148c45 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ffc0d9148c45 author: mfang date: Wed Feb 27 19:48:07 2013 -0800 8008764: 7uX l10n resource file translation update Reviewed-by: naoto changeset 5fdb509d1f1a in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5fdb509d1f1a author: mfang date: Wed Feb 27 21:06:41 2013 -0800 Merge changeset fd01d120ba01 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=fd01d120ba01 author: lana date: Tue Mar 05 17:12:30 2013 -0800 Merge changeset 07eef7052aa5 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=07eef7052aa5 author: katleman date: Thu Mar 07 11:08:48 2013 -0800 Added tag jdk7u14-b15 for changeset 5fdb509d1f1a changeset cf80c545434c in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=cf80c545434c author: lana date: Mon Mar 11 14:49:17 2013 -0700 Merge changeset aecd58f25d7f in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=aecd58f25d7f author: katleman date: Wed Mar 13 17:18:25 2013 -0700 Added tag jdk7u14-b16 for changeset cf80c545434c changeset 577f9625ec55 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=577f9625ec55 author: katleman date: Wed Mar 20 14:48:16 2013 -0700 Added tag jdk7u14-b17 for changeset aecd58f25d7f changeset 5f4ad2269018 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5f4ad2269018 author: andrew date: Wed Apr 03 14:17:15 2013 +0100 Merge jdk7u14-b17 changeset 24ac4090a6e4 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=24ac4090a6e4 author: martin date: Wed Apr 17 13:46:11 2013 +0100 Change -Werror fix to preserve OpenJDK default. changeset 5168a2c7af61 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5168a2c7af61 author: katleman date: Wed Mar 27 16:18:54 2013 -0700 Added tag jdk7u14-b18 for changeset 577f9625ec55 changeset e8c876a77def in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e8c876a77def author: katleman date: Wed Apr 03 15:16:01 2013 -0700 Added tag jdk7u14-b19 for changeset 5168a2c7af61 changeset 86ae75a68cc3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=86ae75a68cc3 author: katleman date: Fri Apr 05 09:11:06 2013 -0700 Added tag jdk7u14-b19 for changeset e8c876a77def changeset c31648d7a6ac in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c31648d7a6ac author: katleman date: Wed Apr 10 10:30:31 2013 -0700 Added tag jdk7u14-b20 for changeset 86ae75a68cc3 changeset ded093700aef in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ded093700aef author: katleman date: Thu Feb 07 14:21:18 2013 -0800 Added tag jdk7u21-b01 for changeset 8a12629ea213 changeset 82103a284427 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=82103a284427 author: ewendeli date: Mon Feb 11 21:11:10 2013 +0100 Merge changeset 9adfe6a84c38 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9adfe6a84c38 author: katleman date: Thu Feb 14 14:12:04 2013 -0800 Added tag jdk7u21-b02 for changeset 82103a284427 changeset dd2aef354fed in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=dd2aef354fed author: katleman date: Tue Feb 19 17:14:11 2013 -0800 Added tag jdk7u21-b03 for changeset 9adfe6a84c38 changeset 1d37792f52db in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1d37792f52db author: dmeetry date: Wed Dec 05 23:44:21 2012 +0400 7192744: fix up tests to accommodate jtreg spec change Reviewed-by: jjg changeset c84d318736e4 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c84d318736e4 author: dmeetry date: Wed Dec 05 23:48:19 2012 +0400 7192449: fix up tests to accommodate jtreg spec change Reviewed-by: jjg changeset 71704143744e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=71704143744e author: dmeetry date: Sat Dec 08 15:04:47 2012 +0400 8004391: Bug fix in jtreg causes test failures in pre jdk 8 langtools tests Reviewed-by: jjg changeset 884621bb9042 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=884621bb9042 author: katleman date: Tue Feb 26 12:45:32 2013 -0800 Added tag jdk7u21-b04 for changeset 71704143744e changeset acd27fc7fcf3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=acd27fc7fcf3 author: katleman date: Tue Oct 16 14:56:05 2012 -0700 Added tag jdk7u9-b31 for changeset 5d1a6a593fa1 changeset bcf19df20e97 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bcf19df20e97 author: katleman date: Wed Oct 31 10:13:07 2012 -0700 Added tag jdk7u9-b32 for changeset acd27fc7fcf3 changeset 57ef63c9c509 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=57ef63c9c509 author: asaha date: Tue Dec 04 11:52:10 2012 -0800 Merge changeset db426c20b069 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=db426c20b069 author: asaha date: Wed Dec 05 15:34:54 2012 -0800 Merge changeset 7a39876a28df in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7a39876a28df author: katleman date: Fri Dec 07 08:19:37 2012 -0800 Added tag jdk7u10-b31 for changeset db426c20b069 changeset 92de02b43596 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=92de02b43596 author: ewendeli date: Tue Jan 15 08:24:45 2013 +0100 Merge changeset 309b5ccd0501 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=309b5ccd0501 author: katleman date: Wed Jan 16 13:57:50 2013 -0800 Added tag jdk7u11-b32 for changeset 92de02b43596 changeset 04893d094547 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=04893d094547 author: katleman date: Tue Jan 29 14:11:47 2013 -0800 Added tag jdk7u11-b33 for changeset 309b5ccd0501 changeset 39714d28cab1 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=39714d28cab1 author: asaha date: Fri Feb 08 19:27:53 2013 -0800 Merge changeset 2c82a733594a in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2c82a733594a author: asaha date: Mon Feb 11 11:18:51 2013 -0800 Merge changeset efb510942bb8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=efb510942bb8 author: katleman date: Tue Feb 12 12:33:27 2013 -0800 Added tag jdk7u15-b31 for changeset 2c82a733594a changeset 5639dfc55f77 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5639dfc55f77 author: asaha date: Thu Feb 14 13:25:53 2013 -0800 Merge changeset 77d06fdfd5f4 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=77d06fdfd5f4 author: katleman date: Tue Feb 19 12:03:22 2013 -0800 Added tag jdk7u15-b33 for changeset 5639dfc55f77 changeset e356f850e57e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e356f850e57e author: asaha date: Fri Mar 01 16:15:57 2013 -0800 Merge changeset e77e67364607 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e77e67364607 author: cl date: Sat Mar 02 09:48:10 2013 -0800 Added tag jdk7u17-b30 for changeset 0abc443a6867 changeset 1a9b32d36ff8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1a9b32d36ff8 author: asaha date: Sat Mar 02 14:41:25 2013 -0800 Merge changeset a91bdaf125d8 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a91bdaf125d8 author: cl date: Sat Mar 02 18:57:01 2013 -0800 Added tag jdk7u17-b31 for changeset 1a9b32d36ff8 changeset 0970c2290284 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0970c2290284 author: asaha date: Mon Mar 04 11:49:57 2013 -0800 Merge changeset 5e0127eb56c3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5e0127eb56c3 author: katleman date: Tue Mar 05 16:46:38 2013 -0800 Added tag jdk7u21-b05 for changeset 0970c2290284 changeset 08034557136e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=08034557136e author: katleman date: Tue Mar 12 14:44:28 2013 -0700 Added tag jdk7u21-b06 for changeset 5e0127eb56c3 changeset f3c75c441d56 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f3c75c441d56 author: katleman date: Tue Mar 19 14:34:10 2013 -0700 Added tag jdk7u21-b07 for changeset 08034557136e changeset b6c7a18b668b in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b6c7a18b668b author: katleman date: Wed Mar 20 14:47:51 2013 -0700 Added tag jdk7u21-b08 for changeset f3c75c441d56 changeset de06078efe70 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=de06078efe70 author: katleman date: Tue Mar 26 15:00:49 2013 -0700 Added tag jdk7u21-b09 for changeset b6c7a18b668b changeset e120818fc321 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e120818fc321 author: katleman date: Sun Mar 31 03:47:06 2013 -0700 Added tag jdk7u21-b10 for changeset de06078efe70 changeset ff6f8ab2635c in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ff6f8ab2635c author: katleman date: Thu Apr 04 15:48:50 2013 -0700 Added tag jdk7u21-b11 for changeset e120818fc321 changeset a87ad97e80ae in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a87ad97e80ae author: katleman date: Fri Apr 05 12:49:15 2013 -0700 Added tag jdk7u21-b30 for changeset ff6f8ab2635c changeset ac996e233aa3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ac996e233aa3 author: katleman date: Sun Apr 07 16:35:05 2013 -0700 Added tag jdk7u21-b12 for changeset a87ad97e80ae changeset 3d824654ea4d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3d824654ea4d author: coffeys date: Tue Apr 16 11:51:16 2013 +0100 Merge changeset 718a945bfdb9 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=718a945bfdb9 author: andrew date: Tue Apr 23 23:15:02 2013 +0100 Merge jdk7u14-b20 changeset 68c60cde94a7 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=68c60cde94a7 author: andrew date: Wed May 22 16:11:58 2013 +0100 Remove jcheck changeset cbb9be4fb46d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=cbb9be4fb46d author: andrew date: Wed May 22 17:02:41 2013 +0100 Merge with HEAD diffstat: .hgtags | 74 ++++++++++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties | 62 ++++---- src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties | 12 +- src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties | 30 ++-- src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties | 12 +- src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 2 +- src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties | 2 +- src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties | 2 +- 12 files changed, 142 insertions(+), 65 deletions(-) diffs (truncated from 538 to 500 lines): diff -r 7c0c3aeb2c60 -r cbb9be4fb46d .hgtags --- a/.hgtags Fri Dec 28 10:08:34 2012 -0800 +++ b/.hgtags Wed May 22 17:02:41 2013 +0100 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -191,6 +197,7 @@ 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -213,6 +220,8 @@ 0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02 9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05 +5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31 +acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32 a35ca56cf8d09b92511f0cd71208a2ea05c8a338 jdk7u8-b01 41bc8da868e58f7182d26b2ab9b6f8a4b09894ed jdk7u8-b02 df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03 @@ -222,10 +231,75 @@ cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07 3204f355a32d83ffceeed1c0c8a52a2d834ae29f jdk7u10-b08 0b90d3480dbfc16aa3901df249b3cb21bcfa0b32 jdk7u10-b09 +8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10 +01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11 +1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12 +14735b3d8bdffc7892f1db04b6262bdaad2eb9d7 jdk7u10-b13 +f555fcdbd07156ee11b25fb4ac106065bbf496b4 jdk7u10-b14 +dfcd16ac3fbcabed815b8ef4e792716cce0bce21 jdk7u10-b15 +eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u10-b16 +7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17 +4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18 +1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30 87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01 +db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31 +b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20 +aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21 +92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32 +309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33 +eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03 +e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04 +17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05 +96c8b3b817aa3e672f78f1d5006616104378ff29 jdk7u11-b06 +c5d3dabddff76c92425cbf6a99ed4e066d16b4fd jdk7u11-b07 +a0d9abc405580d6fa0ae217fab96608285a38c41 jdk7u11-b08 +a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u13-b09 +761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b10 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u13-b30 +761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b20 12996c33d506d741ae7c3cc8e2aa2f650a36b839 jdk7u12-b02 3fe61a8a2cfb02ee2b1cd4cd257b76c5b8668cd3 jdk7u12-b03 e2adb6f53caaa618521bdf965bc484c7ffae190f jdk7u12-b04 454ce2fa72e9ad14e83ebf54636c196d75e35509 jdk7u12-b05 ab820babd394eed07c58bc2bffc58b0d92ca39b8 jdk7u12-b06 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07 +7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08 +96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09 +85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint +e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10 +db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11 +f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12 +5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13 +5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14 +5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15 +1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 +8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 +b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30 +2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31 +5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33 +c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03 +a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32 +edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 +2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02 +0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30 +1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01 +82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02 +9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03 +71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04 +0970c229028499d5348d77712edf42d712538441 jdk7u21-b05 +5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06 +08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07 +f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08 +b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09 +de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10 +e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11 +ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30 +a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12 +cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16 +aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17 +577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18 +5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 +5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 +e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19 +86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20 diff -r 7c0c3aeb2c60 -r cbb9be4fb46d .jcheck/conf --- a/.jcheck/conf Fri Dec 28 10:08:34 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 7c0c3aeb2c60 -r cbb9be4fb46d make/Makefile --- a/make/Makefile Fri Dec 28 10:08:34 2012 -0800 +++ b/make/Makefile Wed May 22 17:02:41 2013 +0100 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 7c0c3aeb2c60 -r cbb9be4fb46d make/build.properties --- a/make/build.properties Fri Dec 28 10:08:34 2012 -0800 +++ b/make/build.properties Wed May 22 17:02:41 2013 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 7c0c3aeb2c60 -r cbb9be4fb46d make/build.xml --- a/make/build.xml Fri Dec 28 10:08:34 2012 -0800 +++ b/make/build.xml Wed May 22 17:02:41 2013 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 7c0c3aeb2c60 -r cbb9be4fb46d src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Fri Dec 28 10:08:34 2012 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed May 22 17:02:41 2013 +0100 @@ -33,7 +33,7 @@ doclet.navAnnotationTypeMember=\u8981\u7D20 doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9 doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3 -doclet.navEnum=\u5217\u6319\u5B9A\u6570 +doclet.navEnum=\u5217\u6319\u578B\u5B9A\u6570 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF doclet.navMethod=\u30E1\u30BD\u30C3\u30C9 doclet.Index=\u7D22\u5F15 @@ -46,9 +46,9 @@ doclet.None=\u306A\u3057 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.navDeprecated=\u975E\u63A8\u5968 -doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 -doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 -doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +doclet.Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8 +doclet.Window_Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8 +doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u975E\u63A8\u5968\u3067\u3059\u3002 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9: doclet.in_class=\u30AF\u30E9\u30B9\u5185 doclet.0_Fields_and_Methods="{0}"\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9 @@ -69,31 +69,31 @@ doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1} doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0 doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981 -doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API -doclet.Deprecated_Packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8 -doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9 -doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B -doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916 -doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B -doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC -doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9 -doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570 -doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20 -doclet.deprecated_packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8 -doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9 -doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B -doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916 -doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B -doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC -doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9 -doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -doclet.deprecated_methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9 -doclet.deprecated_enum_constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570 -doclet.deprecated_annotation_type_members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20 +doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI +doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9 +doclet.Deprecated_Enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B +doclet.Deprecated_Interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 +doclet.Deprecated_Exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916 +doclet.Deprecated_Annotation_Types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B +doclet.Deprecated_Errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC +doclet.Deprecated_Fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.Deprecated_Constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.Deprecated_Methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9 +doclet.Deprecated_Enum_Constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570 +doclet.Deprecated_Annotation_Type_Members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20 +doclet.deprecated_packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.deprecated_classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9 +doclet.deprecated_enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B +doclet.deprecated_interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 +doclet.deprecated_exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916 +doclet.deprecated_annotation_types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B +doclet.deprecated_errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC +doclet.deprecated_fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.deprecated_constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.deprecated_methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9 +doclet.deprecated_enum_constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570 +doclet.deprecated_annotation_type_members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20 doclet.Frame_Output=\u30D5\u30EC\u30FC\u30E0\u51FA\u529B doclet.Docs_generated_by_Javadoc=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306Fjavadoc\u3067\u751F\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002 doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057) @@ -127,7 +127,7 @@ doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: doclet.Standard_doclet_invoked=\u6A19\u6E96\u306Edoclet\u304C\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F... -doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u4EE5\u5916\u306E\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 +doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u3067\u306A\u3044\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 doclet.Interfaces_Italic=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u30A4\u30BF\u30EA\u30C3\u30AF) doclet.Enclosing_Class=\u542B\u307E\u308C\u3066\u3044\u308B\u30AF\u30E9\u30B9: doclet.Enclosing_Interface=\u542B\u307E\u308C\u3066\u3044\u308B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9: @@ -153,7 +153,7 @@ doclet.Help_line_17_with_tree_link=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F java.lang.Object \u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001java.lang.Object \u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002 doclet.Help_line_18=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_19=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 -doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u975E\u63A8\u5968\u306EAPI\u3092\u3059\u3079\u3066\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 doclet.Help_line_21=\u7D22\u5F15 doclet.Help_line_22={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_23=\u524D/\u6B21 diff -r 7c0c3aeb2c60 -r cbb9be4fb46d src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Fri Dec 28 10:08:34 2012 -0800 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Wed May 22 17:02:41 2013 +0100 @@ -102,8 +102,8 @@ doclet.annotationtype=\u6CE8\u91C8\u578B doclet.annotationtypes=\u6CE8\u91C8\u578B doclet.Enum=\u5217\u6319\u578B -doclet.enum=\u5217\u6319 -doclet.enums=\u5217\u6319 +doclet.enum=\u5217\u6319\u578B +doclet.enums=\u5217\u6319\u578B doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.class=\u30AF\u30E9\u30B9 @@ -135,8 +135,8 @@ doclet.Property_Detail=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8A73\u7D30 doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30 -doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -doclet.Deprecated_class=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +doclet.Deprecated=\u975E\u63A8\u5968\u3067\u3059\u3002 +doclet.Deprecated_class=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u975E\u63A8\u5968\u3067\u3059\u3002 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0} doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002 doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 @@ -158,7 +158,7 @@ doclet.annotation_type_required_members=\u5FC5\u9808\u8981\u7D20 doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20 doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570 -doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570 +doclet.Enum_Constants=\u5217\u6319\u578B\u5B9A\u6570 doclet.nested_classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9 doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9 doclet.subclasses=\u30B5\u30D6\u30AF\u30E9\u30B9 @@ -182,4 +182,4 @@ #Documentation for Enums doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n
\nfor({0} c: {0}.values())\n  System.out.println(c);\n
\n at return\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217 -doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068\u53B3\u5BC6\u306B\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n at param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n at return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n at throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n at throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408 +doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068\u6B63\u78BA\u306B\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n at param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n at return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n at throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n at throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408 diff -r 7c0c3aeb2c60 -r cbb9be4fb46d src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Fri Dec 28 10:08:34 2012 -0800 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed May 22 17:02:41 2013 +0100 @@ -248,7 +248,7 @@ compiler.err.generic.throwable=\u6C4E\u7528\u30AF\u30E9\u30B9\u306Fjava.lang.Throwable\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093 # 0: symbol -compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50\''static\''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 +compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50''static''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059 # 0: string compiler.err.illegal.char=\\{0}\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059 @@ -365,7 +365,7 @@ compiler.err.limit.string=\u5B9A\u6570\u6587\u5B57\u5217\u304C\u9577\u3059\u304E\u307E\u3059 -compiler.err.limit.string.overflow=\u6587\u5B57\u5217\"{0}...\"\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059 +compiler.err.limit.string.overflow=\u6587\u5B57\u5217"{0}..."\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059 compiler.err.malformed.fp.lit=\u6D6E\u52D5\u5C0F\u6570\u70B9\u30EA\u30C6\u30E9\u30EB\u304C\u4E0D\u6B63\u3067\u3059 @@ -625,7 +625,7 @@ ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u30A8\u30E9\u30FC:\u0020 +compiler.err.error=\u30A8\u30E9\u30FC: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093 @@ -667,18 +667,18 @@ compiler.note.note=\u6CE8\u610F: # 0: file name -compiler.note.deprecated.filename={0}\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 +compiler.note.deprecated.filename={0}\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 -compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 +compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 # The following string may appear after one of the above deprecation # messages. compiler.note.deprecated.recompile=\u8A73\u7D30\u306F\u3001-Xlint:deprecation\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002 # 0: file name -compiler.note.deprecated.filename.additional={0}\u306B\u63A8\u5968\u3055\u308C\u306A\u3044API\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002 +compiler.note.deprecated.filename.additional={0}\u306B\u975E\u63A8\u5968\u306EAPI\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002 -compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 +compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002 # 0: file name compiler.note.unchecked.filename={0}\u306E\u64CD\u4F5C\u306F\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 @@ -783,7 +783,7 @@ ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}]\u0020 +compiler.warn.lintOption=[{0}] # 0: symbol compiler.warn.constant.SVUID=serialVersionUID\u306F\u30AF\u30E9\u30B9{0}\u306E\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 @@ -794,7 +794,7 @@ compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093 # 0: symbol, 1: symbol -compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093 +compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u307E\u3057\u305F # 0: symbol compiler.warn.sun.proprietary={0}\u306F\u5185\u90E8\u6240\u6709\u306EAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 @@ -930,7 +930,7 @@ # 0: symbol compiler.warn.varargs.unsafe.use.varargs.param=\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u578B\u60C5\u5831\u4FDD\u6301\u53EF\u80FD\u3067\u306A\u3044\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u304B\u3089\u306E\u30D2\u30FC\u30D7\u6C5A\u67D3\u306E\u539F\u56E0\u3068\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -compiler.warn.missing.deprecated.annotation=\u63A8\u5968\u3055\u308C\u306A\u3044\u9805\u76EE\u306F at Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093 +compiler.warn.missing.deprecated.annotation=\u975E\u63A8\u5968\u306E\u9805\u76EE\u306F at Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093 compiler.warn.invalid.archive.file=\u30D1\u30B9\u4E0A\u306E\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB: {0} @@ -1244,7 +1244,7 @@ compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -compiler.misc.kindname.enum=\u5217\u6319 +compiler.misc.kindname.enum=\u5217\u6319\u578B compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 @@ -1405,17 +1405,17 @@ # where clause for captured type: contains upper ('extends {1}') and lower # ('super {2}') bound along with the wildcard that generated this captured type ({3}) # 0: type, 1: type, 2: type, 3: type -compiler.misc.where.captured={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} super: {2} +compiler.misc.where.captured={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057{2}\u3092\u30B9\u30FC\u30D1\u30FC\u3057\u307E\u3059 # compact where clause for captured type: contains upper ('extends {1}') along # with the wildcard that generated this captured type ({3}) # 0: type, 1: type, 2: unused, 3: type -compiler.misc.where.captured.1={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} +compiler.misc.where.captured.1={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 # where clause for type variable: contains upper bound(s) ('extends {1}') along with # the kindname ({2}) and location ({3}) in which the typevar has been declared # 0: type, 1: list of type, 2: symbol kind, 3: symbol -compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0} extends {1} +compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 # compact where clause for type variable: contains the kindname ({2}) and location ({3}) # in which the typevar has been declared @@ -1424,7 +1424,7 @@ # where clause for type variable: contains all the upper bound(s) ('extends {1}') # of this intersection type # 0: type, 1: list of type -compiler.misc.where.intersection={0} extends {1} +compiler.misc.where.intersection={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059 ### Where clause headers ### compiler.misc.where.description.captured={0}\u304C\u65B0\u3057\u3044\u578B\u5909\u6570\u306E\u5834\u5408: diff -r 7c0c3aeb2c60 -r cbb9be4fb46d src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Fri Dec 28 10:08:34 2012 -0800 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Wed May 22 17:02:41 2013 +0100 @@ -248,7 +248,7 @@ compiler.err.generic.throwable=\u6CDB\u578B\u7C7B\u4E0D\u80FD\u6269\u5C55 java.lang.Throwable # 0: symbol -compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\u6001\u58F0\u660E\u975E\u6CD5\n\u4FEE\u9970\u7B26 \''static\'' \u4EC5\u5141\u8BB8\u5728\u5E38\u91CF\u53D8\u91CF\u58F0\u660E\u4E2D\u4F7F\u7528 +compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\u6001\u58F0\u660E\u975E\u6CD5\n\u4FEE\u9970\u7B26 ''static'' \u4EC5\u5141\u8BB8\u5728\u5E38\u91CF\u53D8\u91CF\u58F0\u660E\u4E2D\u4F7F\u7528 # 0: string compiler.err.illegal.char=\u975E\u6CD5\u5B57\u7B26: \\{0} @@ -365,7 +365,7 @@ compiler.err.limit.string=\u5E38\u91CF\u5B57\u7B26\u4E32\u8FC7\u957F -compiler.err.limit.string.overflow=\u5BF9\u4E8E\u5E38\u91CF\u6C60\u6765\u8BF4, \u5B57\u7B26\u4E32 \"{0}...\" \u7684 UTF8 \u8868\u793A\u8FC7\u957F +compiler.err.limit.string.overflow=\u5BF9\u4E8E\u5E38\u91CF\u6C60\u6765\u8BF4, \u5B57\u7B26\u4E32 "{0}..." \u7684 UTF8 \u8868\u793A\u8FC7\u957F compiler.err.malformed.fp.lit=\u6D6E\u70B9\u6587\u5B57\u7684\u683C\u5F0F\u9519\u8BEF @@ -625,7 +625,7 @@ ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u9519\u8BEF:\u0020 +compiler.err.error=\u9519\u8BEF: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file=\u65E0\u6CD5\u8BFB\u53D6: {0} @@ -664,7 +664,7 @@ ## The following string will appear before all messages keyed as: ## "compiler.note". -compiler.note.note=\u6CE8:\u0020 +compiler.note.note=\u6CE8: # 0: file name compiler.note.deprecated.filename={0}\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002 @@ -778,12 +778,12 @@ ## ## All warning messages are preceded by the following string. -compiler.warn.warning=\u8B66\u544A:\u0020 +compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}]\u0020 +compiler.warn.lintOption=[{0}] From andrew at icedtea.classpath.org Wed May 22 09:34:06 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:34:06 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 278 new changesets Message-ID: changeset 4fd8e7ebca9a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4fd8e7ebca9a author: andrew date: Thu Jan 17 12:07:28 2013 +0000 Make sure libffi cflags and libs are used. changeset 5226f8fd82ab in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5226f8fd82ab author: coffeys date: Mon Jan 14 07:36:20 2013 -0800 Merge changeset 4a2a9ea97db1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4a2a9ea97db1 author: amurillo date: Tue Jan 15 15:05:47 2013 -0800 Merge changeset df85f4f70d8f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=df85f4f70d8f author: amurillo date: Fri Dec 21 11:56:14 2012 -0800 8005383: new hotspot build - hs24-b29 Reviewed-by: jcoomes changeset 57adf5774d20 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=57adf5774d20 author: bharadwaj date: Thu Nov 15 10:42:06 2012 -0800 8001077: remove ciMethod::will_link Summary: Removed will_link and changed all calls to is_loaded(). Reviewed-by: kvn changeset decd75a744ee in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=decd75a744ee author: kvn date: Fri Nov 16 15:49:46 2012 -0800 7146636: compiler/6865265/StackOverflowBug.java fails due to changed stack minimum Summary: Increase the stack size in the run parameters. Reviewed-by: kvn Contributed-by: david.r.chase at oracle.com changeset 0245298c87e3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0245298c87e3 author: vlivanov date: Wed Nov 21 05:57:12 2012 -0800 8001538: hs_err file does not list anymore compiled methods in compilation events Summary: Fixed message buffer size calculation. Reviewed-by: kvn, twisti changeset dedce7e602e1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dedce7e602e1 author: twisti date: Mon Nov 26 17:25:11 2012 -0800 7172640: C2: instrinsic implementations in LibraryCallKit should use argument() instead of pop() Reviewed-by: kvn, jrose changeset 733356efcc6e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=733356efcc6e author: bharadwaj date: Tue Nov 27 17:24:15 2012 -0800 7092905: C2: Keep track of the number of dead nodes Summary: keep an (almost) accurate running count of the reachable (live) flow graph nodes. Reviewed-by: kvn, twisti, jrose, vlivanov changeset d075d420d60e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d075d420d60e author: twisti date: Mon Dec 03 15:48:49 2012 -0800 8004319: test/gc/7168848/HumongousAlloc.java fails after 7172640 Reviewed-by: kvn, johnc changeset 9180a0168de8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9180a0168de8 author: neliasso date: Mon Nov 26 15:11:55 2012 +0100 8003983: LogCompilation tool is broken since c1 support Summary: Fixed emitting and parsing Reviewed-by: jrose, kvn changeset 3b5a0977ab9f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3b5a0977ab9f author: twisti date: Fri Dec 14 12:06:42 2012 -0800 8003238: JSR 292: intermittent exception failure with java/lang/invoke/CallSiteTest.java Reviewed-by: jrose, kvn changeset e396285cea04 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e396285cea04 author: roland date: Tue Dec 18 14:55:25 2012 +0100 8005031: Some cleanup in c2 to prepare for incremental inlining support Summary: collection of small changes to prepare for incremental inlining. Reviewed-by: twisti, kvn changeset 7dedd32ceb2f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7dedd32ceb2f author: vlivanov date: Tue Dec 18 06:52:00 2012 -0800 8003135: HotSpot inlines and hoists the Thread.currentThread().isInterrupted() out of the loop Summary: Make the load of TLS._osthread._interrupted flag in Thread.isInterrupted(Z)Z intrinsic effectively volatile. Reviewed-by: kvn, jrose changeset 9e7f63123dfe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9e7f63123dfe author: twisti date: Wed Dec 19 14:44:00 2012 -0800 8005033: clear high word for integer pop count on SPARC Reviewed-by: kvn, twisti Contributed-by: Richard Reingruber changeset d653d418e54c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d653d418e54c author: kvn date: Wed Dec 19 15:40:35 2012 -0800 8004835: Improve AES intrinsics on x86 Summary: Enable AES intrinsics on non-AVX cpus, group together aes instructions in crypto stubs. Reviewed-by: roland, twisti changeset 841d6285ff8a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=841d6285ff8a author: kvn date: Wed Dec 19 19:21:15 2012 -0800 8004741: Missing compiled exception handle table entry for multidimensional array allocation Summary: Added missing exception path for multidimensional array allocation and use Throwable type instead of OutOfMemoryError for allocation's exception. Reviewed-by: twisti changeset 2f169876df42 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2f169876df42 author: roland date: Sun Dec 23 17:08:22 2012 +0100 8005071: Incremental inlining for JSR 292 Summary: post parse inlining driven by number of live nodes. Reviewed-by: twisti, kvn, jrose changeset 1da9509ab853 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1da9509ab853 author: kvn date: Thu Jan 03 15:09:55 2013 -0800 8005522: use fast-string instructions on x86 for zeroing Summary: use 'rep stosb' instead of 'rep stosq' when fast-string operations are available. Reviewed-by: twisti, roland changeset 1b08add4c387 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1b08add4c387 author: kvn date: Thu Jan 03 16:30:47 2013 -0800 8005544: Use 256bit YMM registers in arraycopy stubs on x86 Summary: Use YMM registers in arraycopy and array_fill stubs. Reviewed-by: roland, twisti changeset 0deee949d657 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0deee949d657 author: kvn date: Tue Jan 08 11:30:51 2013 -0800 8005419: Improve intrinsics code performance on x86 by using AVX2 Summary: use 256bit vpxor,vptest instructions in String.compareTo() and equals() intrinsics. Reviewed-by: twisti changeset 0e25216625f7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0e25216625f7 author: jiangli date: Thu Jan 10 23:03:24 2013 -0500 8001341: SIGSEGV in methodOopDesc::fast_exception_handler_bci_for(KlassHandle,int,Thread*)+0x3e9. Summary: Use methodHandle. Reviewed-by: coleenp, acorn, twisti, sspitsyn changeset 7554f9b2bcc7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7554f9b2bcc7 author: amurillo date: Fri Jan 11 10:38:38 2013 -0800 Merge changeset 181528fd1e74 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=181528fd1e74 author: amurillo date: Fri Jan 11 10:38:39 2013 -0800 Added tag hs24-b29 for changeset 7554f9b2bcc7 changeset a110c1abdbe8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a110c1abdbe8 author: lana date: Tue Jan 15 19:34:10 2013 -0800 Merge changeset 23867f4f4480 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=23867f4f4480 author: katleman date: Wed Jan 16 13:59:27 2013 -0800 Added tag jdk7u14-b10 for changeset 181528fd1e74 changeset f5bd894b0db4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f5bd894b0db4 author: amurillo date: Fri Jan 11 10:57:42 2013 -0800 8006035: new hotspot build - hs24-b30 Reviewed-by: jcoomes changeset bb74dc5ddf07 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bb74dc5ddf07 author: sla date: Tue Jan 15 09:07:30 2013 +0100 8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp Contributed-by: Karen Kinnear , Bengt Rutisson , Calvin Cheung , Erik Gahlin , Erik Helin , Jesper Wilhelmsson , Keith McGuigan , Mattias Tobiasson , Markus Gronlund , Mikael Auno , Nils Eliasson , Nils Loodin , Rickard Backman , Staffan Larsen , Stefan Karlsson , Yekaterina Kantserova changeset 4008cf63c301 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4008cf63c301 author: amurillo date: Thu Jan 17 03:37:13 2013 -0800 Merge changeset 06a41c6e29c2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=06a41c6e29c2 author: amurillo date: Thu Jan 17 03:37:14 2013 -0800 Added tag hs24-b30 for changeset 4008cf63c301 changeset f26397ddd13b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f26397ddd13b author: lana date: Tue Jan 22 22:45:31 2013 -0800 Merge changeset 998a24b491b0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=998a24b491b0 author: katleman date: Wed Jan 23 14:01:22 2013 -0800 Added tag jdk7u14-b11 for changeset 06a41c6e29c2 changeset bfa88fb4cb01 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bfa88fb4cb01 author: lana date: Mon Jan 28 11:12:17 2013 -0800 Merge changeset acf5f0fbba89 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=acf5f0fbba89 author: katleman date: Fri Feb 01 09:56:38 2013 -0800 Added tag jdk7u14-b12 for changeset bfa88fb4cb01 changeset 3ccedb5838f2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3ccedb5838f2 author: amurillo date: Thu Jan 17 03:45:17 2013 -0800 8006510: new hotspot build - hs24-b31 Reviewed-by: jcoomes changeset 6f113f191e4e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6f113f191e4e author: ehelin date: Thu Jan 17 16:32:52 2013 +0100 8006400: Add support for defining trace types in closed code Reviewed-by: sla, nloodin, brutisso Contributed-by: erik.helin at oracle.com changeset 8a60837325f0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8a60837325f0 author: amurillo date: Fri Jan 18 16:50:40 2013 -0800 8000780: make Zero build and run with JDK8 Reviewed-by: twisti, kvn Contributed-by: Chris Phillips changeset 553ac1e00352 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=553ac1e00352 author: brutisso date: Mon Jan 21 09:00:04 2013 +0100 8006431: os::Bsd::initialize_system_info() sets _physical_memory too large Summary: Use HW_MEMSIZE instead of HW_USERMEM to get a 64 bit value of the physical memory on the machine. Also reviewed by vitalyd at gmail.com. Reviewed-by: sla, dholmes, dlong, mikael changeset 8575a51238cb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8575a51238cb author: dsamersoff date: Mon Jan 21 18:50:57 2013 +0400 8002048: Protocol to discovery of manageable Java processes on a network Summary: Introduce a protocol to discover manageble Java instances across a network subnet, JDP Reviewed-by: sla, dfuchs changeset 515d98bb85f2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=515d98bb85f2 author: dsamersoff date: Mon Jan 21 14:07:06 2013 -0500 Merge changeset 62eafb1b8499 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=62eafb1b8499 author: zgu date: Wed Jan 09 14:46:55 2013 -0500 7152671: RFE: Windows decoder should add some std dirs to the symbol search path Summary: Added JRE/JDK bin directories to decoder's symbol search path Reviewed-by: dcubed, sla changeset c28e0cb8d005 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c28e0cb8d005 author: zgu date: Fri Jan 11 12:30:54 2013 -0500 8005936: PrintNMTStatistics doesn't work for normal JVM exit Summary: Moved NMT shutdown code to JVM exit handler to ensure NMT statistics is printed when PrintNMTStatistics is enabled Reviewed-by: acorn, coleenp changeset 24aa4f99d1aa in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=24aa4f99d1aa author: kvn date: Wed Jan 23 15:11:03 2013 -0800 8003878: compiler/7196199 test failed on OS X since 8b54, jdk7u12b01 Summary: Limit vectors size to 16 bytes on BSD until the problem is fixed Reviewed-by: twisti changeset 7b2efda91ffc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7b2efda91ffc author: amurillo date: Thu Jan 24 11:29:13 2013 -0800 Merge changeset e1bc0d406d3f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e1bc0d406d3f author: amurillo date: Thu Jan 24 11:29:14 2013 -0800 Added tag hs24-b31 for changeset 7b2efda91ffc changeset 9a5777cc2847 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9a5777cc2847 author: amurillo date: Thu Jan 24 11:40:59 2013 -0800 8006826: new hotspot build - hs24-b32 Reviewed-by: jcoomes changeset 21b0918ed779 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=21b0918ed779 author: zgu date: Tue Jan 22 14:27:41 2013 -0500 6871190: Don't terminate JVM if it is running in a non-interactive session Summary: Don't handle CTRL_LOGOFF_EVENT event when the process is running in a non-interactive session Reviewed-by: ctornqvi, acorn changeset fed67a49fd2c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fed67a49fd2c author: amurillo date: Tue Jan 29 15:40:29 2013 -0800 8007101: make jdk7u14 the default jprt release for hs24 Reviewed-by: jcoomes, ohair, dcubed changeset b1f34a2b2e22 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1f34a2b2e22 author: twisti date: Fri Jan 11 14:07:09 2013 -0800 8006031: LibraryCallKit::inline_array_copyOf disabled unintentionally with 7172640 Reviewed-by: kvn changeset 21fe158e804b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=21fe158e804b author: zgu date: Thu Jan 31 11:01:34 2013 -0500 8005048: NMT: #loaded classes needs to just show the # defined classes Summary: Count number of instance classes so that it matches class metadata size Reviewed-by: coleenp, acorn changeset daa66f8e3d8c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=daa66f8e3d8c author: zgu date: Thu Jan 31 07:22:09 2013 -0800 Merge changeset fada199d881a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fada199d881a author: zgu date: Thu Jan 31 13:14:57 2013 -0500 8000692: Remove old KERNEL code Summary: Removed depreciated kernel VM source code from hotspot VM Reviewed-by: coleenp, ccheung, hseigel changeset 7776955a3a41 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7776955a3a41 author: zgu date: Thu Jan 31 17:08:48 2013 -0800 Merge changeset 6a55d9e0b5ea in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6a55d9e0b5ea author: twisti date: Wed Jan 09 15:37:23 2013 -0800 8005418: JSR 292: virtual dispatch bug in 292 impl Reviewed-by: jrose, kvn changeset c3a5ef31cb90 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c3a5ef31cb90 author: vlivanov date: Mon Jan 14 08:22:32 2013 -0800 8006095: C1: SIGSEGV w/ -XX:+LogCompilation Summary: avoid printing inlining decision when compilation fails Reviewed-by: kvn, roland changeset e34f4fe352e7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e34f4fe352e7 author: twisti date: Tue Jan 15 12:06:18 2013 -0800 8006109: test/java/util/AbstractSequentialList/AddAll.java fails: assert(rtype == ctype) failed: mismatched return types Reviewed-by: kvn changeset 0a066b1dfe02 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0a066b1dfe02 author: kvn date: Tue Jan 15 14:45:12 2013 -0800 8005821: C2: -XX:+PrintIntrinsics is broken Summary: Check all print inlining flags when processing inlining list. Reviewed-by: kvn, twisti Contributed-by: david.r.chase at oracle.com changeset b3686bbdb7d0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b3686bbdb7d0 author: kvn date: Wed Jan 16 14:55:18 2013 -0800 8006204: please JTREGify test/compiler/7190310/Test7190310.java Summary: Add proper jtreg annotations in the preceding comment, including an explicit timeout. Reviewed-by: kvn, twisti Contributed-by: david.r.chase at oracle.com changeset a7ffe4177db0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a7ffe4177db0 author: nloodin date: Thu Jan 31 16:07:24 2013 +0100 8007005: JEP 167 tracing gives negative time stamps for certain event fields Reviewed-by: brutisso Contributed-by: markus.gronlund at oracle.com changeset 88f46d208452 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=88f46d208452 author: amurillo date: Fri Feb 01 12:36:53 2013 -0800 Merge changeset 38b173289e57 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=38b173289e57 author: amurillo date: Fri Feb 01 12:36:54 2013 -0800 Added tag hs24-b32 for changeset 88f46d208452 changeset b4d1e151243f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b4d1e151243f author: katleman date: Fri Feb 01 10:25:23 2013 -0800 Added tag jdk7u13-b20 for changeset e0e52e35e0c5 changeset 423f3a828eb5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=423f3a828eb5 author: ewendeli date: Sun Feb 03 22:45:23 2013 +0100 Merge changeset 960d2e216955 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=960d2e216955 author: ewendeli date: Fri Feb 08 15:02:20 2013 +0100 Merge changeset fcd41f89bfa3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fcd41f89bfa3 author: katleman date: Wed Feb 13 17:56:44 2013 -0800 Added tag jdk7u14-b13 for changeset 38b173289e57 changeset 607dd575f464 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=607dd575f464 author: amurillo date: Fri Feb 01 12:49:39 2013 -0800 8007394: new hotspot build - hs24-b33 Reviewed-by: jcoomes changeset a47566645421 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a47566645421 author: rbackman date: Fri Jan 18 13:43:56 2013 +0100 8006563: Remove unused ProfileVM_lock Reviewed-by: dholmes, sla changeset 1689a0912ebe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1689a0912ebe author: ctornqvi date: Mon Feb 04 08:40:19 2013 +0100 8006413: Add utility classes for writing better multiprocess tests in jtreg Summary: Add a few utility classes to test/testlibrary to support multi process testing in jtreg tests. Added a test case for one of the utility classes. Also reviewed by Vitaly Davidovich Reviewed-by: brutisso, dholmes, vlivanov, nloodin, mgerdin changeset 77726262b76f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=77726262b76f author: ctornqvi date: Mon Feb 04 09:28:36 2013 -0500 Merge changeset fe6cd8dd4080 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fe6cd8dd4080 author: dcubed date: Tue Feb 05 14:58:50 2013 -0800 7182152: Instrumentation hot swap test incorrect monitor count Summary: Remove optimization that allowed for old and/or obsolete methods in an itable; add new tracing support using -XX:TraceRedefineClasses=16384. Reviewed-by: coleenp, acorn, sspitsyn changeset e4634e41d7a6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e4634e41d7a6 author: ctornqvi date: Tue Feb 05 19:28:24 2013 +0100 8005012: Add WB APIs to better support NMT testing Summary: Add WB API functions to enable better NMT testing Reviewed-by: dholmes, zgu changeset 2793d96a0acf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2793d96a0acf author: ctornqvi date: Tue Feb 05 22:01:07 2013 -0800 Merge changeset 322a24bc2e99 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=322a24bc2e99 author: ctornqvi date: Wed Feb 06 11:04:21 2013 +0100 8005013: Add NMT tests Summary: Add tests for the Native Memory Tracking feature, includes regression tests for 8005936 and 8004802 Reviewed-by: zgu, coleenp changeset 02b3e25dcc6b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=02b3e25dcc6b author: hseigel date: Wed Feb 06 08:26:05 2013 -0500 8006298: Specifying malformed options outputs non-sensical error Summary: Change error messages for malformed options so the messages are more useful. Reviewed-by: mikael, kvn, nloodin, coleenp changeset 87cf402c32e4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=87cf402c32e4 author: hseigel date: Wed Feb 06 08:41:14 2013 -0500 Merge changeset 62e7d37fe255 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=62e7d37fe255 author: hseigel date: Wed Feb 06 10:27:55 2013 -0500 Merge changeset 2ee1591f14d0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2ee1591f14d0 author: ctornqvi date: Wed Feb 06 16:27:51 2013 +0100 8000363: runtime/7158988/FieldMonitor.java fails with exception Summary: Removed unnecessary shell script in the test. Reviewed-by: coleenp, sla changeset 073e56606b4d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=073e56606b4d author: ctornqvi date: Wed Feb 06 11:20:07 2013 -0800 Merge changeset 6538f0c1bd05 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6538f0c1bd05 author: mgronlun date: Thu Feb 07 11:03:33 2013 +0100 8007134: Enable tracing asserts on missing ResourceMark Reviewed-by: dholmes, sla changeset dd4950f173a5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dd4950f173a5 author: johnc date: Fri Dec 21 11:45:34 2012 -0800 8001424: G1: Rename certain G1-specific flags Summary: Rename G1DefaultMinNewGenPercent, G1DefaultMaxNewGenPercent, and G1OldCSetRegionLiveThresholdPercent to G1NewSizePercent, G1MaxNewSizePercent, and G1MixedGCLiveThresholdPercent respectively. The previous names are no longer accepted. Reviewed-by: brutisso, ysr changeset c537391c6153 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c537391c6153 author: johnc date: Thu Feb 07 09:42:32 2013 -0800 8004816: G1: Kitchensink failures after marking stack changes Summary: Reset the marking state, including the mark stack overflow flag, in the event of a marking stack overflow during serial reference processing. Reviewed-by: jmasa changeset 2fe1685929bd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2fe1685929bd author: johnc date: Tue Jan 15 12:32:26 2013 -0800 8001425: G1: Change the default values for certain G1 specific flags Summary: Changes to default and ergonomic flag values recommended by performance team. Changes were also reviewed by Monica Beckwith . Reviewed-by: brutisso, huntch changeset c9dbfdff5abf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c9dbfdff5abf author: johnc date: Thu Jan 31 10:45:09 2013 -0800 8005875: G1: Kitchensink fails with ParallelGCThreads=0 Summary: Check that the concurrent marking worker gang exists in ConcurrentMark::print_worker_threads_on(). Changes were also reviewed by Vitaly Davidovich . Reviewed-by: brutisso changeset bf523388179f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bf523388179f author: brutisso date: Sun Feb 10 21:15:16 2013 +0100 8002144: G1: large number of evacuation failures may lead to large c heap memory usage Summary: Use Stack<> instead of GrowableArray to keep track of preserved marks. Also reviewed by vitalyd at gmail.com. Reviewed-by: johnc, jcoomes changeset b89e93583e0d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b89e93583e0d author: zgu date: Fri Feb 08 16:31:48 2013 -0500 8006691: Remove jvm_version_info.is_kernel_jvm field Summary: Removed is_kernel_jvm from jvm_version_info as Kernel VM has been deprecated Reviewed-by: mchung, coleenp changeset 61dbc09285c3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=61dbc09285c3 author: zgu date: Mon Feb 11 14:48:32 2013 -0500 Merge changeset 6545f607320f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6545f607320f author: roland date: Mon Feb 04 11:30:37 2013 +0100 8007144: Incremental inlining mistakes some call sites for dead ones and doesn't inline them Summary: wrong detection for dead call sites. Reviewed-by: kvn changeset 79d04b85fd0d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=79d04b85fd0d author: poonam date: Wed Feb 13 06:06:33 2013 -0800 8006837: Missing call to cr() when printing entry_point in nmethod, in os::print_location Reviewed-by: stefank, poonam, kvn Contributed-by: sergey.gabdurakhmanov at oracle.com changeset f016e64be7b4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f016e64be7b4 author: rbackman date: Wed Feb 13 09:46:19 2013 +0100 8008088: SA can hang the VM Reviewed-by: mgronlun, sla, dholmes changeset 78bef3bdb386 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=78bef3bdb386 author: poonam date: Thu Feb 14 04:40:23 2013 -0800 8006937: [obj|type]ArrayKlass::oop_print_on prints one line to tty instead of the provided output stream Reviewed-by: kvn, stefank, poonam Contributed-by: sergey.gabdurakhmanov at oracle.com changeset d05fee30c170 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d05fee30c170 author: ehelin date: Thu Feb 07 19:07:24 2013 +0100 8006954: GC Cause equals No GC for CMS background collection in the trace GC event Reviewed-by: stefank, brutisso changeset 38d1bd11fb2d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=38d1bd11fb2d author: ehelin date: Thu Feb 14 16:04:42 2013 +0100 Merge changeset 6a71d443bd0a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6a71d443bd0a author: sla date: Thu Feb 14 13:08:15 2013 +0100 8004840: Jstack seems to output unnecessary information in 7u9 Reviewed-by: dholmes, coleenp, sspitsyn, rbackman changeset 7ffe30a79778 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7ffe30a79778 author: mgronlun date: Thu Feb 14 18:47:28 2013 +0100 8008208: Event tracing for code cache subsystems can give wrong timestamps Reviewed-by: kvn, sla changeset 6a431dbf4a33 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6a431dbf4a33 author: amurillo date: Thu Feb 14 22:29:42 2013 -0800 Merge changeset 0310fb7a08b6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0310fb7a08b6 author: amurillo date: Thu Feb 14 22:29:43 2013 -0800 Added tag hs24-b33 for changeset 6a431dbf4a33 changeset e3d2c238e29c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e3d2c238e29c author: amurillo date: Tue Feb 19 15:21:59 2013 -0800 Merge changeset be57a8d7a1a7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be57a8d7a1a7 author: katleman date: Tue Jan 29 14:14:42 2013 -0800 Added tag jdk7u13-b10 for changeset e0e52e35e0c5 changeset 1b40559b91cb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1b40559b91cb author: katleman date: Fri Feb 01 10:31:35 2013 -0800 Added tag jdk7u13-b30 for changeset be57a8d7a1a7 changeset 5fbe0cae3a2a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5fbe0cae3a2a author: ewendeli date: Fri Feb 01 23:28:04 2013 +0100 Merge changeset 30d72c9abb56 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=30d72c9abb56 author: katleman date: Thu Feb 07 14:17:46 2013 -0800 Added tag jdk7u15-b01 for changeset 5fbe0cae3a2a changeset 221c64550c5b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=221c64550c5b author: katleman date: Fri Feb 08 10:46:26 2013 -0800 Added tag jdk7u15-b02 for changeset 30d72c9abb56 changeset 5b3a2f8eb010 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5b3a2f8eb010 author: ewendeli date: Wed Feb 13 19:48:44 2013 +0100 Merge changeset aed229ba0679 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aed229ba0679 author: ewendeli date: Wed Feb 20 19:49:38 2013 +0100 Merge changeset 5b55cef461b0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5b55cef461b0 author: katleman date: Wed Feb 13 18:19:21 2013 -0800 Added tag jdk7u15-b30 for changeset 221c64550c5b changeset 53ab22d4f44c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=53ab22d4f44c author: katleman date: Mon Feb 18 12:09:23 2013 -0800 Added tag jdk7u15-b03 for changeset 5b55cef461b0 changeset d2b587401182 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d2b587401182 author: katleman date: Mon Feb 18 12:28:49 2013 -0800 Added tag jdk7u15-b32 for changeset 34a7b6dda06e changeset a4dfda7a2655 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a4dfda7a2655 author: katleman date: Mon Feb 18 12:42:19 2013 -0800 Merge changeset 0d82bf449a61 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0d82bf449a61 author: katleman date: Tue Feb 26 12:41:47 2013 -0800 Added tag jdk7u17-b01 for changeset a4dfda7a2655 changeset 7b357c079370 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7b357c079370 author: katleman date: Fri Mar 01 11:55:17 2013 -0800 Added tag jdk7u17-b02 for changeset 0d82bf449a61 changeset 195931672178 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=195931672178 author: coffeys date: Sat Mar 02 17:24:15 2013 +0000 Merge changeset 375a8c57a7f0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=375a8c57a7f0 author: katleman date: Wed Feb 27 16:51:50 2013 -0800 Added tag jdk7u14-b14 for changeset e3d2c238e29c changeset e8e195210ada in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e8e195210ada author: amurillo date: Tue Mar 05 14:02:38 2013 -0800 Merge changeset 2eb0b9e2a794 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2eb0b9e2a794 author: amurillo date: Thu Feb 14 22:38:53 2013 -0800 8008284: new hotspot build - hs24-b34 Reviewed-by: jcoomes changeset e403a79fc41a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e403a79fc41a author: sla date: Fri Feb 15 08:54:12 2013 +0100 8008102: SA on OS X does not stop the attached process Reviewed-by: dholmes, rbackman changeset 5624724e4454 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5624724e4454 author: sla date: Mon Feb 18 12:49:53 2013 +0100 8007779: os::die() on solaris should generate core file Reviewed-by: dholmes, rbackman changeset f82f0250456f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f82f0250456f author: brutisso date: Mon Feb 18 14:13:52 2013 +0100 8008382: Remove redundant use of Atomic::add(jlong, jlong *) in create_new_gc_id() Summary: Moving register_gc_start() in to the CMS VM operation makes sure that create_new_gc_id() is not called by multiple threads in parallel. This removes the need for atomics in create_new_gc_d(). Also, Atomic::add(jlong, jlong *) is unimplemented for ARM. Reviewed-by: stefank, dholmes, ehelin changeset 5e48fb5e9625 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5e48fb5e9625 author: poonam date: Tue Feb 19 16:03:07 2013 -0800 8006938: Change os::print_location to be more descriptive when a location is pointing into an object Reviewed-by: stefank, twisti, poonam Contributed-by: sergey.gabdurakhmanov at oracle.com changeset c8304f3d0a6c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c8304f3d0a6c author: neliasso date: Wed Feb 13 10:25:09 2013 +0100 8005772: Stubs report compile id -1 in phase events Summary: Use 0 to indicate id is NA, -1 for error or uninitalized Reviewed-by: kvn, twisti changeset bc34e24e0637 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bc34e24e0637 author: nloodin date: Wed Feb 20 11:24:18 2013 +0100 8007804: Need to be able to access Performance counter by name from JVM Reviewed-by: dholmes, sla, sspitsyn changeset eb911d21c6b1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=eb911d21c6b1 author: nloodin date: Wed Feb 20 03:58:10 2013 -0800 Merge changeset 4eca232ca0c6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4eca232ca0c6 author: nloodin date: Wed Feb 20 11:24:18 2013 +0100 8007804: Need to be able to access Performance counter by name from JVM Reviewed-by: dholmes, sla, sspitsyn changeset 32ff8194b6d4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=32ff8194b6d4 author: nloodin date: Wed Feb 20 06:25:56 2013 -0800 Merge changeset 9bf91e181464 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9bf91e181464 author: kvn date: Mon Feb 18 16:47:15 2013 -0800 8004867: VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob" Summary: Added few checks and early bailout from Superword optimization to avoid such cases in a future. Reviewed-by: roland, twisti changeset a398781bfe8b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a398781bfe8b author: zgu date: Thu Feb 21 07:50:48 2013 -0500 8008071: Crashed in promote_malloc_records() with Kitchensink after 19 days Summary: Added NULL pointer check for arena size record Reviewed-by: sspitsyn, dholmes changeset 606aa0fc3944 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=606aa0fc3944 author: mgronlun date: Mon Feb 25 10:21:50 2013 +0100 8007147: Trace event ExecuteVMOperation may get dangling pointer Reviewed-by: dholmes, sla changeset 6bd965cc1563 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6bd965cc1563 author: mgronlun date: Wed Feb 13 11:23:46 2013 +0100 8007312: null check signal semaphore in os::signal_notify windows Reviewed-by: dholmes, sla changeset a71f8a0deaf1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a71f8a0deaf1 author: nloodin date: Mon Feb 25 15:01:12 2013 +0100 8007085: EnableTracing prints garbage for Compilation: [Java Method Reviewed-by: coleenp, sla Contributed-by: markus.gronlund at oracle.com changeset 1273de7c42d4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1273de7c42d4 author: nloodin date: Mon Feb 25 14:44:52 2013 -0500 Merge changeset f38f66e78fb2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f38f66e78fb2 author: rbackman date: Mon Feb 18 10:22:56 2013 +0100 8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity Reviewed-by: kvn, sla changeset e8612dc1501b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e8612dc1501b author: poonam date: Thu Feb 21 23:58:05 2013 -0800 8008546: Wrong G1ConfidencePercent results in GUARANTEE(VARIANCE() > -1.0) FAILED Reviewed-by: brutisso, johnc Contributed-by: vladimir.kempik at oracle.com changeset d323b9b05997 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d323b9b05997 author: poonam date: Thu Feb 28 10:50:35 2013 +0000 Merge changeset 860ae068f4df in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=860ae068f4df author: amurillo date: Thu Feb 28 10:45:18 2013 -0800 Merge changeset 12619005c5e2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12619005c5e2 author: amurillo date: Thu Feb 28 10:45:19 2013 -0800 Added tag hs24-b34 for changeset 860ae068f4df changeset b1030375770f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1030375770f author: amurillo date: Tue Mar 05 14:10:19 2013 -0800 Merge changeset 018c2639921d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=018c2639921d author: katleman date: Thu Mar 07 11:08:26 2013 -0800 Added tag jdk7u14-b15 for changeset 12619005c5e2 changeset 0addb9ef7b4e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0addb9ef7b4e author: lana date: Mon Mar 11 14:48:37 2013 -0700 Merge changeset 90e4826656f8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=90e4826656f8 author: amurillo date: Thu Feb 28 11:15:56 2013 -0800 8009225: new hotspot build - hs24-b35 Reviewed-by: jcoomes changeset 1a726a0f001b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1a726a0f001b author: jwilhelm date: Thu Feb 28 23:30:14 2013 +0100 8008314: Unimplemented() Atomic::load breaks the applications Summary: jlong atomics isn't fully implemented on all 32-bit platforms so we try to avoid it. In this case the atomic add wasn't needed. Reviewed-by: dholmes, dlong changeset 4ddaaf331af4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4ddaaf331af4 author: jwilhelm date: Fri Mar 01 01:14:53 2013 +0100 Merge changeset ee712d4e3af6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ee712d4e3af6 author: jwilhelm date: Fri Mar 01 03:54:26 2013 +0100 Merge changeset a4debcca0fb9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a4debcca0fb9 author: johnc date: Mon Feb 04 13:24:57 2013 -0800 8001384: G1: assert(!is_null(v)) failed: narrow oop value can never be zero Summary: Flush any deferred card mark before a Java thread exits. Reviewed-by: brutisso, jmasa changeset f33d68f8b40e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f33d68f8b40e author: johnc date: Thu Feb 28 21:11:04 2013 -0800 Merge changeset 94227c0c6cf0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=94227c0c6cf0 author: dcubed date: Fri Mar 01 09:57:34 2013 -0800 6444286: Possible naked oop related to biased locking revocation safepoint in jni_exit() Summary: Add missing Handle. Reviewed-by: acorn, dholmes, dice, sspitsyn Contributed-by: karen.kinnear at oracle.com changeset 586fe6358916 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=586fe6358916 author: dcubed date: Fri Mar 01 09:57:58 2013 -0800 8004902: correctness fixes motivated by contended locking work (6607129) Summary: misc correctness fixes Reviewed-by: acorn, dholmes, dice, sspitsyn Contributed-by: dave.dice at oracle.com changeset 0930637d6520 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0930637d6520 author: dcubed date: Fri Mar 01 09:58:16 2013 -0800 8004903: VMThread::execute() calls Thread::check_for_valid_safepoint_state() on concurrent VM ops Summary: check_for_valid_safepoint_state() only applies to blocking VM ops Reviewed-by: acorn, dholmes, dice, sspitsyn Contributed-by: karen.kinnear at oracle.com changeset ce0cee0f0e00 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ce0cee0f0e00 author: bpittore date: Thu Feb 28 12:09:57 2013 -0500 8005722: Assert in c1_LIR.hpp incorrect wrt to number of register operands Summary: In LIR_OpVisitState::visit() the receiver operand is processed twice Reviewed-by: roland, vladidan changeset 69ff881ab627 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=69ff881ab627 author: jiangli date: Fri Mar 01 04:08:13 2013 -0800 Merge changeset 18c8cdc40cdf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=18c8cdc40cdf author: jiangli date: Fri Mar 01 13:33:21 2013 -0800 Merge changeset 331dc65d57d7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=331dc65d57d7 author: sla date: Fri Feb 08 14:27:04 2013 +0100 8005572: fatal error: acquiring lock JfrBuffer_lock/19 out of order with lock MethodData_lock/19 -- possible deadlock Reviewed-by: mgronlun, dholmes changeset be21f8a4d42c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be21f8a4d42c author: amurillo date: Thu Mar 07 12:01:18 2013 -0800 Merge changeset 53152f5f34c4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=53152f5f34c4 author: amurillo date: Thu Mar 07 12:01:19 2013 -0800 Added tag hs24-b35 for changeset be21f8a4d42c changeset 10e0043bda08 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=10e0043bda08 author: amurillo date: Tue Mar 12 13:05:53 2013 -0700 Merge changeset 55d0822d1370 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=55d0822d1370 author: katleman date: Wed Mar 13 17:17:57 2013 -0700 Added tag jdk7u14-b16 for changeset 10e0043bda08 changeset e532bbc127b1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e532bbc127b1 author: amurillo date: Thu Mar 07 12:45:07 2013 -0800 8009687: new hotspot build - hs24-b36 Reviewed-by: jcoomes changeset e41e48824311 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e41e48824311 author: jwilhelm date: Tue Mar 12 16:28:37 2013 +0100 8007003: ParNew sends the heap summary too early Summary: Send the event after the early exit Reviewed-by: ehelin, brutisso changeset ca064de1c4c6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ca064de1c4c6 author: kevinw date: Mon Mar 11 12:56:00 2013 +0000 8009723: CMS logs "concurrent mode failure" twice when using (disabling) -XX:-UseCMSCompactAtFullCollection Reviewed-by: jwilhelm, ehelin, brutisso changeset 739a10899202 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=739a10899202 author: kevinw date: Tue Mar 12 12:07:20 2013 -0700 Merge changeset 8a853c83f551 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8a853c83f551 author: neliasso date: Thu Dec 06 09:50:08 2012 +0100 8003934: Fix generation of malformed options to Projectcreator Summary: Makefile produces unmatched quotes due to nmake bug Reviewed-by: jwilhelm, brutisso changeset 7416b0a84e3c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7416b0a84e3c author: amurillo date: Thu Mar 14 10:40:43 2013 -0700 Merge changeset 61822da2b149 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=61822da2b149 author: amurillo date: Thu Mar 14 10:40:45 2013 -0700 Added tag hs24-b36 for changeset 7416b0a84e3c changeset 06db2de2922a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=06db2de2922a author: katleman date: Wed Mar 20 14:47:35 2013 -0700 Added tag jdk7u14-b17 for changeset 61822da2b149 changeset f3338eb19a6a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f3338eb19a6a author: amurillo date: Thu Mar 14 11:00:38 2013 -0700 8010103: new hotspot build - hs24-b37 Reviewed-by: jcoomes changeset e99b6a69b81d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e99b6a69b81d author: ehelin date: Mon Mar 18 12:29:19 2013 +0100 8009232: Improve stats gathering code for reference processor Reviewed-by: jwilhelm, brutisso changeset c49a43256225 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c49a43256225 author: ehelin date: Mon Mar 18 15:06:04 2013 +0100 8008918: Reference statistics events for the tracing framework Reviewed-by: jwilhelm, brutisso, tschatzl changeset 76451677d919 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=76451677d919 author: zgu date: Thu Mar 07 14:06:44 2013 -0500 8008257: NMT: assert(new_rec->is_allocation_record()) failed when running with shared memory option Summary: Corrected virtual memory recording and tagging code when large pages are used Reviewed-by: coleenp, ccheung changeset 893fd4dc2d3b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=893fd4dc2d3b author: zgu date: Mon Mar 18 10:21:11 2013 -0700 Merge changeset 0a5dbad3cd92 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0a5dbad3cd92 author: jwilhelm date: Tue Mar 19 18:32:16 2013 +0100 8010227: Remove promotion failed boolean from YC event Summary: Remove promotion failed boolean from YC event Reviewed-by: dholmes, brutisso changeset 47b5859d4634 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=47b5859d4634 author: jwilhelm date: Tue Mar 19 23:14:19 2013 +0100 8008790: Promotion failed tracing event for all GCs Summary: Implemented promotion failed event for ParNew and Serial GC Reviewed-by: brutisso, ehelin changeset 99d14be80708 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=99d14be80708 author: ctornqvi date: Wed Mar 20 17:07:09 2013 +0100 8010084: Race in runtime/NMT/BaselineWithParameter.java Summary: Added a waitFor() on the process Reviewed-by: mgerdin, sla, zgu changeset 5bcfc2ed94a5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5bcfc2ed94a5 author: ehelin date: Tue Mar 19 15:14:58 2013 +0100 8010289: PSParallelCompact::marking_phase should use instance GCTracer Reviewed-by: johnc, mgerdin, stefank changeset c5c01d4cd7d9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c5c01d4cd7d9 author: amurillo date: Thu Mar 21 11:12:14 2013 -0700 Merge changeset 72e4bc0bcbd2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=72e4bc0bcbd2 author: amurillo date: Thu Mar 21 11:12:15 2013 -0700 Added tag hs24-b37 for changeset c5c01d4cd7d9 changeset 52e13c42fab4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=52e13c42fab4 author: katleman date: Wed Mar 27 16:18:19 2013 -0700 Added tag jdk7u14-b18 for changeset 72e4bc0bcbd2 changeset 9e372c67c5eb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9e372c67c5eb author: amurillo date: Thu Mar 21 11:22:15 2013 -0700 8010497: new hotspot build - hs24-b38 Reviewed-by: jcoomes changeset 5967e5c9c7f0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5967e5c9c7f0 author: jwilhelm date: Mon Mar 25 15:19:40 2013 +0100 8009992: Prepare tracing of promotion failed for integration of evacuation failed Summary: Refactorisation to introduce CopyFaiedInfo that is used by PromotionFailedInfo and will be used by EvacuationFailedInfo as well Reviewed-by: ehelin, johnc, brutisso changeset bec5f1758368 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bec5f1758368 author: rbackman date: Thu Feb 28 09:45:57 2013 +0100 8008357: [sampling] assert(sender_blob->is_runtime_stub() || sender_blob->is_nmethod()) failed: Impossible call chain Reviewed-by: coleenp, sla changeset a1b2802cb232 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a1b2802cb232 author: zgu date: Wed Mar 27 14:48:22 2013 -0400 8009298: NMT: Special version of class loading/unloading with runThese stresses out NMT 8009777: NMT: add new NMT dcmd to control auto shutdown option Summary: Added diagnostic VM option and DCmd command to allow NMT stay alive under stress situation Reviewed-by: dcubed, coleenp changeset 399bb8104fea in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=399bb8104fea author: kvn date: Tue Jan 22 11:31:25 2013 -0800 8005055: pass outputStream to more opto debug routines Summary: pass the output stream to node->dump() and everything reachable from there Reviewed-by: kvn Contributed-by: goetz.lindenmaier at sap.com changeset c638b7564d34 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c638b7564d34 author: vlivanov date: Fri Feb 01 03:02:01 2013 -0800 8005439: no message about inline method if it specifed by CompileCommand Reviewed-by: kvn, vlivanov Contributed-by: Igor Ignatyev changeset c605c1bd2819 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c605c1bd2819 author: drchase date: Fri Jan 25 16:09:14 2013 -0800 8006500: compiler/8004741/Test8004741.java fails intermediately Summary: rewrote the test to be more reliable, add test for invalid size exception Reviewed-by: kvn changeset 19a6982e2d05 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=19a6982e2d05 author: mikael date: Mon Feb 04 10:28:39 2013 -0800 8007403: Incorrect format arguments in adlparse.cpp Reviewed-by: kvn, twisti changeset 9fdfc60415f1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9fdfc60415f1 author: vlivanov date: Tue Feb 05 08:25:51 2013 -0800 8006613: adding reason to made_not_compilable Reviewed-by: kvn, vlivanov Contributed-by: Igor Ignatyev changeset 1efffc8cd1e5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1efffc8cd1e5 author: drchase date: Wed Feb 06 11:33:49 2013 -0800 8006807: C2 crash due to out of bounds array access in Parse::do_multianewarray Summary: check ndimensions before accessing length[i] element Reviewed-by: kvn Contributed-by: volker.simonis at gmail.com changeset c56c6ba9c1d2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c56c6ba9c1d2 author: kvn date: Fri Feb 08 15:07:17 2013 -0800 8007708: compiler/6855215 assert(VM_Version::supports_sse4_2()) Summary: Added missing UseSSE42 check. Reviewed-by: roland, twisti changeset 71a67ff5e673 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=71a67ff5e673 author: drchase date: Sat Feb 09 12:55:09 2013 -0800 8007402: Code cleanup to remove Parfait false positive Summary: add array access range check Reviewed-by: kvn changeset 1c0be805666b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1c0be805666b author: kmo date: Sun Feb 10 22:35:38 2013 -0800 8006430: TraceTypeProfile is a product flag while it should be a diagnostic flag Summary: make sure all diagnostic and experimental flag kinds are checked in Flag::is_unlocked() Reviewed-by: kvn changeset 36b32e7ee4f7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=36b32e7ee4f7 author: roland date: Tue Feb 12 12:56:11 2013 +0100 7197327: 40% regression on 8 b41 comp 8 b40 on specjvm2008.mpegaudio on oob Summary: Add support for expensive nodes. Reviewed-by: kvn changeset 3eea57ac42f2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3eea57ac42f2 author: kmo date: Tue Feb 12 07:39:42 2013 -0800 8002169: TEST_BUG: compiler/7009359/Test7009359.java sometimes times out Summary: make the test less prone to timeout by reducing the amount of iteration and allowing main to be compiled Reviewed-by: jrose changeset 95f5d78a4bc1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=95f5d78a4bc1 author: roland date: Mon Feb 18 09:06:24 2013 +0100 8007959: Use expensive node logic for more math nodes Summary: use expensive node logic for other more math nodes. Reviewed-by: kvn changeset 53dd0089983e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=53dd0089983e author: drchase date: Mon Feb 18 14:29:16 2013 -0800 8008180: Several tests in compiler/5091921 need more time to run Summary: Added an explicit timeouts. Reviewed-by: kvn, twisti changeset b1c0da991402 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1c0da991402 author: drchase date: Mon Feb 18 15:08:39 2013 -0800 7102300: performance warnings cause results diff failure in Test6890943 Summary: Strip lines matching the performance warning from the output before diff. Reviewed-by: kvn changeset be30099fbdec in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be30099fbdec author: roland date: Mon Feb 25 14:13:04 2013 +0100 8007294: ReduceFieldZeroing doesn't check for dependent load and can lead to incorrect execution Summary: InitializeNode::can_capture_store() must check that the captured store doesn't overwrite a memory location that is loaded before the store. Reviewed-by: kvn changeset 2faf0eecd402 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2faf0eecd402 author: roland date: Tue Feb 26 12:18:30 2013 +0100 8007722: C2: "assert(tp->base() != Type::AnyPtr) failed: not a bare pointer" at machnode.cpp:376 Summary: GetAndSetP's MachNode should capture bottom type. Reviewed-by: kvn changeset bb4db1d23cba in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bb4db1d23cba author: drchase date: Tue Feb 26 15:38:24 2013 -0800 8007776: Test6852078.java timeouts Summary: if more than 100 seconds and more than 100 iterations have both passed, then exit is allowed. Reviewed-by: kvn changeset 194355f552ff in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=194355f552ff author: iignatyev date: Wed Feb 27 05:58:48 2013 -0800 8007439: C2: adding successful message of inlining Reviewed-by: kvn, vlivanov changeset abc47675c9e2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=abc47675c9e2 author: kvn date: Wed Mar 06 12:25:57 2013 -0800 8009472: Print additional information for 8004640 failure Summary: dump nodes and types in 8004640 case. Reviewed-by: roland changeset 979e7c5df753 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=979e7c5df753 author: roland date: Wed Mar 13 09:44:45 2013 +0100 8009761: Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates Summary: deoptimization doesn't set up callee frames so that they restore caller frames correctly. Reviewed-by: kvn changeset e388232ba684 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e388232ba684 author: roland date: Mon Mar 18 13:19:06 2013 +0100 8008555: Debugging code in compiled method sometimes leaks memory Summary: support for strings that have same life-time as code that uses them. Reviewed-by: kvn, twisti changeset 539375f92462 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=539375f92462 author: bharadwaj date: Fri Mar 22 07:58:55 2013 -0700 8009539: JVM crash when run lambda testng tests Summary: Ensure class pointer is non-null before dereferencing it to check if it is loaded. Reviewed-by: kvn changeset 795212ad5b1b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=795212ad5b1b author: amurillo date: Thu Mar 28 10:46:36 2013 -0700 Merge changeset 5e622bdc713e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5e622bdc713e author: amurillo date: Thu Mar 28 10:46:36 2013 -0700 Added tag hs24-b38 for changeset 795212ad5b1b changeset 29f263e4d6a7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=29f263e4d6a7 author: andrew date: Wed Apr 03 14:17:10 2013 +0100 Merge jdk7u14-b17 changeset b9bbe418db87 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b9bbe418db87 author: andrew date: Thu Apr 04 19:11:59 2013 +0100 Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. changeset 781f641e8c9b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=781f641e8c9b author: andrew date: Wed Apr 17 21:26:58 2013 +0100 PR1378: Add AArch64 support to Zero changeset 94e094f46104 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=94e094f46104 author: katleman date: Wed Apr 03 15:15:50 2013 -0700 Added tag jdk7u14-b19 for changeset 5e622bdc713e changeset c23596bfe3b8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c23596bfe3b8 author: katleman date: Fri Apr 05 09:10:28 2013 -0700 Added tag jdk7u14-b19 for changeset 94e094f46104 changeset 0e7cb4f6dcb7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0e7cb4f6dcb7 author: katleman date: Wed Apr 10 10:29:50 2013 -0700 Added tag jdk7u14-b20 for changeset c23596bfe3b8 changeset 7c8d60d568ba in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c8d60d568ba author: amurillo date: Thu Mar 28 11:07:37 2013 -0700 8011021: new hotspot build - hs24-b39 Reviewed-by: jcoomes changeset 19c1e132e9ee in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=19c1e132e9ee author: iklam date: Thu Mar 28 19:59:36 2013 -0700 7107135: Stack guard pages are no more protected after loading a shared library with executable stack Summary: Detect the execstack attribute of the loaded library and attempt to fix the stack guard using Safepoint op. Reviewed-by: dholmes, zgu changeset aea9eb48dafd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aea9eb48dafd author: zgu date: Fri Mar 29 10:02:52 2013 -0400 8010651: create.bat still builds the kernel Summary: Remove old kernel build targets and VS C++ projects created by create.bat on Windows Reviewed-by: coleenp, sla changeset cd85890e1926 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cd85890e1926 author: zgu date: Fri Mar 29 07:31:53 2013 -0700 Merge changeset ad6f90552a1c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ad6f90552a1c author: zgu date: Fri Mar 29 10:04:01 2013 -0700 Merge changeset 4a6facbffc09 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4a6facbffc09 author: ehelin date: Thu Mar 21 16:15:57 2013 +0100 8010294: Refactor HeapInspection to make it more reusable Reviewed-by: jwilhelm, brutisso, mgerdin changeset c0b1bfa39232 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0b1bfa39232 author: kvn date: Tue Mar 26 12:55:26 2013 -0700 8004640: C2 assert failure in memnode.cpp: NULL+offs not RAW address Summary: always transform AddP nodes in IdealKit by calling _gvn.transform(). Reviewed-by: roland, twisti changeset f842ea9b8830 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f842ea9b8830 author: ehelin date: Wed Apr 03 17:49:23 2013 +0200 8008737: The trace event vm/gc/heap/summary is missing for CMS Reviewed-by: mgerdin, brutisso changeset abeffed9e41a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=abeffed9e41a author: roland date: Wed Mar 06 10:28:38 2013 +0100 8009460: C2compiler crash in machnode::in_regmask(unsigned int) Summary: 7121140 may not correctly break the Allocate -> MemBarStoreStore link Reviewed-by: kvn changeset 63c3f7805426 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=63c3f7805426 author: mikael date: Tue Feb 26 08:54:03 2013 -0800 8008081: Print outs do not have matching arguments Summary: Corrected formatted prints to have matching arguments, removed dead print_frame_layout function Reviewed-by: sla, dholmes changeset 03ba6eb06186 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=03ba6eb06186 author: mgronlun date: Fri Apr 05 08:53:29 2013 +0200 8011400: missing define OPENJDK for windows builds Reviewed-by: dcubed, sla changeset 5c44c9466675 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5c44c9466675 author: kevinw date: Fri Apr 05 11:06:55 2013 +0100 8008917: CMS: Concurrent mode failure tracing event Reviewed-by: jwilhelm, ehelin, brutisso changeset d6cf0e0eee29 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d6cf0e0eee29 author: amurillo date: Fri Apr 05 10:32:51 2013 -0700 Merge changeset 21b442e8b756 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=21b442e8b756 author: amurillo date: Fri Apr 05 10:32:52 2013 -0700 Added tag hs24-b39 for changeset d6cf0e0eee29 changeset 6477999efb5f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6477999efb5f author: amurillo date: Fri Apr 05 10:44:24 2013 -0700 8011583: new hotspot build - hs24-b40 Reviewed-by: jcoomes changeset c7b481c7e5d9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c7b481c7e5d9 author: kevinw date: Wed Feb 27 22:40:14 2013 +0000 7178741: SA: jstack -m produce UnalignedAddressException in output (Linux) Reviewed-by: poonam, sla changeset 97f2e3ceb67c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=97f2e3ceb67c author: ehelin date: Wed Apr 10 09:43:53 2013 +0200 8010916: Add tenuring threshold to young garbage collection events Reviewed-by: jwilhelm, brutisso changeset 6f73a3a47ba4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6f73a3a47ba4 author: ehelin date: Thu Apr 11 00:02:45 2013 +0200 8011699: CMS: assert(_shared_gc_info.id() != SharedGCInfo::UNSET_GCID) failed: GC not started? Reviewed-by: stefank, mgerdin changeset 7c942384867f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c942384867f author: ehelin date: Wed Apr 10 10:40:05 2013 +0200 8008920: Tracing events for heap statistics Reviewed-by: jwilhelm, mgerdin, brutisso changeset 8185d3f3d16e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8185d3f3d16e author: mgerdin date: Wed Apr 10 17:30:29 2013 +0200 8006753: fix failed for JDK-8002415 White box testing API for HotSpot Summary: Modify WhiteBoxAPI to use interface classes from test/testlibrary instead, add ClassFileInstaller to resolve the boot class path issue Reviewed-by: ctornqvi, dsamersoff, coleenp, kvn changeset d67b08a0b6c0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d67b08a0b6c0 author: neliasso date: Mon Mar 25 14:03:21 2013 +0100 8007701: Hotspot trace allocation events Reviewed-by: brutisso, ehelin, egahlin changeset d44caacedf85 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d44caacedf85 author: neliasso date: Thu Apr 11 04:25:49 2013 -0400 Merge changeset e40faea12793 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e40faea12793 author: neliasso date: Thu Apr 11 10:10:27 2013 -0400 Merge changeset 7097a4e746c1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7097a4e746c1 author: jwilhelm date: Thu Apr 11 13:43:31 2013 +0200 8009032: Implement evacuation info event Summary: EvacuationFailedInfo event implemented for G1 Reviewed-by: brutisso, johnc changeset 3295faa5b5cc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3295faa5b5cc author: amurillo date: Thu Apr 11 22:44:41 2013 -0700 Merge changeset 3e88170d8be2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3e88170d8be2 author: amurillo date: Thu Apr 11 22:44:42 2013 -0700 Added tag hs24-b40 for changeset 3295faa5b5cc changeset 315b54ddd99f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=315b54ddd99f author: katleman date: Thu Feb 07 14:20:05 2013 -0800 Added tag jdk7u21-b01 for changeset be57a8d7a1a7 changeset 5119d89c7cc8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5119d89c7cc8 author: ewendeli date: Mon Feb 11 21:07:12 2013 +0100 Merge changeset ad14169fb640 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ad14169fb640 author: katleman date: Thu Feb 14 14:11:05 2013 -0800 Added tag jdk7u21-b02 for changeset 5119d89c7cc8 changeset 6d21458b9459 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6d21458b9459 author: katleman date: Tue Feb 19 17:13:36 2013 -0800 Added tag jdk7u21-b03 for changeset ad14169fb640 changeset c954aab38a7f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c954aab38a7f author: twisti date: Mon Feb 25 11:54:35 2013 -0800 8004336: Better handling of method handle intrinsic frames Reviewed-by: kvn, jrose, ahgross changeset 762ad80022d6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=762ad80022d6 author: katleman date: Tue Feb 26 12:44:58 2013 -0800 Added tag jdk7u21-b04 for changeset c954aab38a7f changeset 0785ff7bd741 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0785ff7bd741 author: dcubed date: Thu Feb 28 09:50:01 2013 -0800 7182152: Instrumentation hot swap test incorrect monitor count Summary: Remove optimization that allowed for old and/or obsolete methods in an itable; add new tracing support using -XX:TraceRedefineClasses=16384. Reviewed-by: coleenp, acorn, sspitsyn changeset e629a7d0b760 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e629a7d0b760 author: brutisso date: Thu Feb 28 13:30:30 2013 +0100 7173959: Jvm crashed during coherence exabus (tmb) testing Summary: Mapping of aligned memory needs to be MT safe. Also reviewed by: vitalyd at gmail.com Reviewed-by: dholmes, coleenp, zgu changeset bc3dc90c4e9e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bc3dc90c4e9e author: coffeys date: Mon Mar 04 19:04:44 2013 +0000 8009399: Bump the hsx build number for APRIL CPU Reviewed-by: asaha changeset ea83168282c8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ea83168282c8 author: katleman date: Tue Oct 16 14:54:41 2012 -0700 Added tag jdk7u9-b31 for changeset 8eaa45ed5f80 changeset f493d194db95 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f493d194db95 author: katleman date: Wed Oct 31 10:10:54 2012 -0700 Added tag jdk7u9-b32 for changeset ea83168282c8 changeset 63e9e76073fb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=63e9e76073fb author: asaha date: Tue Dec 04 11:41:17 2012 -0800 Merge changeset 07f7daeb2610 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=07f7daeb2610 author: asaha date: Wed Dec 05 15:24:40 2012 -0800 Merge changeset c49afcd4b4d1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c49afcd4b4d1 author: katleman date: Fri Dec 07 08:19:06 2012 -0800 Added tag jdk7u10-b31 for changeset 07f7daeb2610 changeset 06b5c3f663b8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=06b5c3f663b8 author: ewendeli date: Tue Jan 15 08:21:51 2013 +0100 Merge changeset abb5b690122c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=abb5b690122c author: katleman date: Wed Jan 16 13:57:06 2013 -0800 Added tag jdk7u11-b32 for changeset 06b5c3f663b8 changeset 3ba8b2780ac9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3ba8b2780ac9 author: katleman date: Tue Jan 29 14:10:31 2013 -0800 Added tag jdk7u11-b33 for changeset abb5b690122c changeset ef00fdf6f6d3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ef00fdf6f6d3 author: asaha date: Fri Feb 08 19:11:16 2013 -0800 Merge changeset 0b905a04f573 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0b905a04f573 author: asaha date: Mon Feb 11 11:14:34 2013 -0800 Merge changeset 7b91b50ff761 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7b91b50ff761 author: katleman date: Tue Feb 12 12:32:41 2013 -0800 Added tag jdk7u15-b31 for changeset 0b905a04f573 changeset 8b349f332a66 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8b349f332a66 author: asaha date: Thu Feb 14 13:18:59 2013 -0800 Merge changeset b2208bb3e775 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b2208bb3e775 author: katleman date: Tue Feb 19 12:02:59 2013 -0800 Added tag jdk7u15-b33 for changeset 8b349f332a66 changeset c91d130b040f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c91d130b040f author: asaha date: Fri Mar 01 16:07:51 2013 -0800 Merge changeset 73894d544edd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=73894d544edd author: cl date: Sat Mar 02 09:47:37 2013 -0800 Added tag jdk7u17-b30 for changeset 7b357c079370 changeset 22b6fd616cfe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=22b6fd616cfe author: asaha date: Sat Mar 02 14:35:06 2013 -0800 Merge changeset 8e04b403f580 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8e04b403f580 author: cl date: Sat Mar 02 18:54:42 2013 -0800 Added tag jdk7u17-b31 for changeset 22b6fd616cfe changeset ee98e8e35da2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ee98e8e35da2 author: asaha date: Mon Mar 04 11:40:45 2013 -0800 Merge changeset 0e8e9d990d91 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0e8e9d990d91 author: asaha date: Mon Mar 04 12:34:25 2013 -0800 Merge changeset ae7be9b23555 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ae7be9b23555 author: katleman date: Tue Mar 05 16:45:23 2013 -0800 Added tag jdk7u21-b05 for changeset 0e8e9d990d91 changeset beeb3d6b76f0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=beeb3d6b76f0 author: poonam date: Wed Mar 06 16:30:38 2013 -0800 8006309: More reliable control panel operation Summary: Added a comment in the dead Kernel code Reviewed-by: ahgross, sla, coleenp changeset 99d7e552509d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=99d7e552509d author: katleman date: Tue Mar 12 14:44:05 2013 -0700 Added tag jdk7u21-b06 for changeset beeb3d6b76f0 changeset 663b5c744e82 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=663b5c744e82 author: kvn date: Fri Mar 15 09:33:37 2013 -0700 8009699: Methodhandle lookup Reviewed-by: ahgross, jrose, jdn changeset 87e9bb582938 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=87e9bb582938 author: katleman date: Tue Mar 19 14:33:31 2013 -0700 Added tag jdk7u21-b07 for changeset 663b5c744e82 changeset 1f195ee7856a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1f195ee7856a author: katleman date: Wed Mar 20 14:47:17 2013 -0700 Added tag jdk7u21-b08 for changeset 87e9bb582938 changeset d4a4c2bd389a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d4a4c2bd389a author: katleman date: Tue Mar 26 15:00:17 2013 -0700 Added tag jdk7u21-b09 for changeset 1f195ee7856a changeset d07dafb51e1d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d07dafb51e1d author: katleman date: Sun Mar 31 03:46:36 2013 -0700 Added tag jdk7u21-b10 for changeset d4a4c2bd389a changeset a977dedec81c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a977dedec81c author: katleman date: Thu Apr 04 15:48:08 2013 -0700 Added tag jdk7u21-b11 for changeset d07dafb51e1d changeset c5e4585a045f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c5e4585a045f author: katleman date: Fri Apr 05 12:48:45 2013 -0700 Added tag jdk7u21-b30 for changeset a977dedec81c changeset 7d126c8298e7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7d126c8298e7 author: katleman date: Sun Apr 07 16:34:50 2013 -0700 Added tag jdk7u21-b12 for changeset c5e4585a045f changeset 5db4eda6f534 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5db4eda6f534 author: coffeys date: Tue Apr 16 11:49:49 2013 +0100 Merge changeset 7f17b162e053 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7f17b162e053 author: coffeys date: Wed Apr 17 09:40:38 2013 +0100 Merge changeset 2fc73bd48efa in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2fc73bd48efa author: andrew date: Tue Apr 23 23:15:10 2013 +0100 Merge jdk7u14-b20 changeset 25fe5bf8dee3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=25fe5bf8dee3 author: andrew date: Wed May 22 16:11:17 2013 +0100 Remove jcheck changeset ed247f9fb4fe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ed247f9fb4fe author: andrew date: Wed May 22 17:02:41 2013 +0100 Merge with HEAD diffstat: .hgtags | 66 + .jcheck/conf | 2 - agent/src/os/bsd/MacosxDebuggerLocal.m | 94 +- agent/src/os/bsd/libproc_impl.c | 10 +- agent/src/os/bsd/libproc_impl.h | 3 +- agent/src/os/bsd/ps_proc.c | 86 +- agent/src/os/linux/libproc_impl.c | 10 +- agent/src/os/linux/libproc_impl.h | 3 +- agent/src/os/linux/ps_proc.c | 96 +- agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java | 7 +- agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java | 7 +- agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java | 6 +- agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java | 1 - agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java | 1 - agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java | 1 - make/Makefile | 66 +- make/bsd/makefiles/buildtree.make | 14 +- make/bsd/makefiles/defs.make | 2 - make/bsd/makefiles/dtrace.make | 12 +- make/bsd/makefiles/top.make | 6 +- make/bsd/makefiles/trace.make | 121 + make/bsd/makefiles/vm.make | 25 +- make/bsd/makefiles/wb.make | 46 - make/defs.make | 14 +- make/hotspot_version | 6 +- make/jprt.properties | 48 +- make/linux/makefiles/buildtree.make | 16 +- make/linux/makefiles/defs.make | 2 - make/linux/makefiles/gcc.make | 3 - make/linux/makefiles/top.make | 6 +- make/linux/makefiles/trace.make | 120 + make/linux/makefiles/vm.make | 30 +- make/linux/makefiles/wb.make | 46 - make/linux/makefiles/zero.make | 4 + make/solaris/Makefile | 20 +- make/solaris/makefiles/buildtree.make | 16 +- make/solaris/makefiles/defs.make | 2 - make/solaris/makefiles/dtrace.make | 12 +- make/solaris/makefiles/kernel.make | 32 - make/solaris/makefiles/top.make | 8 +- make/solaris/makefiles/trace.make | 120 + make/solaris/makefiles/vm.make | 23 +- make/solaris/makefiles/wb.make | 46 - make/windows/build.bat | 5 +- make/windows/build.make | 15 +- make/windows/create.bat | 4 +- make/windows/create_obj_files.sh | 15 +- make/windows/makefiles/compile.make | 7 - make/windows/makefiles/debug.make | 3 +- make/windows/makefiles/defs.make | 22 +- make/windows/makefiles/fastdebug.make | 3 +- make/windows/makefiles/generated.make | 8 +- make/windows/makefiles/product.make | 11 +- make/windows/makefiles/projectcreator.make | 77 +- make/windows/makefiles/trace.make | 121 + make/windows/makefiles/vm.make | 32 +- make/windows/makefiles/wb.make | 54 - make/windows/projectfiles/common/Makefile | 45 +- make/windows/projectfiles/kernel/Makefile | 27 - make/windows/projectfiles/kernel/vm.def | 7 - make/windows/projectfiles/kernel/vm.dsw | 29 - src/cpu/sparc/vm/assembler_sparc.cpp | 38 +- src/cpu/sparc/vm/cppInterpreter_sparc.cpp | 3 +- src/cpu/sparc/vm/frame_sparc.cpp | 14 +- src/cpu/sparc/vm/sparc.ad | 16 +- src/cpu/sparc/vm/templateInterpreter_sparc.cpp | 12 +- src/cpu/x86/vm/assembler_x86.cpp | 335 +- src/cpu/x86/vm/assembler_x86.hpp | 22 +- src/cpu/x86/vm/cppInterpreter_x86.cpp | 3 +- src/cpu/x86/vm/frame_x86.cpp | 77 +- src/cpu/x86/vm/globals_x86.hpp | 3 + src/cpu/x86/vm/stubGenerator_x86_32.cpp | 240 +- src/cpu/x86/vm/stubGenerator_x86_64.cpp | 448 +- src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 3 +- src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 3 +- src/cpu/x86/vm/vm_version_x86.cpp | 25 +- src/cpu/x86/vm/vm_version_x86.hpp | 11 +- src/cpu/x86/vm/x86_32.ad | 25 +- src/cpu/x86/vm/x86_64.ad | 25 +- src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 4 +- src/cpu/zero/vm/cppInterpreter_zero.cpp | 7 +- src/cpu/zero/vm/cppInterpreter_zero.hpp | 4 +- src/cpu/zero/vm/frame_zero.cpp | 4 +- src/cpu/zero/vm/frame_zero.inline.hpp | 4 +- src/cpu/zero/vm/methodHandles_zero.cpp | 4 +- src/cpu/zero/vm/methodHandles_zero.hpp | 4 +- src/cpu/zero/vm/register_zero.hpp | 4 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 6 +- src/os/bsd/vm/osThread_bsd.hpp | 2 +- src/os/bsd/vm/os_bsd.cpp | 336 +- src/os/bsd/vm/os_bsd.hpp | 41 - src/os/linux/vm/globals_linux.hpp | 5 +- src/os/linux/vm/osThread_linux.hpp | 2 +- src/os/linux/vm/os_linux.cpp | 465 ++- src/os/linux/vm/os_linux.hpp | 45 +- src/os/solaris/vm/osThread_solaris.cpp | 227 +- src/os/solaris/vm/osThread_solaris.hpp | 56 +- src/os/solaris/vm/os_share_solaris.hpp | 22 - src/os/solaris/vm/os_solaris.cpp | 251 +- src/os/solaris/vm/os_solaris.hpp | 1 + src/os/windows/vm/decoder_windows.cpp | 78 +- src/os/windows/vm/decoder_windows.hpp | 2 + src/os/windows/vm/os_windows.cpp | 159 +- src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp | 10 +- src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp | 7 + src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 5 + src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 5 + src/os_cpu/linux_x86/vm/thread_linux_x86.cpp | 9 +- src/os_cpu/linux_x86/vm/thread_linux_x86.hpp | 5 + src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp | 30 +- src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp | 12 +- src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp | 5 + src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp | 30 +- src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp | 11 +- src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp | 6 + src/os_cpu/windows_x86/vm/thread_windows_x86.cpp | 12 + src/os_cpu/windows_x86/vm/thread_windows_x86.hpp | 6 + src/share/tools/LogCompilation/README | 6 +- src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java | 11 +- src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java | 10 +- src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java | 23 +- src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java | 21 +- src/share/tools/ProjectCreator/BuildConfig.java | 32 +- src/share/tools/ProjectCreator/WinGammaPlatform.java | 6 - src/share/tools/whitebox/sun/hotspot/WhiteBox.java | 72 - src/share/tools/whitebox/sun/hotspot/parser/DiagnosticCommand.java | 43 - src/share/vm/adlc/adlparse.cpp | 54 +- src/share/vm/adlc/formssel.cpp | 5 +- src/share/vm/asm/assembler.cpp | 10 +- src/share/vm/asm/assembler.hpp | 2 + src/share/vm/asm/codeBuffer.cpp | 128 +- src/share/vm/asm/codeBuffer.hpp | 25 +- src/share/vm/c1/c1_Compilation.cpp | 8 + src/share/vm/c1/c1_FrameMap.cpp | 21 - src/share/vm/c1/c1_FrameMap.hpp | 2 - src/share/vm/c1/c1_GraphBuilder.cpp | 32 +- src/share/vm/c1/c1_LIR.cpp | 2 +- src/share/vm/ci/bcEscapeAnalyzer.cpp | 2 +- src/share/vm/ci/ciField.cpp | 4 +- src/share/vm/ci/ciMethod.cpp | 41 +- src/share/vm/ci/ciMethod.hpp | 8 +- src/share/vm/ci/ciSignature.hpp | 6 +- src/share/vm/ci/ciType.cpp | 16 +- src/share/vm/ci/ciType.hpp | 1 + src/share/vm/classfile/classFileParser.cpp | 1 + src/share/vm/classfile/javaClasses.cpp | 5 +- src/share/vm/classfile/systemDictionary.cpp | 86 +- src/share/vm/classfile/systemDictionary.hpp | 6 +- src/share/vm/classfile/vmSymbols.hpp | 3 +- src/share/vm/code/codeBlob.cpp | 2 +- src/share/vm/code/codeBlob.hpp | 8 +- src/share/vm/code/codeCache.cpp | 21 +- src/share/vm/code/codeCache.hpp | 7 + src/share/vm/code/icBuffer.hpp | 2 +- src/share/vm/code/stubs.cpp | 16 +- src/share/vm/code/stubs.hpp | 10 +- src/share/vm/compiler/compileBroker.cpp | 33 +- src/share/vm/compiler/compileBroker.hpp | 17 +- src/share/vm/compiler/compilerOracle.cpp | 1 + src/share/vm/compiler/disassembler.cpp | 12 +- src/share/vm/compiler/disassembler.hpp | 2 +- src/share/vm/compiler/oopMap.cpp | 8 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 154 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp | 23 + src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp | 16 + src/share/vm/gc_implementation/g1/collectionSetChooser.cpp | 2 +- src/share/vm/gc_implementation/g1/concurrentMark.cpp | 88 +- src/share/vm/gc_implementation/g1/concurrentMark.hpp | 44 +- src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp | 20 +- src/share/vm/gc_implementation/g1/evacuationInfo.hpp | 81 + src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 220 +- src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp | 44 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 28 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 21 +- src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 25 +- src/share/vm/gc_implementation/g1/g1MarkSweep.hpp | 3 + src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp | 1 + src/share/vm/gc_implementation/g1/g1YCTypes.hpp | 51 + src/share/vm/gc_implementation/g1/g1_globals.hpp | 27 +- src/share/vm/gc_implementation/g1/vm_operations_g1.cpp | 4 +- src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp | 2 + src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 112 +- src/share/vm/gc_implementation/parNew/parNewGeneration.hpp | 21 +- src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 39 + src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 10 +- src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp | 30 +- src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp | 37 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 75 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp | 9 +- src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp | 16 +- src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp | 8 +- src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 75 +- src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp | 7 +- src/share/vm/gc_implementation/shared/copyFailedInfo.hpp | 72 + src/share/vm/gc_implementation/shared/gcHeapSummary.hpp | 126 + src/share/vm/gc_implementation/shared/gcTimer.cpp | 374 ++ src/share/vm/gc_implementation/shared/gcTimer.hpp | 195 + src/share/vm/gc_implementation/shared/gcTrace.cpp | 189 + src/share/vm/gc_implementation/shared/gcTrace.hpp | 235 + src/share/vm/gc_implementation/shared/gcTraceSend.cpp | 290 + src/share/vm/gc_implementation/shared/gcTraceTime.cpp | 90 + src/share/vm/gc_implementation/shared/gcTraceTime.hpp | 44 + src/share/vm/gc_implementation/shared/gcWhen.hpp | 48 + src/share/vm/gc_implementation/shared/markSweep.cpp | 9 +- src/share/vm/gc_implementation/shared/markSweep.hpp | 8 + src/share/vm/gc_implementation/shared/vmGCOperations.cpp | 38 +- src/share/vm/gc_implementation/shared/vmGCOperations.hpp | 2 + src/share/vm/gc_interface/allocTracer.cpp | 48 + src/share/vm/gc_interface/allocTracer.hpp | 37 + src/share/vm/gc_interface/collectedHeap.cpp | 76 +- src/share/vm/gc_interface/collectedHeap.hpp | 60 +- src/share/vm/gc_interface/collectedHeap.inline.hpp | 24 +- src/share/vm/gc_interface/gcCause.cpp | 3 + src/share/vm/gc_interface/gcCause.hpp | 1 + src/share/vm/gc_interface/gcName.hpp | 61 + src/share/vm/interpreter/abstractInterpreter.hpp | 11 +- src/share/vm/interpreter/bytecodeInterpreter.cpp | 2 +- src/share/vm/interpreter/bytecodeInterpreter.hpp | 2 +- src/share/vm/interpreter/bytecodes.hpp | 4 +- src/share/vm/interpreter/cppInterpreter.cpp | 2 +- src/share/vm/interpreter/interpreter.cpp | 4 +- src/share/vm/interpreter/interpreter.hpp | 6 +- src/share/vm/interpreter/interpreterRuntime.cpp | 2 +- src/share/vm/interpreter/linkResolver.cpp | 2 +- src/share/vm/interpreter/templateInterpreter.cpp | 2 +- src/share/vm/memory/allocation.hpp | 6 +- src/share/vm/memory/cardTableModRefBS.cpp | 2 +- src/share/vm/memory/cardTableRS.cpp | 2 +- src/share/vm/memory/compactingPermGenGen.hpp | 4 +- src/share/vm/memory/defNewGeneration.cpp | 44 +- src/share/vm/memory/defNewGeneration.hpp | 10 +- src/share/vm/memory/genCollectedHeap.cpp | 11 +- src/share/vm/memory/genCollectedHeap.hpp | 4 +- src/share/vm/memory/genMarkSweep.cpp | 26 +- src/share/vm/memory/generation.cpp | 18 +- src/share/vm/memory/heapInspection.cpp | 136 +- src/share/vm/memory/heapInspection.hpp | 32 +- src/share/vm/memory/oopFactory.hpp | 1 + src/share/vm/memory/referenceProcessor.cpp | 84 +- src/share/vm/memory/referenceProcessor.hpp | 36 +- src/share/vm/memory/referenceProcessorStats.hpp | 73 + src/share/vm/memory/referenceType.hpp | 41 + src/share/vm/memory/sharedHeap.hpp | 6 + src/share/vm/memory/universe.cpp | 35 +- src/share/vm/memory/universe.hpp | 5 + src/share/vm/oops/cpCacheOop.cpp | 41 +- src/share/vm/oops/cpCacheOop.hpp | 5 +- src/share/vm/oops/instanceKlass.cpp | 7 +- src/share/vm/oops/instanceKlass.hpp | 10 +- src/share/vm/oops/instanceKlassKlass.cpp | 5 +- src/share/vm/oops/instanceKlassKlass.hpp | 1 + src/share/vm/oops/klass.cpp | 1 + src/share/vm/oops/klassVtable.cpp | 86 +- src/share/vm/oops/klassVtable.hpp | 11 +- src/share/vm/oops/methodDataOop.hpp | 2 +- src/share/vm/oops/methodOop.cpp | 37 +- src/share/vm/oops/methodOop.hpp | 14 +- src/share/vm/oops/objArrayKlass.cpp | 2 +- src/share/vm/oops/oop.hpp | 6 + src/share/vm/oops/oop.inline.hpp | 22 +- src/share/vm/oops/typeArrayKlass.cpp | 2 +- src/share/vm/opto/addnode.cpp | 10 + src/share/vm/opto/block.hpp | 2 +- src/share/vm/opto/bytecodeInfo.cpp | 283 +- src/share/vm/opto/c2_globals.hpp | 19 + src/share/vm/opto/callGenerator.cpp | 195 +- src/share/vm/opto/callGenerator.hpp | 18 +- src/share/vm/opto/callnode.cpp | 97 +- src/share/vm/opto/callnode.hpp | 41 +- src/share/vm/opto/cfgnode.cpp | 56 +- src/share/vm/opto/cfgnode.hpp | 3 +- src/share/vm/opto/chaitin.cpp | 2 +- src/share/vm/opto/compile.cpp | 629 +++- src/share/vm/opto/compile.hpp | 239 +- src/share/vm/opto/doCall.cpp | 185 +- src/share/vm/opto/escape.cpp | 4 +- src/share/vm/opto/gcm.cpp | 2 +- src/share/vm/opto/graphKit.cpp | 134 +- src/share/vm/opto/graphKit.hpp | 74 +- src/share/vm/opto/idealKit.cpp | 28 +- src/share/vm/opto/idealKit.hpp | 13 +- src/share/vm/opto/ifg.cpp | 2 +- src/share/vm/opto/lcm.cpp | 6 +- src/share/vm/opto/library_call.cpp | 1626 +++------ src/share/vm/opto/locknode.cpp | 2 +- src/share/vm/opto/loopTransform.cpp | 8 +- src/share/vm/opto/loopUnswitch.cpp | 2 +- src/share/vm/opto/loopnode.cpp | 258 +- src/share/vm/opto/loopnode.hpp | 26 +- src/share/vm/opto/loopopts.cpp | 2 +- src/share/vm/opto/machnode.cpp | 2 +- src/share/vm/opto/macro.cpp | 12 +- src/share/vm/opto/matcher.cpp | 5 +- src/share/vm/opto/memnode.cpp | 140 +- src/share/vm/opto/memnode.hpp | 4 +- src/share/vm/opto/node.cpp | 148 +- src/share/vm/opto/node.hpp | 22 +- src/share/vm/opto/optoreg.hpp | 2 +- src/share/vm/opto/output.cpp | 4 +- src/share/vm/opto/parse.hpp | 33 +- src/share/vm/opto/parse1.cpp | 11 +- src/share/vm/opto/parse2.cpp | 40 +- src/share/vm/opto/parse3.cpp | 18 +- src/share/vm/opto/parseHelper.cpp | 12 +- src/share/vm/opto/phaseX.cpp | 72 +- src/share/vm/opto/phaseX.hpp | 6 + src/share/vm/opto/phasetype.hpp | 96 + src/share/vm/opto/postaloc.cpp | 4 +- src/share/vm/opto/reg_split.cpp | 2 +- src/share/vm/opto/regalloc.cpp | 1 + src/share/vm/opto/regmask.cpp | 79 +- src/share/vm/opto/regmask.hpp | 14 +- src/share/vm/opto/runtime.cpp | 27 +- src/share/vm/opto/runtime.hpp | 1 + src/share/vm/opto/stringopts.cpp | 159 +- src/share/vm/opto/subnode.hpp | 40 +- src/share/vm/opto/superword.cpp | 17 +- src/share/vm/opto/superword.hpp | 2 +- src/share/vm/opto/type.hpp | 50 +- src/share/vm/prims/forte.hpp | 5 +- src/share/vm/prims/jni.cpp | 27 +- src/share/vm/prims/jniCheck.hpp | 4 +- src/share/vm/prims/jvm.cpp | 20 +- src/share/vm/prims/jvm.h | 3 +- src/share/vm/prims/jvmtiCodeBlobEvents.hpp | 4 +- src/share/vm/prims/jvmtiEnter.xsl | 8 +- src/share/vm/prims/jvmtiEnv.cpp | 6 +- src/share/vm/prims/jvmtiEnvBase.cpp | 12 +- src/share/vm/prims/jvmtiExport.cpp | 24 +- src/share/vm/prims/jvmtiExport.hpp | 124 +- src/share/vm/prims/jvmtiExtensions.hpp | 4 +- src/share/vm/prims/jvmtiGen.java | 2 +- src/share/vm/prims/jvmtiImpl.cpp | 6 +- src/share/vm/prims/jvmtiImpl.hpp | 25 +- src/share/vm/prims/jvmtiRawMonitor.hpp | 4 +- src/share/vm/prims/jvmtiRedefineClasses.cpp | 171 +- src/share/vm/prims/jvmtiRedefineClasses.hpp | 7 +- src/share/vm/prims/jvmtiRedefineClassesTrace.hpp | 11 +- src/share/vm/prims/jvmtiTagMap.hpp | 6 +- src/share/vm/prims/methodHandles.cpp | 4 +- src/share/vm/prims/unsafe.cpp | 11 +- src/share/vm/prims/whitebox.cpp | 56 + src/share/vm/runtime/arguments.cpp | 118 +- src/share/vm/runtime/arguments.hpp | 7 +- src/share/vm/runtime/atomic.hpp | 12 +- src/share/vm/runtime/deoptimization.cpp | 12 +- src/share/vm/runtime/fprofiler.hpp | 44 +- src/share/vm/runtime/frame.hpp | 1 + src/share/vm/runtime/frame.inline.hpp | 4 + src/share/vm/runtime/globals.cpp | 11 +- src/share/vm/runtime/globals.hpp | 16 +- src/share/vm/runtime/globals_extension.hpp | 6 +- src/share/vm/runtime/init.cpp | 4 +- src/share/vm/runtime/java.cpp | 14 +- src/share/vm/runtime/mutex.cpp | 2 +- src/share/vm/runtime/mutexLocker.cpp | 7 +- src/share/vm/runtime/mutexLocker.hpp | 1 - src/share/vm/runtime/objectMonitor.cpp | 66 +- src/share/vm/runtime/objectMonitor.hpp | 13 +- src/share/vm/runtime/objectMonitor.inline.hpp | 6 +- src/share/vm/runtime/os.cpp | 14 +- src/share/vm/runtime/os.hpp | 105 + src/share/vm/runtime/perfData.cpp | 4 + src/share/vm/runtime/perfData.hpp | 3 + src/share/vm/runtime/sharedRuntime.cpp | 2 +- src/share/vm/runtime/stubCodeGenerator.cpp | 2 +- src/share/vm/runtime/stubRoutines.hpp | 2 + src/share/vm/runtime/sweeper.cpp | 83 +- src/share/vm/runtime/sweeper.hpp | 28 +- src/share/vm/runtime/synchronizer.cpp | 10 +- src/share/vm/runtime/task.cpp | 8 +- src/share/vm/runtime/thread.cpp | 66 +- src/share/vm/runtime/thread.hpp | 10 +- src/share/vm/runtime/timer.cpp | 44 +- src/share/vm/runtime/timer.hpp | 16 +- src/share/vm/runtime/vframeArray.cpp | 15 +- src/share/vm/runtime/vframeArray.hpp | 2 + src/share/vm/runtime/vmStructs.cpp | 3 +- src/share/vm/runtime/vmStructs.hpp | 4 +- src/share/vm/runtime/vmThread.cpp | 28 +- src/share/vm/runtime/vm_operations.cpp | 19 +- src/share/vm/runtime/vm_operations.hpp | 3 + src/share/vm/runtime/vm_version.cpp | 6 +- src/share/vm/services/attachListener.cpp | 6 +- src/share/vm/services/attachListener.hpp | 21 +- src/share/vm/services/diagnosticArgument.cpp | 29 +- src/share/vm/services/diagnosticCommand.cpp | 50 +- src/share/vm/services/diagnosticCommand.hpp | 10 + src/share/vm/services/heapDumper.hpp | 6 +- src/share/vm/services/management.cpp | 8 +- src/share/vm/services/memBaseline.cpp | 7 +- src/share/vm/services/memPtr.cpp | 2 +- src/share/vm/services/memPtr.hpp | 10 +- src/share/vm/services/memRecorder.cpp | 16 +- src/share/vm/services/memRecorder.hpp | 9 +- src/share/vm/services/memReporter.cpp | 4 +- src/share/vm/services/memSnapshot.cpp | 9 +- src/share/vm/services/memSnapshot.hpp | 8 +- src/share/vm/services/memTrackWorker.cpp | 71 +- src/share/vm/services/memTrackWorker.hpp | 58 +- src/share/vm/services/memTracker.cpp | 70 +- src/share/vm/services/memTracker.hpp | 40 +- src/share/vm/services/nmtDCmd.cpp | 24 +- src/share/vm/services/nmtDCmd.hpp | 1 + src/share/vm/services/runtimeService.cpp | 5 +- src/share/vm/trace/trace.dtd | 83 + src/share/vm/trace/trace.xml | 341 ++ src/share/vm/trace/traceBackend.hpp | 52 + src/share/vm/trace/traceDataTypes.hpp | 67 + src/share/vm/trace/traceEvent.hpp | 148 + src/share/vm/trace/traceEventClasses.xsl | 235 + src/share/vm/trace/traceEventIds.xsl | 72 + src/share/vm/trace/traceEventTypes.hpp | 30 - src/share/vm/trace/traceMacros.hpp | 13 +- src/share/vm/trace/traceStream.hpp | 99 + src/share/vm/trace/traceTime.hpp | 33 + src/share/vm/trace/traceTypes.xsl | 74 + src/share/vm/trace/tracetypes.xml | 367 ++ src/share/vm/trace/tracing.hpp | 5 +- src/share/vm/trace/xinclude.mod | 61 + src/share/vm/trace/xsl_util.xsl | 78 + src/share/vm/utilities/accessFlags.cpp | 6 +- src/share/vm/utilities/accessFlags.hpp | 4 +- src/share/vm/utilities/elfFile.cpp | 24 + src/share/vm/utilities/elfFile.hpp | 10 + src/share/vm/utilities/events.hpp | 4 +- src/share/vm/utilities/globalDefinitions.hpp | 12 - src/share/vm/utilities/macros.hpp | 26 +- src/share/vm/utilities/numberSeq.cpp | 2 +- src/share/vm/utilities/ostream.cpp | 20 +- src/share/vm/utilities/ostream.hpp | 2 +- test/TEST.ROOT | 2 +- test/compiler/5091921/Test6850611.java | 4 +- test/compiler/5091921/Test6890943.java | 4 +- test/compiler/5091921/Test6890943.sh | 7 +- test/compiler/5091921/Test6905845.java | 4 +- test/compiler/5091921/Test6992759.java | 4 +- test/compiler/6852078/Test6852078.java | 8 +- test/compiler/6865265/StackOverflowBug.java | 2 +- test/compiler/7009359/Test7009359.java | 6 +- test/compiler/7184394/TestAESBase.java | 15 +- test/compiler/7184394/TestAESMain.java | 3 +- test/compiler/7190310/Test7190310.java | 13 +- test/compiler/8004741/Test8004741.java | 184 + test/compiler/8004867/TestIntAtomicCAS.java | 969 +++++ test/compiler/8004867/TestIntAtomicOrdered.java | 969 +++++ test/compiler/8004867/TestIntAtomicVolatile.java | 969 +++++ test/compiler/8004867/TestIntUnsafeCAS.java | 998 ++++++ test/compiler/8004867/TestIntUnsafeOrdered.java | 990 ++++++ test/compiler/8004867/TestIntUnsafeVolatile.java | 990 ++++++ test/compiler/8005033/Test8005033.java | 50 + test/compiler/8005419/Test8005419.java | 120 + test/compiler/8007294/Test8007294.java | 98 + test/compiler/8007722/Test8007722.java | 56 + test/compiler/8009761/Test8009761.java | 255 + test/gc/heap_inspection/TestPrintClassHistogram.java | 95 + test/runtime/7107135/Test.java | 65 + test/runtime/7107135/Test7107135.sh | 98 + test/runtime/7107135/TestMT.java | 85 + test/runtime/7107135/test.c | 39 + test/runtime/7158988/FieldMonitor.java | 4 +- test/runtime/7158988/TestFieldMonitor.sh | 75 - test/runtime/8010389/VMThreadDlopen.java | 44 + test/runtime/NMT/AllocTestType.java | 73 + test/runtime/NMT/BaselineWithParameter.java | 54 + test/runtime/NMT/CommandLineDetail.java | 45 + test/runtime/NMT/CommandLineEmptyArgument.java | 41 + test/runtime/NMT/CommandLineInvalidArgument.java | 41 + test/runtime/NMT/CommandLineSummary.java | 45 + test/runtime/NMT/CommandLineTurnOffNMT.java | 44 + test/runtime/NMT/JcmdScale.java | 67 + test/runtime/NMT/JcmdWithNMTDisabled.java | 63 + test/runtime/NMT/PrintNMTStatistics.java | 66 + test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java | 44 + test/runtime/NMT/ShutdownTwice.java | 56 + test/runtime/NMT/SummaryAfterShutdown.java | 56 + test/runtime/NMT/SummarySanityCheck.java | 120 + test/sanity/WBApi.java | 29 +- test/serviceability/ParserTest.java | 31 +- test/testlibrary/ClassFileInstaller.java | 53 + test/testlibrary/OutputAnalyzerTest.java | 108 + test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java | 50 + test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java | 191 + test/testlibrary/com/oracle/java/testlibrary/OutputBuffer.java | 59 + test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java | 141 + test/testlibrary/com/oracle/java/testlibrary/StreamPumper.java | 76 + test/testlibrary/whitebox/sun/hotspot/WhiteBox.java | 77 + test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java | 66 + 489 files changed, 21869 insertions(+), 5692 deletions(-) diffs (truncated from 43874 to 500 lines): diff -r 7e12b7098f20 -r ed247f9fb4fe .hgtags --- a/.hgtags Mon Jan 14 16:38:37 2013 +0000 +++ b/.hgtags Wed May 22 17:02:41 2013 +0100 @@ -341,6 +341,8 @@ ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02 ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04 da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05 +8eaa45ed5f804199c0823b409dc37f72e808926f jdk7u9-b31 +ea83168282c8c3a9f4a8ca723cc86972a3188d58 jdk7u9-b32 d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10 d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11 f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12 @@ -351,6 +353,21 @@ 5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18 c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30 +07f7daeb261073a4a2946d988979ee65ba8ed753 jdk7u10-b31 +25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20 +7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21 +06b5c3f663b81f11da2080a91d215a96ae431f84 jdk7u11-b32 +abb5b690122caabf09f93958c747358cc22f8a59 jdk7u11-b33 +db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03 +4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04 +f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05 +0cbce123c9027d531e585fd81fbc361c5f8407f1 jdk7u11-b06 +94bf1e3dafef3cc06d3f97f81d304313ccd999ee jdk7u11-b07 +2b543aa340e4a75671fe05803fcee08bf3e136db jdk7u11-b08 +34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u13-b09 +e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b10 +be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u13-b30 +e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b20 02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01 528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02 db63a909e1ad950ef2b9050389f51e68581b2d4e jdk7u8-b03 @@ -431,3 +448,52 @@ 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint +7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 +181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 +4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 +06a41c6e29c2b1aa9c5f7807fe23f75fe2a0038d jdk7u14-b11 +7b2efda91ffcad410878d2fa14b8704558e35b4d hs24-b31 +bfa88fb4cb016d4e94a338bea3d090b548830ec4 jdk7u14-b12 +88f46d2084529e3476f24209c20c6f035ad99b9f hs24-b32 +38b173289e57d26453891f417f8e8fe5da38684e jdk7u14-b13 +6a431dbf4a336343bb070b614d029d2bc6216bc8 hs24-b33 +5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01 +30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02 +221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30 +0b905a04f573565515aa8614085099abd73dcac4 jdk7u15-b31 +8b349f332a66ebe5982b5680c85f903efb03da8e jdk7u15-b33 +5b55cef461b034766f05a46640caa123aa4247d4 jdk7u15-b03 +34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32 +a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 +0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02 +7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30 +22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31 +be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01 +5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02 +ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03 +c954aab38a7f8f62e33ae5103494576f67fc36d9 jdk7u21-b04 +0e8e9d990d91dc0f8b8807bb82c090de3264c809 jdk7u21-b05 +beeb3d6b76f06d9f60c31d6c5b9e04d82f01ad79 jdk7u21-b06 +663b5c744e82d1c884048cd9b38f625e52004773 jdk7u21-b07 +87e9bb582938552180b024dd99bc5166816f3921 jdk7u21-b08 +1f195ee7856aecb6527bc5c957f66e1960e51a12 jdk7u21-b09 +d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10 +d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11 +a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30 +c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12 +e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 +860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 +12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 +be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35 +10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16 +7416b0a84e3c5b0eea46affb71cc36cc729c040c hs24-b36 +61822da2b149bd272b5e7b727c142635f1d52d5c jdk7u14-b17 +c5c01d4cd7d9a5141e0945a5811c76267da0df13 hs24-b37 +72e4bc0bcbd2b23d70115fc9d92525bf3c23aa1d jdk7u14-b18 +795212ad5b1b9c43ab3cea5680a37e759641f3bf hs24-b38 +5e622bdc713e05a6a9f8dca35cf4c5887d4d3e4a jdk7u14-b19 +5e622bdc713e05a6a9f8dca35cf4c5887d4d3e4a jdk7u14-b19 +94e094f461041abe877c1f4aaa22f72e252f5512 jdk7u14-b19 +c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20 +d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39 +3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40 diff -r 7e12b7098f20 -r ed247f9fb4fe .jcheck/conf --- a/.jcheck/conf Mon Jan 14 16:38:37 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/bsd/MacosxDebuggerLocal.m --- a/agent/src/os/bsd/MacosxDebuggerLocal.m Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/bsd/MacosxDebuggerLocal.m Wed May 22 17:02:41 2013 +0100 @@ -32,6 +32,8 @@ #import #import #import +#import +#import jboolean debug = JNI_FALSE; @@ -347,6 +349,73 @@ return (jint) usable_tid; } + +static bool ptrace_continue(pid_t pid, int signal) { + // pass the signal to the process so we don't swallow it + int res; + if ((res = ptrace(PT_CONTINUE, pid, (caddr_t)1, signal)) < 0) { + fprintf(stderr, "attach: ptrace(PT_CONTINUE, %d) failed with %d\n", pid, res); + return false; + } + return true; +} + +// waits until the ATTACH has stopped the process +// by signal SIGSTOP +static bool ptrace_waitpid(pid_t pid) { + int ret; + int status; + while (true) { + // Wait for debuggee to stop. + ret = waitpid(pid, &status, 0); + if (ret >= 0) { + if (WIFSTOPPED(status)) { + // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP + // will still be pending and delivered when the process is DETACHED and the process + // will go to sleep. + if (WSTOPSIG(status) == SIGSTOP) { + // Debuggee stopped by SIGSTOP. + return true; + } + if (!ptrace_continue(pid, WSTOPSIG(status))) { + fprintf(stderr, "attach: Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status)); + return false; + } + } else { + fprintf(stderr, "attach: waitpid(): Child process exited/terminated (status = 0x%x)\n", status); + return false; + } + } else { + switch (errno) { + case EINTR: + continue; + break; + case ECHILD: + fprintf(stderr, "attach: waitpid() failed. Child process pid (%d) does not exist \n", pid); + break; + case EINVAL: + fprintf(stderr, "attach: waitpid() failed. Invalid options argument.\n"); + break; + default: + fprintf(stderr, "attach: waitpid() failed. Unexpected error %d\n",errno); + break; + } + return false; + } + } +} + +// attach to a process/thread specified by "pid" +static bool ptrace_attach(pid_t pid) { + int res; + if ((res = ptrace(PT_ATTACH, pid, 0, 0)) < 0) { + fprintf(stderr, "ptrace(PT_ATTACH, %d) failed with %d\n", pid, res); + return false; + } else { + return ptrace_waitpid(pid); + } +} + /* * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal * Method: attach0 @@ -359,7 +428,8 @@ else debug = JNI_FALSE; if (debug) printf("attach0 called for jpid=%d\n", (int)jpid); - + + // get the task from the pid kern_return_t result; task_t gTask = 0; result = task_for_pid(mach_task_self(), jpid, &gTask); @@ -369,6 +439,13 @@ } putTask(env, this_obj, gTask); + // use ptrace to stop the process + // on os x, ptrace only needs to be called on the process, not the individual threads + if (ptrace_attach(jpid) != true) { + mach_port_deallocate(mach_task_self(), gTask); + THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the process"); + } + id symbolicator = nil; id jrsSymbolicator = objc_lookUpClass("JRSSymbolicator"); if (jrsSymbolicator != nil) { @@ -397,6 +474,21 @@ if (debug) printf("detach0 called\n"); task_t gTask = getTask(env, this_obj); + + // detach from the ptraced process causing it to resume execution + int pid; + kern_return_t k_res; + k_res = pid_for_task(gTask, &pid); + if (k_res != KERN_SUCCESS) { + fprintf(stderr, "detach: pid_for_task(%d) failed (%d)\n", pid, k_res); + } + else { + int res = ptrace(PT_DETACH, pid, 0, 0); + if (res < 0) { + fprintf(stderr, "detach: ptrace(PT_DETACH, %d) failed (%d)\n", pid, res); + } + } + mach_port_deallocate(mach_task_self(), gTask); id symbolicator = getSymbolicator(env, this_obj); if (symbolicator != nil) { diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/bsd/libproc_impl.c --- a/agent/src/os/bsd/libproc_impl.c Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/bsd/libproc_impl.c Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -91,6 +91,14 @@ } } +void print_error(const char* format,...) { + va_list alist; + va_start(alist, format); + fputs("ERROR: ", stderr); + vfprintf(stderr, format, alist); + va_end(alist); +} + bool is_debug() { return _libsaproc_debug; } diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/bsd/libproc_impl.h --- a/agent/src/os/bsd/libproc_impl.h Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/bsd/libproc_impl.h Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -107,6 +107,7 @@ int pathmap_open(const char* name); void print_debug(const char* format,...); +void print_error(const char* format,...); bool is_debug(); typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lwpid_t lwpid); diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/bsd/ps_proc.c --- a/agent/src/os/bsd/ps_proc.c Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/bsd/ps_proc.c Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -129,42 +129,66 @@ return (errno == 0)? true: false; } +static bool ptrace_continue(pid_t pid, int signal) { + // pass the signal to the process so we don't swallow it + if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) { + print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid); + return false; + } + return true; +} + +// waits until the ATTACH has stopped the process +// by signal SIGSTOP +static bool ptrace_waitpid(pid_t pid) { + int ret; + int status; + do { + // Wait for debuggee to stop. + ret = waitpid(pid, &status, 0); + if (ret >= 0) { + if (WIFSTOPPED(status)) { + // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP + // will still be pending and delivered when the process is DETACHED and the process + // will go to sleep. + if (WSTOPSIG(status) == SIGSTOP) { + // Debuggee stopped by SIGSTOP. + return true; + } + if (!ptrace_continue(pid, WSTOPSIG(status))) { + print_error("Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status)); + return false; + } + } else { + print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status); + return false; + } + } else { + switch (errno) { + case EINTR: + continue; + break; + case ECHILD: + print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid); + break; + case EINVAL: + print_debug("waitpid() failed. Invalid options argument.\n"); + break; + default: + print_debug("waitpid() failed. Unexpected error %d\n",errno); + } + return false; + } + } while(true); +} + // attach to a process/thread specified by "pid" static bool ptrace_attach(pid_t pid) { if (ptrace(PT_ATTACH, pid, NULL, 0) < 0) { print_debug("ptrace(PTRACE_ATTACH, ..) failed for %d\n", pid); return false; } else { - int ret; - int status; - do { - // Wait for debuggee to stop. - ret = waitpid(pid, &status, 0); - if (ret >= 0) { - if (WIFSTOPPED(status)) { - // Debuggee stopped. - return true; - } else { - print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status); - return false; - } - } else { - switch (errno) { - case EINTR: - continue; - break; - case ECHILD: - print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid); - break; - case EINVAL: - print_debug("waitpid() failed. Invalid options argument.\n"); - break; - default: - print_debug("waitpid() failed. Unexpected error %d\n",errno); - } - return false; - } - } while(true); + return ptrace_waitpid(pid); } } diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/linux/libproc_impl.c --- a/agent/src/os/linux/libproc_impl.c Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/linux/libproc_impl.c Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -92,6 +92,14 @@ } } +void print_error(const char* format,...) { + va_list alist; + va_start(alist, format); + fputs("ERROR: ", stderr); + vfprintf(stderr, format, alist); + va_end(alist); +} + bool is_debug() { return _libsaproc_debug; } diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/linux/libproc_impl.h --- a/agent/src/os/linux/libproc_impl.h Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/linux/libproc_impl.h Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -105,6 +105,7 @@ int pathmap_open(const char* name); void print_debug(const char* format,...); +void print_error(const char* format,...); bool is_debug(); typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lwpid_t lwpid); diff -r 7e12b7098f20 -r ed247f9fb4fe agent/src/os/linux/ps_proc.c --- a/agent/src/os/linux/ps_proc.c Mon Jan 14 16:38:37 2013 +0000 +++ b/agent/src/os/linux/ps_proc.c Wed May 22 17:02:41 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include "libproc_impl.h" @@ -142,46 +143,71 @@ } +static bool ptrace_continue(pid_t pid, int signal) { + // pass the signal to the process so we don't swallow it + if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) { + print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid); + return false; + } + return true; +} + +// waits until the ATTACH has stopped the process +// by signal SIGSTOP +static bool ptrace_waitpid(pid_t pid) { + int ret; + int status; + while (true) { + // Wait for debuggee to stop. + ret = waitpid(pid, &status, 0); + if (ret == -1 && errno == ECHILD) { + // try cloned process. + ret = waitpid(pid, &status, __WALL); + } + if (ret >= 0) { + if (WIFSTOPPED(status)) { + // Any signal will stop the thread, make sure it is SIGSTOP. Otherwise SIGSTOP + // will still be pending and delivered when the process is DETACHED and the process + // will go to sleep. + if (WSTOPSIG(status) == SIGSTOP) { + // Debuggee stopped by SIGSTOP. + return true; + } + if (!ptrace_continue(pid, WSTOPSIG(status))) { + print_error("Failed to correctly attach to VM. VM might HANG! [PTRACE_CONT failed, stopped by %d]\n", WSTOPSIG(status)); + return false; + } + } else { + print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status); + return false; + } + } else { + switch (errno) { + case EINTR: + continue; + break; + case ECHILD: + print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid); + break; + case EINVAL: + print_debug("waitpid() failed. Invalid options argument.\n"); + break; + default: + print_debug("waitpid() failed. Unexpected error %d\n",errno); + break; + } + return false; + } + } +} + // attach to a process/thread specified by "pid" static bool ptrace_attach(pid_t pid) { From andrew at icedtea.classpath.org Wed May 22 09:34:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:34:37 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 316 new changesets Message-ID: changeset fd2187713a99 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd2187713a99 author: andrew date: Thu Feb 14 23:55:06 2013 +0000 PR1303: Support building with giflib 5 changeset 67b0266bbd5d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=67b0266bbd5d author: andrew date: Fri Mar 08 15:53:50 2013 +0000 PR1303: Correct #ifdef to #if changeset 587f4a6dfdc9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=587f4a6dfdc9 author: jgish date: Wed Dec 05 21:08:14 2012 -0800 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks changeset 7825c8aa99a2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7825c8aa99a2 author: jgish date: Thu Jan 17 15:09:46 2013 -0500 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou changeset 1d2474180c02 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1d2474180c02 author: smarks date: Thu Dec 20 20:11:45 2012 -0800 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek changeset 696e32c281d5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=696e32c281d5 author: katleman date: Wed Jan 23 14:02:01 2013 -0800 Added tag jdk7u14-b11 for changeset 9eb82fb221f3 changeset ee3ab2ed2371 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee3ab2ed2371 author: lana date: Mon Jan 28 11:10:13 2013 -0800 Merge changeset 8403c06be94f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8403c06be94f author: katleman date: Fri Feb 01 09:57:07 2013 -0800 Added tag jdk7u14-b12 for changeset ee3ab2ed2371 changeset 83cdc26960b1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=83cdc26960b1 author: lana date: Tue Feb 05 18:42:06 2013 -0800 Merge changeset 7c0d4bfd9d2c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7c0d4bfd9d2c author: dsamersoff date: Wed Feb 06 20:09:33 2013 +0400 8007277: JDK-8002048 testcase fails to compile Summary: sun.* classes is not included to ct.sym file and symbol file have to be ignored Reviewed-by: alanb changeset 884f845f48a9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=884f845f48a9 author: ykantser date: Thu Feb 07 11:22:04 2013 +0100 8007142: Add utility classes for writing better multiprocess tests in jtreg Reviewed-by: alanb, rbackman changeset 47a55dc371a5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=47a55dc371a5 author: chegar date: Wed Jan 23 14:45:44 2013 +0000 8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb changeset 3e82e2c9b4e7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3e82e2c9b4e7 author: ewendeli date: Fri Feb 08 15:05:00 2013 +0100 Merge changeset 57b08de34688 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=57b08de34688 author: coffeys date: Fri Feb 08 17:51:31 2013 +0000 Merge changeset 19db25f92f6e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=19db25f92f6e author: smarks date: Mon Jan 07 18:09:07 2013 -0800 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently Summary: Tighten up JavaVM test library API, and adjust tests to match. Reviewed-by: mchung, dmocek changeset 8640855b11da in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8640855b11da author: smarks date: Tue Jan 22 18:30:49 2013 -0800 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung changeset 10c30e2d4b78 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=10c30e2d4b78 author: weijun date: Wed Dec 12 18:39:34 2012 +0800 8004904: Makefile for ntlm Reviewed-by: erikj, chegar changeset 3a462709c3ac in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3a462709c3ac author: kshefov date: Mon Feb 11 14:37:57 2013 +0000 7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal Reviewed-by: serb, alexsch changeset c9bc97a00f69 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c9bc97a00f69 author: dsamersoff date: Tue Feb 12 14:03:19 2013 +0400 8007536: Incorrect copyright header in JDP files Summary: Copyright header in JDP files missed the "classpath exception" rule. Reviewed-by: mikael changeset 10eae5966c2d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=10eae5966c2d author: chegar date: Fri Sep 07 14:00:31 2012 +0100 7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address Summary: TESTBUG Reviewed-by: chegar, alanb Contributed-by: Eric Wang changeset 16b6b35fdf8b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=16b6b35fdf8b author: chegar date: Wed Apr 04 15:14:00 2012 +0100 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes changeset e741f6a1bcbe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e741f6a1bcbe author: chegar date: Wed Nov 23 12:30:19 2011 +0000 6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX Reviewed-by: chegar, dholmes Contributed-by: gary.adams at oracle.com changeset c57ca24e0404 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c57ca24e0404 author: chegar date: Thu Aug 25 16:08:31 2011 +0100 7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 Reviewed-by: alanb, chegar Contributed-by: kurchi.subhra.hazra at oracle.com changeset 55d325c3e83c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=55d325c3e83c author: chegar date: Tue Aug 09 16:39:04 2011 +0100 7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) Reviewed-by: mchung changeset 5eb0f8275fd5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5eb0f8275fd5 author: chegar date: Tue Feb 12 10:23:00 2013 +0000 Merge changeset 6707e6b768ee in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6707e6b768ee author: mcherkas date: Tue Feb 12 16:11:40 2013 +0400 8005932: Java 7 on mac os x only provides text clipboard formats Reviewed-by: alexp, denis changeset 4697f4725cee in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4697f4725cee author: dsamersoff date: Tue Feb 12 16:41:29 2013 +0400 8007786: JDK-8002048 testcase doesn't work on Solaris Summary: test built in into Solaris shell doesn't have -e operator Reviewed-by: sla, sspitsyn changeset d0d5986f25ef in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d0d5986f25ef author: chegar date: Tue Aug 09 16:59:44 2011 +0100 7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin Reviewed-by: alanb, dcubed changeset 91cccde7692c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=91cccde7692c author: chegar date: Wed Feb 08 11:16:52 2012 +0000 7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc Reviewed-by: dholmes changeset 9560a14d894d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9560a14d894d author: chegar date: Tue Nov 06 21:01:43 2012 +0000 8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently Reviewed-by: alanb, dsamersoff changeset 7bdefdb2f828 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7bdefdb2f828 author: gadams date: Wed Feb 08 11:18:29 2012 +0000 6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient Reviewed-by: chegar, dholmes, alanb changeset 47954ee7beca in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=47954ee7beca author: gadams date: Wed Feb 08 11:19:25 2012 +0000 6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing Reviewed-by: chegar, dholmes, alanb changeset 216bc5e1692d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=216bc5e1692d author: gadams date: Mon Jan 09 19:33:02 2012 +0000 7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space Reviewed-by: alanb changeset adca7e3349f3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=adca7e3349f3 author: khazra date: Tue Apr 17 11:59:12 2012 -0700 7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows Summary: Remove usage of HTTP Server at test/sun/net/www/httptest Reviewed-by: chegar, alanb changeset 5d26d75ecd32 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d26d75ecd32 author: khazra date: Thu Apr 19 13:26:06 2012 -0700 7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again Summary: Enable finding "foo1.jar" Reviewed-by: chegar changeset 185e00345615 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=185e00345615 author: alanb date: Sat Nov 19 19:55:19 2011 +0000 6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently Reviewed-by: dholmes, alanb, forax Contributed-by: gary.adams at oracle.com changeset e40fa6f9bfc2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e40fa6f9bfc2 author: alanb date: Sat Nov 19 20:03:00 2011 +0000 6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java Reviewed-by: alanb, dholmes, forax Contributed-by: gary.adams at oracle.com changeset 665c9df34263 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=665c9df34263 author: chegar date: Tue Feb 12 12:57:38 2013 +0000 Merge changeset cce9ada9668b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cce9ada9668b author: weijun date: Fri Feb 08 08:56:52 2013 +0800 8007761: NTLM coding errors Reviewed-by: chegar changeset a724ea5862a7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a724ea5862a7 author: smarks date: Tue Feb 12 14:41:18 2013 -0800 8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 Reviewed-by: alanb, mchung, dmocek changeset 0ccb6896143c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0ccb6896143c author: sla date: Wed Feb 13 11:04:49 2013 +0100 8006757: Refactor Socket and File I/O tracing Summary: Allow deferring evaluation/object allocations until we know events will be written, which may reduce the overhead of enabling these events. Reviewed-by: alanb Contributed-by: claes.redestad at oracle.com changeset a049a8fe8723 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a049a8fe8723 author: serb date: Wed Feb 13 20:11:24 2013 +0400 7132385: [macosx] IconifyTest of RepaintManager could use some delay Reviewed-by: serb, alexsch Contributed-by: vera.akulova at oracle.com changeset 064aa2ac5ddf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=064aa2ac5ddf author: dsamersoff date: Thu Feb 14 14:03:22 2013 +0400 8008095: TEST_BUG: JDK-8002048 one more testcase failure on Solaris Summary: fixed couple of more Solaris shell incompatibilities Reviewed-by: chegar changeset d60db64c6435 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d60db64c6435 author: kshefov date: Thu Feb 14 14:14:19 2013 +0000 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified Summary: Added @build Util jtreg tag Reviewed-by: serb, alexsch Contributed-by: Vera Akulova changeset 81e936460bc9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=81e936460bc9 author: leonidr date: Thu Feb 14 22:49:55 2013 +0400 8008235: Fix for 8002114 is missing in jdk7u-dev Reviewed-by: serb, anthony changeset 2b405fdb2a6d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2b405fdb2a6d author: erikj date: Thu Feb 14 10:03:11 2013 -0800 8007450: Add build support for different man pages for OpenJDK and OracleJDK Reviewed-by: tbell, ohair changeset 2f5d66a7d930 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2f5d66a7d930 author: tbell date: Thu Feb 14 22:17:30 2013 +0000 Merge changeset dc53b95a5db7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dc53b95a5db7 author: leonidr date: Sat Feb 16 02:39:41 2013 +0400 8007006: [macosx] Closing subwindow loses main window menus Reviewed-by: art, serb changeset 0360e7370921 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0360e7370921 author: kshefov date: Mon Feb 18 09:31:10 2013 +0000 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. Reviewed-by: serb, denis Contributed-by: Vera Akulova changeset 56103be763c1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=56103be763c1 author: chegar date: Fri Feb 15 11:06:52 2013 +0000 8008223: java/net/BindException/Test.java fails rarely Reviewed-by: khazra, alanb changeset 99d24631a93a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=99d24631a93a author: fparain date: Wed Feb 15 09:29:05 2012 -0800 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently Reviewed-by: alanb changeset 6bc173d42655 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6bc173d42655 author: sla date: Tue Mar 20 12:48:48 2012 +0100 7154114: jstat tests failing on non-english locales 7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system Reviewed-by: rbackman, kamg, dsamersoff changeset 4b4a3baa44d1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4b4a3baa44d1 author: sla date: Mon Oct 29 09:23:55 2012 +0100 8001621: Update awk scripts that check output from jps/jcmd Reviewed-by: alanb changeset 63fbcd4ae15e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=63fbcd4ae15e author: jjg date: Tue Aug 28 10:31:27 2012 +0100 7194035: update tests for upcoming changes for jtreg Reviewed-by: alanb, sspitsyn changeset acd5ac174459 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=acd5ac174459 author: katleman date: Wed Feb 13 17:56:56 2013 -0800 Added tag jdk7u14-b13 for changeset 7c0d4bfd9d2c changeset 735d48593171 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=735d48593171 author: lana date: Tue Feb 19 20:42:12 2013 -0800 Merge changeset 3e970744cf43 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3e970744cf43 author: ykantser date: Wed Feb 13 10:24:24 2013 +0100 8008089: Delete OS dependent check in JdkFinder.getExecutable() Reviewed-by: egahlin, alanb changeset 3982fc37bc25 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3982fc37bc25 author: kshefov date: Wed Feb 20 17:07:30 2013 +0000 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. Reviewed-by: serb, anthony changeset 9641d2b88d59 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9641d2b88d59 author: mchung date: Mon Jan 21 13:34:48 2013 -0800 8004937: Improve proxy construction Reviewed-by: jrose, ahgross changeset 1b00d5677ee4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1b00d5677ee4 author: ewendeli date: Mon Jan 28 23:31:04 2013 +0100 Merge changeset 33b30ad16898 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=33b30ad16898 author: dfuchs date: Thu Jan 24 10:51:48 2013 -0800 8006446: Restrict MBeanServer access Reviewed-by: alanb, mchung, darcy, jrose, ahgross, skoivu changeset 4bb16e8e663a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4bb16e8e663a author: jrose date: Fri Jan 18 20:47:51 2013 -0800 8006179: JSR292 MethodHandles lookup with interface using findVirtual() Reviewed-by: twisti changeset 6b6c1d66f161 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6b6c1d66f161 author: jrose date: Thu Jan 24 11:06:13 2013 -0800 8006439: Improve MethodHandles coverage Summary: Fill out caller-sensitive list. Recognize aliases of non-static methods. Remove use of MethodUtil Trampoline. Reviewed-by: mchung, twisti, jdn, skoivu changeset 044ea56a339d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=044ea56a339d author: mchung date: Mon Jan 28 15:08:21 2013 -0800 Merge changeset cbbb166b38eb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cbbb166b38eb author: mchung date: Mon Jan 28 15:15:10 2013 -0800 8006882: Proxy generated classes in sun.proxy package breaks JMockit Reviewed-by: alanb, ahgross changeset 28700a56b69d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=28700a56b69d author: katleman date: Tue Jan 29 14:15:20 2013 -0800 Added tag jdk7u13-b10 for changeset cbbb166b38eb changeset 8385350c6d34 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8385350c6d34 author: katleman date: Fri Feb 01 10:31:58 2013 -0800 Added tag jdk7u13-b30 for changeset 28700a56b69d changeset 835448d525a1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=835448d525a1 author: ewendeli date: Fri Feb 01 23:29:46 2013 +0100 Merge changeset 10bf0ec57a6e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=10bf0ec57a6e author: mchung date: Tue Feb 05 22:56:47 2013 -0800 8007393: Possible race condition after JDK-6664509 Reviewed-by: alanb, jgish changeset 58602549247e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=58602549247e author: mchung date: Thu Feb 07 09:41:47 2013 -0800 8007611: logging behavior in applet changed Reviewed-by: alanb, jgish changeset 068448362d88 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=068448362d88 author: wetmore date: Thu Feb 07 11:48:13 2013 -0800 8006777: Improve TLS handling of invalid messages Reviewed-by: wetmore, ahgross changeset 0a6a31d15c8c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0a6a31d15c8c author: katleman date: Thu Feb 07 14:18:25 2013 -0800 Added tag jdk7u15-b01 for changeset 835448d525a1 changeset d1035652496b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d1035652496b author: katleman date: Thu Feb 07 14:23:31 2013 -0800 Merge changeset 0443fe2d8023 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0443fe2d8023 author: valeriep date: Thu Feb 07 16:18:32 2013 -0800 8007688: Blacklist known bad certificate Summary: Added two known bad certs to the blacklist certs. Reviewed-by: mullan changeset 70b0f967c064 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=70b0f967c064 author: katleman date: Fri Feb 08 10:46:57 2013 -0800 Added tag jdk7u15-b02 for changeset 0443fe2d8023 changeset a9db13b77abb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a9db13b77abb author: ewendeli date: Wed Feb 20 01:15:04 2013 +0100 Merge changeset 95cbcc0d03bd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=95cbcc0d03bd author: ewendeli date: Wed Feb 20 18:17:40 2013 +0100 8008534: 7u15 to 7u-dev sync: Update java.security-linux to contain java.security changes Reviewed-by: mullan changeset 159d71a29427 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=159d71a29427 author: ewendeli date: Wed Feb 20 19:53:32 2013 +0100 Merge changeset 31c63bd680da in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=31c63bd680da author: fparain date: Tue Feb 14 07:28:29 2012 -0800 7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes changeset 5c24d5eb8306 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5c24d5eb8306 author: sla date: Wed Sep 05 14:42:44 2012 +0200 6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh Summary: Make tests more resilient by allowing for more error messages from jps Reviewed-by: alanb, rbackman, dsamersoff changeset b528ab0c228b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b528ab0c228b author: alanb date: Fri Jan 11 12:27:57 2013 +0000 8005566: (fs) test/java/nio/file/Files/Misc.java failing (sol) Reviewed-by: chegar changeset 380a8da01aac in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=380a8da01aac author: kshefov date: Mon Feb 25 10:51:21 2013 +0000 8006070: TEST_BUG: Up and down the Y coordinate of the mouse position, the selected item doesn't change for the single list. Reviewed-by: serb, anthony changeset 494f23e3dac8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=494f23e3dac8 author: chegar date: Thu Jun 23 13:15:14 2011 +0100 7021010: java/lang/Thread/ThreadStateTest.java fails intermittently Reviewed-by: dholmes, alanb, mchung changeset 6f2aac9b0471 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6f2aac9b0471 author: chegar date: Fri Mar 01 14:41:39 2013 +0000 7081476: test/java/net/InetSocketAddress/B6469803.java failing intermittently Reviewed-by: chegar Contributed-by: Eric Wang changeset 0c1d463a0406 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0c1d463a0406 author: chegar date: Fri Mar 01 15:28:53 2013 +0000 Merge changeset 87e45d30e24d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=87e45d30e24d author: katleman date: Wed Feb 13 18:19:42 2013 -0800 Added tag jdk7u15-b30 for changeset 70b0f967c064 changeset b5ae6fb92e71 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b5ae6fb92e71 author: katleman date: Mon Feb 18 12:10:06 2013 -0800 Added tag jdk7u15-b03 for changeset 87e45d30e24d changeset 8a980f97e66a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8a980f97e66a author: katleman date: Tue Feb 26 12:42:17 2013 -0800 Added tag jdk7u17-b01 for changeset b5ae6fb92e71 changeset 0dcf8ad3e63d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0dcf8ad3e63d author: bae date: Thu Feb 14 19:51:51 2013 +0400 8007014: Improve image handling Reviewed-by: prr, mschoene, jgodinez changeset b130c8cfecfc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b130c8cfecfc author: bae date: Thu Feb 21 11:25:43 2013 +0400 8007675: Improve color conversion Reviewed-by: prr, jgodinez changeset a474615061bf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a474615061bf author: katleman date: Fri Mar 01 11:55:30 2013 -0800 Added tag jdk7u17-b02 for changeset b130c8cfecfc changeset c0815331901f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c0815331901f author: coffeys date: Tue Mar 05 14:38:45 2013 +0000 Merge changeset 20fbd2f13667 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=20fbd2f13667 author: katleman date: Wed Feb 27 16:52:05 2013 -0800 Added tag jdk7u14-b14 for changeset 3982fc37bc25 changeset eba4ade30476 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=eba4ade30476 author: mfang date: Wed Feb 27 19:47:13 2013 -0800 8008764: 7uX l10n resource file translation update Reviewed-by: naoto changeset 2eb3ac105b7f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2eb3ac105b7f author: mfang date: Wed Feb 27 21:05:09 2013 -0800 Merge changeset d7289f98e6c0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d7289f98e6c0 author: lana date: Tue Mar 05 17:04:51 2013 -0800 Merge changeset 491e3b0c2105 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=491e3b0c2105 author: vkarnauk date: Wed Mar 06 20:30:47 2013 +0400 4199622: RFE: JComboBox shouldn't sending ActionEvents for keyboard navigation Reviewed-by: alexp, alexsch changeset 2578df0c85f1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2578df0c85f1 author: michaelm date: Wed Dec 21 10:06:32 2011 +0000 7078386: NetworkInterface.getNetworkInterfaces() may return corrupted results on linux Reviewed-by: michaelm, alanb, chegar Contributed-by: brandon.passanisi at oracle.com changeset 901e346b6238 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=901e346b6238 author: weijun date: Fri Mar 08 17:39:32 2013 +0800 8009617: jarsigner fails when TSA response contains a status string Reviewed-by: mullan changeset a13cb8924de8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a13cb8924de8 author: ksrini date: Sun Dec 09 07:43:12 2012 -0800 8004042: Arrrghs.java test failed on windows with access error. Reviewed-by: smarks, jjh, ksrini Contributed-by: david.dehaven at oracle.com changeset f371d9a1496f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f371d9a1496f author: prr date: Tue Feb 12 09:58:21 2013 -0800 8007748: MacOSX build error : cast of type 'SEL' to 'uintptr_t' (aka 'unsigned long') is deprecated; use sel_getName instead Reviewed-by: anthony changeset 1ea1197801d1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1ea1197801d1 author: mcherkas date: Mon Mar 11 22:27:18 2013 +0400 6877495: JTextField and JTextArea does not support supplementary characters Reviewed-by: serb, alexp changeset b03bbdef3a88 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b03bbdef3a88 author: mduigou date: Mon Mar 11 14:11:30 2013 -0700 8006593: Peformance and compatibility improvements to hash based Map implementations. Summary: Use ThreadLocalRandom for hash seed rather than shared Random. Initialize HashMap.hashSeed only as needed. Reviewed-by: alanb, bchristi, shade changeset b8009df64dc8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b8009df64dc8 author: peytoia date: Fri Mar 15 20:35:51 2013 +0900 8009987: (tz) Support tzdata2013b Reviewed-by: okutsu changeset 965f6e358f61 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=965f6e358f61 author: katleman date: Thu Mar 07 11:08:39 2013 -0800 Added tag jdk7u14-b15 for changeset 2eb3ac105b7f changeset 555ea0c4e956 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=555ea0c4e956 author: lana date: Mon Mar 11 14:51:45 2013 -0700 Merge changeset 950fa827c2ec in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=950fa827c2ec author: katleman date: Wed Mar 13 17:18:14 2013 -0700 Added tag jdk7u14-b16 for changeset 555ea0c4e956 changeset 8f2eb1f897c4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8f2eb1f897c4 author: lana date: Mon Mar 18 10:16:36 2013 -0700 Merge changeset 2e974e6ee037 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2e974e6ee037 author: alitvinov date: Wed Mar 20 20:49:52 2013 +0400 6550588: java.awt.Desktop cannot open file with Windows UNC filename Reviewed-by: art, uta changeset b6d3fed1f4b5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b6d3fed1f4b5 author: coffeys date: Thu Mar 21 12:37:00 2013 +0000 8007315: HttpURLConnection.filterHeaderField method returns null where empty string is expected Reviewed-by: chegar changeset d07c9d4269fc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d07c9d4269fc author: sherman date: Fri Jan 11 22:43:29 2013 -0800 8005466: JAR file entry hash table uses too much memory (zlib_util.c) Summary: realign the fields of jzcell struct Reviewed-by: sherman Contributed-by: ioi.lam at oracle.com changeset 3ddd92f1e684 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3ddd92f1e684 author: weijun date: Fri Mar 22 19:59:14 2013 +0800 8000624: Move MaxRetries.java to ProblemList for the moment 8010531: Add BadKdc* tests to problem list for solaris-sparcv9 Reviewed-by: alanb changeset 57eae5ab5a75 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=57eae5ab5a75 author: robm date: Thu Mar 14 00:21:34 2013 +0000 8009650: HttpClient available() check throws SocketException when connection has been closed Reviewed-by: chegar, khazra, dsamersoff Contributed-by: sdouglas at redhat.com changeset f5296c31f226 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f5296c31f226 author: robm date: Thu Mar 21 17:33:15 2013 +0000 8009251: Add proxy handling and keep-alive fixes to jsse Reviewed-by: chegar changeset 5bb351598308 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5bb351598308 author: chegar date: Wed Mar 20 14:39:20 2013 +0000 8010282: sun.net.www.protocol.jar.JarFileFactory.close(JarFile) should be thread-safe Reviewed-by: khazra, alanb changeset 790d7cc1decd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=790d7cc1decd author: malenkov date: Mon Mar 25 11:56:08 2013 +0400 7163696: JCK Swing interactive test JScrollBarTest0013 fails with Nimbus and GTK L&Fs Reviewed-by: alexsch, serb changeset 6d99cacbd19e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6d99cacbd19e author: malenkov date: Mon Mar 25 12:07:14 2013 +0400 8000183: JCK/7b59: api/java_beans/Introspector/descriptions_Introspector fails on arm platforms Reviewed-by: alexsch changeset 837004f93d74 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=837004f93d74 author: katleman date: Mon Mar 25 15:43:32 2013 -0700 8006120: Provide "Server JRE" for 7u train Reviewed-by: pbhat, cgruszka Contributed-by: amy.y.wang at oracle.com changeset c5ed3000a57f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c5ed3000a57f author: khazra date: Tue Mar 26 10:57:11 2013 -0700 7160242: (prefs) Preferences.remove(null) does not throw NPE [macosx] Summary: Insert null check of argument in remove()'s implementation Reviewed-by: forax, chegar, alanb changeset d8525f6a3e11 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d8525f6a3e11 author: katleman date: Wed Mar 20 14:47:52 2013 -0700 Added tag jdk7u14-b17 for changeset 950fa827c2ec changeset e7ba683c1500 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e7ba683c1500 author: lana date: Mon Mar 25 10:30:25 2013 -0700 Merge changeset b05c71e97f84 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b05c71e97f84 author: lana date: Tue Mar 26 22:21:38 2013 -0700 Merge changeset e945099a910a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e945099a910a author: vkarnauk date: Fri Mar 29 20:26:35 2013 +0400 8009221: [macosx] Two closed/javax/swing regression tests fail on MacOSX. Reviewed-by: alexp, serb changeset 44a32ac28b54 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=44a32ac28b54 author: jgish date: Thu Jan 10 15:09:45 2013 -0500 8005582: java/lang/Runtime/exec/WinCommand.java intermittent test failures Summary: Remove file-deletion code at cleanup which conflicts with jtreg cleanup Reviewed-by: chegar changeset 53585f4d6494 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=53585f4d6494 author: jbachorik date: Tue Feb 05 12:28:47 2013 +0100 7170447: Intermittent DeadListenerTest.java failure Summary: Due to asynchronous nature of processing server notifications it may happen that an "unregister" notification ha$ Reviewed-by: sjiang changeset 1aa871010e23 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1aa871010e23 author: khazra date: Tue Apr 02 12:01:35 2013 -0700 7197662: (prefs) java/util/prefs/AddNodeChangeListener.java fails by timeout or by "couldn't get file lock" Summary: Set -Djava.util.prefs.userRoot to current working directory of user in the prefs tests Reviewed-by: alanb, chegar, weijun, dxu changeset 885ad3351534 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=885ad3351534 author: anthony date: Wed Jan 18 19:09:26 2012 +0400 7130662: GTK file dialog crashes with a NPE Summary: Guard adding a back slash to the directory name with an if (!= null) check Reviewed-by: anthony, art Contributed-by: Matt changeset a73850b94c05 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a73850b94c05 author: andrew date: Wed Apr 03 14:17:01 2013 +0100 Merge jdk7u14-b17 changeset bc455fc9948f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bc455fc9948f author: andrew date: Wed Apr 03 14:18:05 2013 +0100 Merge changeset 95d1d08e82c1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=95d1d08e82c1 author: bchristi date: Mon Jan 07 13:19:03 2013 -0800 8003228: (props) sun.jnu.encoding should be set to UTF-8 [macosx] Summary: Hard-code sun.jnu.encoding to UTF-8 on Mac Reviewed-by: naoto changeset 27d1b555eb3c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=27d1b555eb3c author: bchristi date: Thu Jan 10 10:21:44 2013 -0800 8005962: TEST_BUG: java/util/Properties/MacJNUEncoding can fail in certain environments Summary: Test script now sets LC_ALL, other small changes, relocate test Reviewed-by: naoto, alanb changeset f3495513def2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f3495513def2 author: bchristi date: Thu Apr 04 00:39:47 2013 +0100 8006039: test/tools/launcher/I18NJarTest.java fails on Mac w/ LANG=C, LC_ALL=C Summary: Avoid automated test failure by just exiting when in 'C' locale Reviewed-by: naoto, ksrini changeset 85da6a7e9f85 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=85da6a7e9f85 author: jzavgren date: Tue Feb 19 16:19:09 2013 +0000 8007609: WinNTFileSystem_md.c should correctly check value returned from realloc Reviewed-by: alanb, chegar, dholmes changeset 9cf3e367b99b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9cf3e367b99b author: mchung date: Wed Jan 09 16:58:47 2013 -0800 7103957: NegativeArraySizeException while initializing class IntegerCache Reviewed-by: darcy, mchung Contributed-by: brian.burkhalter at oracle.com changeset 552ab255158d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=552ab255158d author: mcherkas date: Thu Apr 04 19:18:24 2013 +0400 8010925: COPY AND PASTE TO AND FROM SIGNED APPLET FAILS AFTER FIRST INTERNAL COPY PRFRMD Reviewed-by: anthony, serb changeset 838c5b329903 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=838c5b329903 author: alanb date: Wed Apr 03 13:15:39 2013 +0100 8011234: Performance regression with ftp protocol when uploading in image mode Reviewed-by: chegar changeset eb4807b899c8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=eb4807b899c8 author: katleman date: Wed Mar 27 16:18:43 2013 -0700 Added tag jdk7u14-b18 for changeset e7ba683c1500 changeset a249c45148c5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a249c45148c5 author: katleman date: Wed Apr 03 15:15:59 2013 -0700 Added tag jdk7u14-b19 for changeset eb4807b899c8 changeset fb713b962c0c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fb713b962c0c author: katleman date: Fri Apr 05 09:10:53 2013 -0700 Added tag jdk7u14-b19 for changeset a249c45148c5 changeset 1fc4a8d78ef7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1fc4a8d78ef7 author: lana date: Wed Apr 03 12:49:46 2013 -0700 Merge changeset bb8764ec11c2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bb8764ec11c2 author: lana date: Mon Apr 08 11:37:19 2013 -0700 Merge changeset 0a00f10abb2d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0a00f10abb2d author: katleman date: Wed Apr 10 10:30:17 2013 -0700 Added tag jdk7u14-b20 for changeset bb8764ec11c2 changeset da56a559556a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=da56a559556a author: lana date: Wed Apr 10 12:46:54 2013 -0700 Merge changeset faaa56f45475 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=faaa56f45475 author: weijun date: Thu Apr 11 10:58:17 2013 +0800 8005460: [findbugs] Probably returned array should be cloned Reviewed-by: xuelei changeset b7a065df19ad in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b7a065df19ad author: kshefov date: Fri Apr 12 15:52:46 2013 +0400 8009881: TEST_BUG: javax/swing/JTree/8004298/bug8004298.java should be modified Reviewed-by: serb, alexsch, coffeys changeset cface35aaf24 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cface35aaf24 author: ant date: Mon Apr 15 15:20:41 2013 +0400 7147075: JTextField doesn't get focus or loses focus forever Reviewed-by: anthony changeset fe4ada6c96c7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe4ada6c96c7 author: xuelei date: Mon Apr 15 08:37:16 2013 -0700 7109274: Restrict the use of certificates with RSA keys less than 1024 bits Summary: This restriction is applied via the Java Security property, "jdk.certpath.disabledAlgorithms". This will impact providers that adhere to this security property. Reviewed-by: mullan changeset e17bc65c4784 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e17bc65c4784 author: weijun date: Thu Apr 11 11:10:03 2013 +0800 8011745: Unknown CertificateChoices Reviewed-by: vinnie changeset b5494c58ca19 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b5494c58ca19 author: weijun date: Thu Apr 11 11:09:50 2013 +0800 8011867: Accept unknown PKCS #9 attributes Reviewed-by: vinnie changeset c1627d99c83b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c1627d99c83b author: mullan date: Fri Dec 21 14:54:57 2012 -0500 8003445: Adjust JAX-WS to focus on API Reviewed-by: vinnie, ahgross, mgrebac changeset a177f85250d2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a177f85250d2 author: chegar date: Thu Dec 20 13:40:27 2012 +0000 8003335: Better handling of Finalizer thread Reviewed-by: alanb, ahgross changeset 76cbfffea7d2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=76cbfffea7d2 author: vkarnauk date: Thu Jan 24 18:05:49 2013 +0400 7124347: [macosx] "java.lang.InternalError: not implemented yet" on call Graphics2D.drawRenderedImage Reviewed-by: bae changeset c68f28843814 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c68f28843814 author: ewendeli date: Fri Jan 18 22:01:17 2013 +0100 Merge changeset 81cc809b7f78 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=81cc809b7f78 author: ewendeli date: Wed Jan 30 14:16:38 2013 +0100 Merge changeset 64f920894073 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=64f920894073 author: ewendeli date: Wed Jan 30 14:17:02 2013 +0100 Merge changeset 8261e56b7f91 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8261e56b7f91 author: malenkov date: Tue Feb 05 20:18:16 2013 +0400 8006790: Improve checking for windows Reviewed-by: art, mschoene changeset 76eb3fb80740 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=76eb3fb80740 author: dmocek date: Tue Feb 05 16:38:25 2013 -0800 8001329: Augment RMI logging Reviewed-by: smarks, hawtin, alanb changeset 47114a90798b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=47114a90798b author: wetmore date: Thu Feb 07 11:48:13 2013 -0800 8006777: Improve TLS handling of invalid messages Reviewed-by: wetmore, ahgross changeset bf2faf293bae in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bf2faf293bae author: prr date: Thu Feb 07 12:14:31 2013 -0800 8006795: Improve font warning messages Reviewed-by: bae, jgodinez, mschoene changeset 987fdb610c5b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=987fdb610c5b author: katleman date: Thu Feb 07 14:20:54 2013 -0800 Added tag jdk7u21-b01 for changeset 8261e56b7f91 changeset 74ff8f689293 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=74ff8f689293 author: katleman date: Thu Feb 07 14:25:31 2013 -0800 Merge changeset 2affe5a0e986 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2affe5a0e986 author: valeriep date: Thu Feb 07 16:18:32 2013 -0800 8007688: Blacklist known bad certificate Summary: Added two known bad certs to the blacklist certs. Reviewed-by: mullan changeset 343ecd8dee6f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=343ecd8dee6f author: malenkov date: Fri Feb 08 18:06:56 2013 +0400 7200507: Refactor Introspector internals Reviewed-by: ahgross, art changeset b6645161a51b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b6645161a51b author: ewendeli date: Mon Feb 11 21:09:32 2013 +0100 Merge changeset 7ca8a40795d8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7ca8a40795d8 author: michaelm date: Wed Feb 13 10:47:15 2013 +0000 8000724: Improve networking serialization Summary: delegate InetAddress fields to a holder object Reviewed-by: alanb, chegar changeset d00ab6592b1e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d00ab6592b1e author: michaelm date: Wed Feb 13 10:50:09 2013 +0000 Merge changeset 3e2d47699a54 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3e2d47699a54 author: bae date: Thu Feb 14 19:51:51 2013 +0400 8007014: Improve image handling Reviewed-by: prr, mschoene, jgodinez changeset 8a95f38503fe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8a95f38503fe author: prr date: Fri Feb 15 11:25:43 2013 -0800 8008249: Sync ICU into JDK : Reviewed-by: bae, jgodinez changeset f4718907cb4c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f4718907cb4c author: joehw date: Thu Feb 28 18:33:17 2013 +0000 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset 2497a6814edf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2497a6814edf author: serb date: Tue Feb 19 20:40:48 2013 +0400 8004261: Improve input validation Reviewed-by: art, mschoene, amenkov changeset 54ea520a17d8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=54ea520a17d8 author: mkos date: Wed Feb 20 22:26:11 2013 +0100 8005432: Update access to JAX-WS Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset ddd9e6df700f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ddd9e6df700f author: bae date: Thu Feb 21 11:25:43 2013 +0400 8007675: Improve color conversion Reviewed-by: prr, jgodinez changeset cf93d3828aa8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cf93d3828aa8 author: bae date: Fri Feb 22 15:14:25 2013 +0400 8007617: Better validation of images Reviewed-by: prr, jgodinez changeset da1867780fc9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=da1867780fc9 author: dsamersoff date: Mon Feb 25 20:06:22 2013 +0400 8006435: Improvements in JMX Summary: Improvements in JMX Reviewed-by: dfuchs, skoivu changeset 09c9880d963c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09c9880d963c author: weijun date: Tue Jul 17 11:57:37 2012 +0800 7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified Reviewed-by: mullan changeset 9b3a79d4de4e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9b3a79d4de4e author: alexsch date: Mon Aug 06 15:51:54 2012 +0400 7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue Reviewed-by: rupashka changeset 8e37b198a7f8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8e37b198a7f8 author: dsamersoff date: Thu Aug 09 17:42:55 2012 +0400 7183753: [TEST] Some colon in the diff for this test Summary: Reference output file contains extra colon Reviewed-by: sspitsyn, mgronlun changeset 13d620adfddf in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=13d620adfddf author: dmocek date: Sun Feb 24 13:42:45 2013 +0000 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset 57a64968f048 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=57a64968f048 author: dmocek date: Wed Jul 18 10:04:45 2012 -0700 7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java 7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java Reviewed-by: smarks changeset cd318237595a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cd318237595a author: dmocek date: Fri Jul 27 16:53:15 2012 -0700 7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup Reviewed-by: smarks, jgish changeset 24338468fb0b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=24338468fb0b author: dmocek date: Sat Sep 08 00:03:36 2012 -0700 6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently Reviewed-by: dholmes, smarks Contributed-by: Eric Wang changeset cee3fc28f672 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cee3fc28f672 author: olagneau date: Mon Aug 27 11:44:45 2012 -0700 7144861: speed up RMI activation tests Reviewed-by: alanb, smarks, dholmes, dmocek changeset bc3fd86f0db5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bc3fd86f0db5 author: alanb date: Thu Aug 16 14:35:26 2012 +0100 7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin Reviewed-by: alanb, dmocek, smarks Contributed-by: Eric Wang changeset fe59b52c0e19 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe59b52c0e19 author: vkarnauk date: Thu Sep 20 21:08:33 2012 +0400 7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows Reviewed-by: rupashka changeset 9b40f6929904 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9b40f6929904 author: smarks date: Thu Sep 20 13:29:43 2012 -0700 7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx Reviewed-by: alanb, coffeys changeset 4afe5648fc4b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4afe5648fc4b author: juh date: Fri Sep 28 11:20:31 2012 +0800 7054918: jdk_security1 test target cleanup Reviewed-by: xuelei, weijun changeset 4cf06c5f6ea3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4cf06c5f6ea3 author: juh date: Fri Sep 28 11:20:32 2012 +0800 7055362: jdk_security2 test target cleanup Reviewed-by: xuelei, weijun changeset ed711ff32c58 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ed711ff32c58 author: juh date: Sun Feb 24 14:20:46 2013 +0000 7055363: jdk_security3 test target cleanup Reviewed-by: xuelei, weijun changeset 2c037334c52c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2c037334c52c author: robm date: Thu Oct 11 18:24:38 2012 +0100 7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] Reviewed-by: alanb, martin, dholmes changeset fe6116018ae2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe6116018ae2 author: robm date: Mon Oct 15 03:26:11 2012 +0100 8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java Reviewed-by: alanb, martin changeset 1603a035b39f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1603a035b39f author: dxu date: Mon Jul 30 04:57:27 2012 +0100 7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] Reviewed-by: alanb changeset 7961d6927864 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7961d6927864 author: alanb date: Sat Sep 10 14:55:14 2011 +0100 7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile Reviewed-by: darcy, jrose changeset 2a90f1b1f8ed in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2a90f1b1f8ed author: weijun date: Sat Jul 21 19:56:55 2012 +0800 7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout Reviewed-by: xuelei changeset baafc82c0b2b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=baafc82c0b2b author: dfuchs date: Wed Nov 07 13:24:39 2012 +0100 6720349: (ch) Channels tests depending on hosts inside Sun Summary: This changeset make the nio tests start small TCP or UDP servers from within the tests, instead of relying on external services. Reviewed-by: alanb changeset 05bb8900c9fa in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05bb8900c9fa author: alanb date: Fri Jun 24 19:30:39 2011 +0100 6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long Reviewed-by: chegar changeset c681391a2856 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c681391a2856 author: weijun date: Thu Oct 27 17:23:25 2011 +0800 7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu Reviewed-by: alanb changeset 8565b03192c3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8565b03192c3 author: alanb date: Sun Jun 10 10:29:27 2012 +0100 7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset Reviewed-by: minqi changeset ff0406a6d9c5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ff0406a6d9c5 author: robm date: Wed Nov 28 00:47:38 2012 +0000 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests Reviewed-by: chegar changeset dd7dede81a3a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dd7dede81a3a author: kshefov date: Fri Nov 30 15:21:53 2012 +0000 7072120: No mac os x support in several regression tests Reviewed-by: anthony, serb changeset 208a102d75a6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=208a102d75a6 author: kshefov date: Fri Nov 30 15:36:11 2012 +0000 7147408: [macosx] Add autodelay to fix a regression test Reviewed-by: anthony, alexsch changeset a9e04846fdbe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a9e04846fdbe author: smarks date: Wed Dec 12 09:53:01 2012 -0800 8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung changeset 859b1a6a1986 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=859b1a6a1986 author: alexp date: Fri Dec 21 18:59:10 2012 +0400 8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx Reviewed-by: anthony, alexsch changeset 7271cd8bc3ff in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7271cd8bc3ff author: weijun date: Tue Jul 17 11:28:16 2012 +0800 7183203: ShortRSAKeynnn.sh tests intermittent failure Reviewed-by: xuelei changeset 7f2158d5b321 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7f2158d5b321 author: kshefov date: Thu Jan 17 14:47:01 2013 +0000 7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default Reviewed-by: yan, alexsch changeset 1356610783e2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1356610783e2 author: robm date: Sun Feb 24 16:53:31 2013 +0000 7162111: TEST_BUG: change tests run in headless mode [macosx] Reviewed-by: uta changeset fa2600b22b9c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fa2600b22b9c author: alanb date: Mon Nov 21 12:51:30 2011 +0000 7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently Reviewed-by: forax, chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 347a2e8436a9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=347a2e8436a9 author: juh date: Thu Jan 31 16:47:54 2013 -0500 8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode Reviewed-by: mullan changeset 24a31f177411 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=24a31f177411 author: weijun date: Fri Feb 01 07:39:41 2013 +0800 8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit Reviewed-by: alanb changeset 83c4b326f1f9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=83c4b326f1f9 author: chegar date: Tue Mar 13 09:33:50 2012 +0000 7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate Reviewed-by: alanb changeset dd51e090cd49 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dd51e090cd49 author: chegar date: Thu Dec 13 09:55:55 2012 +0000 8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff changeset 8d2b3ba77836 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8d2b3ba77836 author: chegar date: Sat Dec 29 11:00:15 2012 +0000 8005556: java/net/Socks/SocksV4Test.java is missing @run tag Reviewed-by: alanb changeset 30ce26df6899 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=30ce26df6899 author: chegar date: Sun Jan 20 09:37:51 2013 +0000 8006560: java/net/ipv6tests/B6521014.java fails intermittently Reviewed-by: khazra, wetmore changeset 1df65a451e1c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1df65a451e1c author: jgish date: Wed Dec 05 21:08:14 2012 -0800 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks changeset 82d054cd500f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=82d054cd500f author: jgish date: Thu Jan 17 15:09:46 2013 -0500 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou changeset be401df6dfdc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be401df6dfdc author: smarks date: Thu Dec 20 20:11:45 2012 -0800 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek changeset 67c480f11a5a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=67c480f11a5a author: chegar date: Wed Jan 23 14:45:44 2013 +0000 8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb changeset 0f70a5ab2a58 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0f70a5ab2a58 author: smarks date: Mon Jan 07 18:09:07 2013 -0800 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently Summary: Tighten up JavaVM test library API, and adjust tests to match. Reviewed-by: mchung, dmocek changeset f29796a18815 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f29796a18815 author: smarks date: Tue Jan 22 18:30:49 2013 -0800 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung changeset a87830a55788 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a87830a55788 author: kshefov date: Mon Feb 11 14:37:57 2013 +0000 7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal Reviewed-by: serb, alexsch changeset 91b635126bf9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=91b635126bf9 author: chegar date: Fri Sep 07 14:00:31 2012 +0100 7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address Summary: TESTBUG Reviewed-by: chegar, alanb Contributed-by: Eric Wang changeset 77d4b570dee2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=77d4b570dee2 author: chegar date: Wed Apr 04 15:14:00 2012 +0100 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes changeset ce745b7a002a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ce745b7a002a author: chegar date: Wed Nov 23 12:30:19 2011 +0000 6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX Reviewed-by: chegar, dholmes Contributed-by: gary.adams at oracle.com changeset cbca8d8fd359 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cbca8d8fd359 author: chegar date: Thu Aug 25 16:08:31 2011 +0100 7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 Reviewed-by: alanb, chegar Contributed-by: kurchi.subhra.hazra at oracle.com changeset 9d4942c9f550 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9d4942c9f550 author: chegar date: Tue Aug 09 16:39:04 2011 +0100 7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) Reviewed-by: mchung changeset 1eb710f143c4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1eb710f143c4 author: chegar date: Tue Aug 09 16:59:44 2011 +0100 7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin Reviewed-by: alanb, dcubed changeset e1df2988b6cb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e1df2988b6cb author: chegar date: Wed Feb 08 11:16:52 2012 +0000 7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc Reviewed-by: dholmes changeset 9c30829b6aa5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9c30829b6aa5 author: chegar date: Tue Nov 06 21:01:43 2012 +0000 8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently Reviewed-by: alanb, dsamersoff changeset 2ba7716915ab in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2ba7716915ab author: gadams date: Wed Feb 08 11:18:29 2012 +0000 6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient Reviewed-by: chegar, dholmes, alanb changeset 9272222ac3a5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9272222ac3a5 author: gadams date: Wed Feb 08 11:19:25 2012 +0000 6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing Reviewed-by: chegar, dholmes, alanb changeset 93c1f96deab9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=93c1f96deab9 author: gadams date: Mon Jan 09 19:33:02 2012 +0000 7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space Reviewed-by: alanb changeset d16245602a1d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d16245602a1d author: khazra date: Tue Apr 17 11:59:12 2012 -0700 7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows Summary: Remove usage of HTTP Server at test/sun/net/www/httptest Reviewed-by: chegar, alanb changeset 03e65eaead5a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=03e65eaead5a author: khazra date: Thu Apr 19 13:26:06 2012 -0700 7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again Summary: Enable finding "foo1.jar" Reviewed-by: chegar changeset e960a4ca5391 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e960a4ca5391 author: alanb date: Sat Nov 19 19:55:19 2011 +0000 6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently Reviewed-by: dholmes, alanb, forax Contributed-by: gary.adams at oracle.com changeset 2a8777f43574 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2a8777f43574 author: alanb date: Sat Nov 19 20:03:00 2011 +0000 6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java Reviewed-by: alanb, dholmes, forax Contributed-by: gary.adams at oracle.com changeset 8e0c7268365b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8e0c7268365b author: smarks date: Tue Feb 12 14:41:18 2013 -0800 8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 Reviewed-by: alanb, mchung, dmocek changeset 4acbbe4842db in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4acbbe4842db author: kshefov date: Thu Feb 14 14:14:19 2013 +0000 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified Summary: Added @build Util jtreg tag Reviewed-by: serb, alexsch Contributed-by: Vera Akulova changeset 519c770fd603 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=519c770fd603 author: kshefov date: Mon Feb 18 09:31:10 2013 +0000 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. Reviewed-by: serb, denis Contributed-by: Vera Akulova changeset 85745d3e7570 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=85745d3e7570 author: chegar date: Fri Feb 15 11:06:52 2013 +0000 8008223: java/net/BindException/Test.java fails rarely Reviewed-by: khazra, alanb changeset e4ce81d2fde7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4ce81d2fde7 author: fparain date: Wed Feb 15 09:29:05 2012 -0800 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently Reviewed-by: alanb changeset b25f89903b7d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b25f89903b7d author: sla date: Tue Mar 20 12:48:48 2012 +0100 7154114: jstat tests failing on non-english locales 7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system Reviewed-by: rbackman, kamg, dsamersoff changeset e50c0008c54f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e50c0008c54f author: sla date: Mon Oct 29 09:23:55 2012 +0100 8001621: Update awk scripts that check output from jps/jcmd Reviewed-by: alanb changeset 9ea6ed75c423 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9ea6ed75c423 author: kshefov date: Wed Feb 20 17:07:30 2013 +0000 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. Reviewed-by: serb, anthony changeset dcfe61818131 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dcfe61818131 author: fparain date: Tue Feb 14 07:28:29 2012 -0800 7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes changeset 2d6cd3a7fc4b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2d6cd3a7fc4b author: sla date: Wed Sep 05 14:42:44 2012 +0200 6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh Summary: Make tests more resilient by allowing for more error messages from jps Reviewed-by: alanb, rbackman, dsamersoff changeset c29d0c608f63 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c29d0c608f63 author: jjg date: Tue Aug 28 10:29:30 2012 +0100 7194032: update tests for upcoming changes for jtreg Reviewed-by: alanb, iris, smarks changeset 4f23795e86a4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4f23795e86a4 author: jjg date: Tue Aug 28 10:31:27 2012 +0100 7194035: update tests for upcoming changes for jtreg Reviewed-by: alanb, sspitsyn changeset ba4a53110efe in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba4a53110efe author: coffeys date: Mon Feb 25 16:17:37 2013 +0000 8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up Reviewed-by: chegar, alanb changeset 6784c9903db7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6784c9903db7 author: prr date: Mon Feb 25 09:52:53 2013 -0800 8004986: Better handling of glyph table 8004987: Improve font layout 8004994: Improve checking of glyph table Reviewed-by: bae, mschoene, jgodinez Contributed-by: steven.loomis at oracle.com changeset d868fe7c7618 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d868fe7c7618 author: bae date: Tue Feb 26 00:15:17 2013 +0400 8007667: Better image reading Reviewed-by: prr, jgodinez changeset 90c9f1577a0b in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=90c9f1577a0b author: bae date: Tue Feb 26 01:27:17 2013 +0400 8007918: Better image writing Reviewed-by: prr, jgodinez changeset f9fda42383a2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f9fda42383a2 author: raginip date: Fri Mar 01 14:06:10 2013 +0000 8007406: Improve accessibility of AccessBridge Reviewed-by: skoivu, mullan, ptbrunet changeset 43470f123b3a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=43470f123b3a author: uta date: Tue Feb 26 15:58:40 2013 +0400 8005943: (process) Improved Runtime.exec Reviewed-by: alanb, ahgross changeset f098e2297ff1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f098e2297ff1 author: smarks date: Wed Feb 27 13:58:55 2013 -0800 8001040: Rework RMI model Reviewed-by: alanb, ahgross, coffeys, dmocek changeset 20f287fec09f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=20f287fec09f author: vlivanov date: Fri Mar 01 03:50:17 2013 +0400 8009049: Better method handle binding Reviewed-by: jrose, twisti, jdn changeset 9cc342866505 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9cc342866505 author: vlivanov date: Fri Mar 01 03:50:33 2013 +0400 8008140: Better method handle resolution Reviewed-by: jrose, twisti, jdn changeset 4f7b8bc95616 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4f7b8bc95616 author: dsamersoff date: Fri Mar 01 21:35:49 2013 +0400 8009165: Fix for 8008817 needs revision Summary: The fix for JDK-8008817 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil. Reviewed-by: alanb, mchung, dfuchs changeset 245c2dce7225 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=245c2dce7225 author: srl date: Mon Mar 04 12:29:30 2013 -0800 8001031: Better font processing. Reviewed-by: vadim, prr, mschoene changeset 5cedcee76fc0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5cedcee76fc0 author: katleman date: Tue Oct 16 14:55:29 2012 -0700 Added tag jdk7u9-b31 for changeset 3b1a395f1948 changeset 77f7e5f13763 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=77f7e5f13763 author: alitvinov date: Mon Oct 29 14:05:59 2012 -0700 7193219: JComboBox serialization fails in JDK 1.7 Reviewed-by: rupashka, anthony changeset 1b8a18bbf499 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1b8a18bbf499 author: katleman date: Wed Oct 31 10:12:15 2012 -0700 Added tag jdk7u9-b32 for changeset 77f7e5f13763 changeset 3e939c1535ce in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3e939c1535ce author: asaha date: Tue Dec 04 11:46:43 2012 -0800 Merge changeset 3515fd583ede in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3515fd583ede author: asaha date: Wed Dec 05 15:32:00 2012 -0800 Merge changeset 0c222d0e08a5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0c222d0e08a5 author: katleman date: Fri Dec 07 08:19:26 2012 -0800 Added tag jdk7u10-b31 for changeset 3515fd583ede changeset c7282a85c6bc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c7282a85c6bc author: ewendeli date: Tue Jan 15 08:23:44 2013 +0100 Merge changeset 9a709a8e6108 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9a709a8e6108 author: katleman date: Wed Jan 16 13:57:37 2013 -0800 Added tag jdk7u11-b32 for changeset c7282a85c6bc changeset 01a966bf7e0d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=01a966bf7e0d author: bae date: Wed Dec 05 16:55:05 2012 +0400 7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage Reviewed-by: prr, flar changeset 8fd5e105c6a2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8fd5e105c6a2 author: alitvinov date: Fri Jan 18 18:42:26 2013 +0400 8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X Reviewed-by: art, serb changeset b080c575bd84 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b080c575bd84 author: katleman date: Tue Jan 29 14:11:08 2013 -0800 Added tag jdk7u11-b33 for changeset 8fd5e105c6a2 changeset 4ce8abdfdcba in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4ce8abdfdcba author: asaha date: Fri Feb 08 19:25:18 2013 -0800 Merge changeset 9f2046826507 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f2046826507 author: asaha date: Mon Feb 11 11:17:13 2013 -0800 Merge changeset 25d31e811ea0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=25d31e811ea0 author: katleman date: Tue Feb 12 12:33:04 2013 -0800 Added tag jdk7u15-b31 for changeset 9f2046826507 changeset e52ec1a93974 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e52ec1a93974 author: dcherepanov date: Sat Dec 29 17:43:32 2012 +0400 8001161: mac: EmbeddedFrame doesn't become active window Reviewed-by: ant changeset 23fcb7fce77c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=23fcb7fce77c author: ksrini date: Fri Feb 01 07:25:51 2013 -0800 8006536: [launcher] removes trailing slashes on arguments Reviewed-by: ksrini, akhil Contributed-by: jviswana at linux.vnet.ibm.com changeset 41edc28b57f6 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=41edc28b57f6 author: asaha date: Tue Feb 12 15:05:36 2013 -0800 Merge changeset 3ef25219292f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3ef25219292f author: asaha date: Thu Feb 14 13:23:15 2013 -0800 Merge changeset d0f5d16f8307 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d0f5d16f8307 author: katleman date: Tue Feb 19 12:03:12 2013 -0800 Added tag jdk7u15-b33 for changeset 3ef25219292f changeset 677b1c6b04ee in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=677b1c6b04ee author: asaha date: Fri Mar 01 16:12:33 2013 -0800 Merge changeset 1f831ccc12f5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1f831ccc12f5 author: cl date: Sat Mar 02 09:47:59 2013 -0800 Added tag jdk7u17-b30 for changeset a474615061bf changeset 1ad6f413e250 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1ad6f413e250 author: asaha date: Sat Mar 02 14:39:07 2013 -0800 Merge changeset 6c6b9d7943e7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6c6b9d7943e7 author: cl date: Sat Mar 02 18:56:06 2013 -0800 Added tag jdk7u17-b31 for changeset 1ad6f413e250 changeset 62eee603f25a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=62eee603f25a author: asaha date: Mon Mar 04 11:46:59 2013 -0800 Merge changeset 698d0997fef1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=698d0997fef1 author: asaha date: Mon Mar 04 12:35:10 2013 -0800 Merge changeset af6be9d7aed7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=af6be9d7aed7 author: coffeys date: Tue Mar 05 00:22:26 2013 +0000 Merge changeset 17ac71e7b720 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=17ac71e7b720 author: katleman date: Tue Mar 05 16:46:10 2013 -0800 Added tag jdk7u21-b05 for changeset af6be9d7aed7 changeset 98ad2f1e25d1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=98ad2f1e25d1 author: chegar date: Sun Mar 03 10:11:45 2013 +0000 8009063: Improve reliability of ConcurrentHashMap Reviewed-by: alanb, ahgross changeset c2fff439d91a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c2fff439d91a author: srl date: Wed Mar 06 06:44:14 2013 -0800 8009530: ICU Kern table support broken Reviewed-by: prr, vadim changeset 79a75d22a087 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=79a75d22a087 author: coffeys date: Mon Mar 11 21:04:08 2013 +0000 8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode Reviewed-by: mullan changeset ffc1454e644a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ffc1454e644a author: uta date: Fri Mar 08 13:47:02 2013 +0400 8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. Reviewed-by: alanb, ahgross changeset 33b7b1230377 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=33b7b1230377 author: katleman date: Tue Mar 12 14:44:19 2013 -0700 Added tag jdk7u21-b06 for changeset ffc1454e644a changeset 0cf73f53c7e1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0cf73f53c7e1 author: valeriep date: Mon Mar 11 20:05:37 2013 -0700 8009610: Blacklist certificate used with malware. Summary: updated the black list and the reg test with the new cert. Reviewed-by: weijun changeset a19614a3dabb in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a19614a3dabb author: lancea date: Sat Mar 16 10:08:14 2013 -0400 8009814: Better driver management Reviewed-by: alanb, skoivu changeset b453d9be6b3f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b453d9be6b3f author: kvn date: Thu Mar 14 08:55:04 2013 -0700 8009677: Better setting of setters Reviewed-by: ahgross, jrose, twisti changeset 2899c3dbf5e8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2899c3dbf5e8 author: smarks date: Mon Mar 18 18:05:31 2013 -0700 8009857: Problem with plugin Reviewed-by: jdn, mchung changeset 87bacc5ee8e4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=87bacc5ee8e4 author: dfuchs date: Mon Mar 11 15:07:19 2013 +0100 8001322: Refactor deserialization Reviewed-by: mchung, skoivu, smarks changeset 31c782610044 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=31c782610044 author: dfuchs date: Thu Mar 14 17:27:32 2013 +0100 8009305: Improve AWT data transfer Reviewed-by: art, skoivu, smarks, ant changeset 74c9dbadcce8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=74c9dbadcce8 author: robm date: Fri Mar 15 01:43:04 2013 +0000 8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version Reviewed-by: alanb changeset a7dfa5fd2a89 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a7dfa5fd2a89 author: robm date: Tue Mar 19 16:52:53 2013 +0000 8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) Reviewed-by: kvn changeset d42b986caf14 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d42b986caf14 author: katleman date: Tue Mar 19 14:33:59 2013 -0700 Added tag jdk7u21-b07 for changeset b453d9be6b3f changeset de4e41c5c549 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=de4e41c5c549 author: coffeys date: Wed Mar 20 00:12:59 2013 +0000 Merge changeset bd9df4e87810 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bd9df4e87810 author: katleman date: Wed Mar 20 14:47:40 2013 -0700 Added tag jdk7u21-b08 for changeset de4e41c5c549 changeset 622aedcdda61 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=622aedcdda61 author: katleman date: Mon Mar 25 14:33:33 2013 -0700 8006120: Provide "Server JRE" for 7u train Reviewed-by: pbhat, cgruszka Contributed-by: amy.y.wang at oracle.com changeset f447c3bbf074 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f447c3bbf074 author: katleman date: Tue Mar 26 15:00:38 2013 -0700 Added tag jdk7u21-b09 for changeset 622aedcdda61 changeset f9323b9d020c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f9323b9d020c author: katleman date: Sun Mar 31 03:46:56 2013 -0700 Added tag jdk7u21-b10 for changeset f447c3bbf074 changeset 08ed0bfc9668 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=08ed0bfc9668 author: katleman date: Thu Apr 04 15:48:33 2013 -0700 Added tag jdk7u21-b11 for changeset f9323b9d020c changeset f3cf02a53684 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f3cf02a53684 author: katleman date: Fri Apr 05 12:49:05 2013 -0700 Added tag jdk7u21-b30 for changeset 08ed0bfc9668 changeset 3f06e091a238 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3f06e091a238 author: katleman date: Sun Apr 07 16:34:59 2013 -0700 Added tag jdk7u21-b12 for changeset f3cf02a53684 changeset eefd9678efbd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=eefd9678efbd author: coffeys date: Tue Apr 16 11:50:22 2013 +0100 Merge changeset 64515239eb3a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=64515239eb3a author: coffeys date: Wed Apr 17 09:41:15 2013 +0100 Merge changeset 360347165596 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=360347165596 author: coffeys date: Thu Apr 18 11:15:58 2013 +0100 8012572: Exclude sun/tools/jmap/Basic.sh for short term Reviewed-by: alanb, chegar changeset 4e95c4f110e1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4e95c4f110e1 author: katleman date: Fri Apr 19 12:46:23 2013 -0700 6983966: remove lzma and upx from repository JDK7u Reviewed-by: ngthomas, cgruszka, tbell changeset b9b05aec0576 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b9b05aec0576 author: kshefov date: Tue Apr 23 19:03:02 2013 +0400 7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java Reviewed-by: coffeys changeset 3e84cc3e444c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3e84cc3e444c author: jgish date: Fri Apr 19 16:50:10 2013 -0700 8010939: Deadlock in LogManager Summary: re-order locks to avoid deadlock Reviewed-by: mchung changeset d4cd8f10764d in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d4cd8f10764d author: andrew date: Tue Apr 23 23:15:07 2013 +0100 Merge jdk7u14-b20 changeset 5e20c1a72aa8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5e20c1a72aa8 author: andrew date: Wed May 08 17:28:04 2013 +0100 Expand java.security.cert.* imports to avoid conflict with sun.security.provider.certpath.CertificateRevokedException in 6. changeset 883a1fbc5c1a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=883a1fbc5c1a author: andrew date: Wed May 22 16:12:05 2013 +0100 Remove jcheck changeset 3594c77c6634 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3594c77c6634 author: andrew date: Wed May 22 17:02:43 2013 +0100 Merge with HEAD diffstat: .hgtags | 50 + .jcheck/conf | 2 - make/altclasses/Makefile | 3 +- make/com/oracle/jfr/Makefile | 21 +- make/com/sun/security/Makefile | 2 +- make/com/sun/security/ntlm/Makefile | 39 + make/common/Defs-windows.gmk | 39 +- make/common/Defs.gmk | 1 + make/common/Release-macosx.gmk | 11 +- make/common/Release.gmk | 50 +- make/java/text/base/Makefile | 1 + make/sun/font/FILES_c.gmk | 16 +- make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 100 +- make/sun/javazic/tzdata/antarctica | 6 +- make/sun/javazic/tzdata/asia | 58 +- make/sun/javazic/tzdata/australasia | 13 +- make/sun/javazic/tzdata/europe | 129 +- make/sun/javazic/tzdata/northamerica | 58 +- make/sun/javazic/tzdata/southamerica | 68 +- make/sun/javazic/tzdata/zone.tab | 5 +- make/sun/text/Makefile | 1 + make/tools/CharsetMapping/GBK.map | 1080 ++++---- make/tools/CharsetMapping/MS936.map | 1105 ++++----- src/macosx/classes/com/apple/laf/AquaPainter.java | 44 +- src/macosx/classes/com/apple/laf/ImageCache.java | 22 +- src/macosx/classes/java/util/prefs/MacOSXPreferences.java | 3 + src/macosx/classes/sun/lwawt/LWToolkit.java | 4 +- src/macosx/classes/sun/lwawt/LWWindowPeer.java | 36 +- src/macosx/classes/sun/lwawt/macosx/CClipboard.java | 8 + src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 12 +- src/macosx/classes/sun/lwawt/macosx/CFileDialog.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java | 4 +- src/macosx/lib/flavormap.properties | 6 +- src/macosx/native/jobjc/src/core/native/SEL.m | 2 +- src/macosx/native/sun/awt/AWTWindow.m | 10 +- src/macosx/native/sun/awt/CClipboard.m | 27 +- src/macosx/native/sun/awt/CMenuItem.m | 2 +- src/macosx/native/sun/awt/awt.m | 183 +- src/share/bin/jli_util.h | 2 +- src/share/bin/parse_manifest.c | 15 +- src/share/classes/com/sun/beans/finder/MethodFinder.java | 7 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 5 + src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 293 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 147 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 1 - src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java | 6 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties | 6 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties | 6 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties | 6 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java | 5 + src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties | 6 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties | 8 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties | 2 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties | 2 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties | 2 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties | 2 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties | 4 +- src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties | 14 +- src/share/classes/com/sun/java/util/jar/pack/BandStructure.java | 3 +- src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java | 2 + src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java | 6 +- src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java | 4 +- src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java | 6 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 2 + src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 8 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 10 + src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 50 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java | 2 + src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 25 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 2 +- src/share/classes/com/sun/media/sound/FastSysexMessage.java | 2 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 2 +- src/share/classes/com/sun/security/ntlm/Client.java | 3 +- src/share/classes/com/sun/security/ntlm/NTLM.java | 12 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties | 6 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties | 8 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties | 2 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties | 2 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties | 2 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties | 14 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties | 6 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties | 8 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties | 2 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties | 2 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties | 10 +- src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java | 2 +- src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java | 2 +- src/share/classes/java/awt/Dialog.java | 54 +- src/share/classes/java/awt/EventQueue.java | 19 +- src/share/classes/java/awt/TextComponent.java | 25 +- src/share/classes/java/awt/Window.java | 6 +- src/share/classes/java/awt/peer/WindowPeer.java | 13 +- src/share/classes/java/beans/PropertyDescriptor.java | 7 +- src/share/classes/java/beans/ThreadGroupContext.java | 7 +- src/share/classes/java/beans/WeakIdentityMap.java | 181 + src/share/classes/java/io/ObjectInputStream.java | 25 + src/share/classes/java/lang/Class.java | 47 +- src/share/classes/java/lang/Integer.java | 2 +- src/share/classes/java/lang/ProcessBuilder.java | 19 +- src/share/classes/java/lang/invoke/DirectMethodHandle.java | 13 +- src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java | 12 +- src/share/classes/java/lang/invoke/LambdaForm.java | 2 + src/share/classes/java/lang/invoke/MethodHandleImpl.java | 30 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 18 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 91 +- src/share/classes/java/lang/invoke/MethodHandles.java | 84 +- src/share/classes/java/lang/management/ManagementFactory.java | 18 +- src/share/classes/java/lang/ref/Finalizer.java | 18 +- src/share/classes/java/lang/reflect/Proxy.java | 151 +- src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 2 +- src/share/classes/java/net/Inet4Address.java | 39 +- src/share/classes/java/net/Inet4AddressImpl.java | 2 +- src/share/classes/java/net/Inet6Address.java | 19 +- src/share/classes/java/net/Inet6AddressImpl.java | 2 +- src/share/classes/java/net/InetAddress.java | 120 +- src/share/classes/java/net/InetSocketAddress.java | 272 +- src/share/classes/java/net/SocketInputStream.java | 10 +- src/share/classes/java/net/SocketOutputStream.java | 4 +- src/share/classes/java/rmi/server/LogStream.java | 9 +- src/share/classes/java/sql/DriverManager.java | 4 +- src/share/classes/java/util/HashMap.java | 93 +- src/share/classes/java/util/Hashtable.java | 83 +- src/share/classes/java/util/TimeZone.java | 34 +- src/share/classes/java/util/concurrent/ConcurrentHashMap.java | 28 +- src/share/classes/java/util/concurrent/ThreadPoolExecutor.java | 172 +- src/share/classes/java/util/jar/JarFile.java | 21 +- src/share/classes/java/util/logging/Level.java | 255 +- src/share/classes/java/util/logging/LogManager.java | 528 +++- src/share/classes/java/util/logging/Logger.java | 78 +- src/share/classes/java/util/logging/Logging.java | 14 +- src/share/classes/java/util/logging/LoggingProxyImpl.java | 11 +- src/share/classes/java/util/logging/SimpleFormatter.java | 2 +- src/share/classes/javax/management/modelmbean/RequiredModelMBean.java | 227 +- src/share/classes/javax/swing/JComponent.java | 3 +- src/share/classes/javax/swing/JTable.java | 16 +- src/share/classes/javax/swing/RepaintManager.java | 156 +- src/share/classes/javax/swing/UIDefaults.java | 2 + src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 63 +- src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java | 7 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 25 +- src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java | 7 +- src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java | 1 + src/share/classes/sun/applet/AppletPanel.java | 60 +- src/share/classes/sun/applet/resources/MsgAppletViewer_de.java | 6 +- src/share/classes/sun/awt/AWTAccessor.java | 7 + src/share/classes/sun/awt/AppContext.java | 39 +- src/share/classes/sun/awt/EmbeddedFrame.java | 4 +- src/share/classes/sun/awt/datatransfer/DataTransferer.java | 49 +- src/share/classes/sun/awt/datatransfer/TransferableProxy.java | 20 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 80 +- src/share/classes/sun/awt/image/ByteInterleavedRaster.java | 29 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 26 +- src/share/classes/sun/awt/image/ImageRepresentation.java | 19 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 71 +- src/share/classes/sun/awt/image/IntegerInterleavedRaster.java | 27 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 79 +- src/share/classes/sun/awt/image/ShortInterleavedRaster.java | 29 +- src/share/classes/sun/font/CMap.java | 3 - src/share/classes/sun/invoke/util/ValueConversions.java | 10 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 101 +- src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java | 160 +- src/share/classes/sun/java2d/opengl/OGLBlitLoops.java | 12 +- src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java | 2 +- src/share/classes/sun/launcher/resources/launcher_de.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_es.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_fr.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_it.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_ja.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_ko.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_pt_BR.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_sv.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_zh_CN.properties | 15 +- src/share/classes/sun/launcher/resources/launcher_zh_TW.properties | 15 +- src/share/classes/sun/management/Agent.java | 85 +- src/share/classes/sun/management/LockDataConverter.java | 24 +- src/share/classes/sun/management/ThreadInfoCompositeData.java | 6 +- src/share/classes/sun/management/jdp/JdpBroadcaster.java | 126 + src/share/classes/sun/management/jdp/JdpController.java | 198 + src/share/classes/sun/management/jdp/JdpException.java | 42 + src/share/classes/sun/management/jdp/JdpGenericPacket.java | 97 + src/share/classes/sun/management/jdp/JdpJmxPacket.java | 198 + src/share/classes/sun/management/jdp/JdpPacket.java | 64 + src/share/classes/sun/management/jdp/JdpPacketReader.java | 141 + src/share/classes/sun/management/jdp/JdpPacketWriter.java | 95 + src/share/classes/sun/management/jdp/package-info.java | 79 + src/share/classes/sun/management/resources/agent_de.properties | 6 +- src/share/classes/sun/misc/Hashing.java | 23 +- src/share/classes/sun/misc/IoTrace.java | 33 +- src/share/classes/sun/misc/JavaAWTAccess.java | 8 + src/share/classes/sun/net/ftp/impl/FtpClient.java | 10 +- src/share/classes/sun/net/httpserver/ChunkedInputStream.java | 14 +- src/share/classes/sun/net/www/http/ChunkedInputStream.java | 9 + src/share/classes/sun/net/www/http/HttpClient.java | 69 +- src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java | 4 +- src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java | 9 +- src/share/classes/sun/net/www/protocol/https/HttpsClient.java | 81 +- src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java | 2 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 18 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 5 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 24 +- src/share/classes/sun/reflect/misc/MethodUtil.java | 40 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 61 +- src/share/classes/sun/rmi/server/MarshalInputStream.java | 14 +- src/share/classes/sun/rmi/transport/proxy/CGIHandler.java | 19 +- src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java | 15 +- src/share/classes/sun/security/krb5/PrincipalName.java | 2 +- src/share/classes/sun/security/pkcs/PKCS7.java | 31 +- src/share/classes/sun/security/pkcs/PKCS9Attribute.java | 94 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 9 + src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java | 21 +- src/share/classes/sun/security/provider/certpath/OCSPChecker.java | 13 +- src/share/classes/sun/security/ssl/CipherBox.java | 202 +- src/share/classes/sun/security/ssl/CipherSuite.java | 23 +- src/share/classes/sun/security/ssl/ClientHandshaker.java | 13 +- src/share/classes/sun/security/ssl/DHClientKeyExchange.java | 19 +- src/share/classes/sun/security/ssl/DHCrypt.java | 87 +- src/share/classes/sun/security/ssl/EngineInputRecord.java | 220 +- src/share/classes/sun/security/ssl/EngineOutputRecord.java | 4 +- src/share/classes/sun/security/ssl/HandshakeMessage.java | 14 +- src/share/classes/sun/security/ssl/InputRecord.java | 178 +- src/share/classes/sun/security/ssl/MAC.java | 46 +- src/share/classes/sun/security/ssl/OutputRecord.java | 4 +- src/share/classes/sun/security/ssl/RSAClientKeyExchange.java | 4 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 26 +- src/share/classes/sun/security/ssl/SSLSocketImpl.java | 22 +- src/share/classes/sun/security/ssl/ServerHandshaker.java | 18 +- src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java | 4 +- src/share/classes/sun/security/timestamp/TSResponse.java | 2 +- src/share/classes/sun/security/tools/JarSigner.java | 82 +- src/share/classes/sun/security/tools/JarSignerResources_ja.java | 2 +- src/share/classes/sun/security/tools/KeyTool.java | 12 +- src/share/classes/sun/security/util/DerIndefLenConverter.java | 4 + src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java | 2 +- src/share/classes/sun/security/util/KeyLength.java | 91 - src/share/classes/sun/security/util/KeyUtil.java | 204 + src/share/classes/sun/security/util/UntrustedCertificates.java | 155 +- src/share/classes/sun/security/x509/CertAndKeyGen.java | 28 +- src/share/classes/sun/swing/SwingUtilities2.java | 8 + src/share/classes/sun/text/bidi/BidiBase.java | 3 +- src/share/classes/sun/tools/jar/resources/jar_de.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_es.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_fr.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_it.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_ja.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_ko.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_sv.properties | 4 +- src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties | 6 +- src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties | 4 +- src/share/classes/sun/util/logging/resources/logging_sv.properties | 2 +- src/share/classes/sun/util/resources/TimeZoneNames.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_de.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_es.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 127 +- src/share/classes/sun/util/resources/TimeZoneNames_it.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 41 +- src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 39 +- src/share/demo/jfc/Notepad/resources/Notepad_ja.properties | 2 +- src/share/lib/security/java.security-linux | 56 +- src/share/lib/security/java.security-macosx | 56 +- src/share/lib/security/java.security-solaris | 54 +- src/share/lib/security/java.security-windows | 56 +- src/share/native/com/sun/java/util/jar/pack/bands.cpp | 4 + src/share/native/com/sun/java/util/jar/pack/bands.h | 4 +- src/share/native/com/sun/java/util/jar/pack/jni.cpp | 53 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 33 +- src/share/native/java/lang/System.c | 8 + src/share/native/java/net/InetAddress.c | 23 +- src/share/native/java/net/net_util.c | 70 +- src/share/native/java/net/net_util.h | 12 +- src/share/native/java/util/zip/zip_util.h | 2 +- src/share/native/sun/awt/image/awt_ImageRep.c | 173 +- src/share/native/sun/awt/image/awt_parseImage.c | 111 +- src/share/native/sun/awt/image/awt_parseImage.h | 1 + src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 45 +- src/share/native/sun/awt/medialib/awt_ImagingLib.c | 32 +- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 33 +- src/share/native/sun/awt/medialib/safe_alloc.h | 1 - src/share/native/sun/awt/medialib/safe_math.h | 35 + src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 9 + src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 4 + src/share/native/sun/font/FontInstanceAdapter.cpp | 47 +- src/share/native/sun/font/FontInstanceAdapter.h | 1 + src/share/native/sun/font/fontscalerdefs.h | 21 +- src/share/native/sun/font/layout/AlternateSubstSubtables.cpp | 11 +- src/share/native/sun/font/layout/AlternateSubstSubtables.h | 6 +- src/share/native/sun/font/layout/ArabicLayoutEngine.cpp | 36 +- src/share/native/sun/font/layout/ArabicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ArabicShaping.cpp | 14 +- src/share/native/sun/font/layout/ArabicShaping.h | 2 + src/share/native/sun/font/layout/AttachmentPosnSubtables.h | 6 +- src/share/native/sun/font/layout/CanonData.cpp | 5 + src/share/native/sun/font/layout/CanonShaping.cpp | 10 +- src/share/native/sun/font/layout/CanonShaping.h | 2 + src/share/native/sun/font/layout/ClassDefinitionTables.cpp | 104 +- src/share/native/sun/font/layout/ClassDefinitionTables.h | 27 +- src/share/native/sun/font/layout/ContextualGlyphInsertion.h | 15 +- src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.cpp | 139 + src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.h | 106 + src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp | 48 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc.h | 8 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp | 170 + src/share/native/sun/font/layout/ContextualGlyphSubstProc2.h | 92 + src/share/native/sun/font/layout/ContextualGlyphSubstitution.h | 13 +- src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 8 +- src/share/native/sun/font/layout/ContextualSubstSubtables.h | 22 + src/share/native/sun/font/layout/CoverageTables.h | 3 + src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 6 +- src/share/native/sun/font/layout/CursiveAttachmentSubtables.h | 3 +- src/share/native/sun/font/layout/DeviceTables.h | 1 + src/share/native/sun/font/layout/ExtensionSubtables.cpp | 8 +- src/share/native/sun/font/layout/Features.cpp | 12 +- src/share/native/sun/font/layout/GDEFMarkFilter.cpp | 7 +- src/share/native/sun/font/layout/GDEFMarkFilter.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine.cpp | 5 +- src/share/native/sun/font/layout/GXLayoutEngine.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine2.cpp | 91 + src/share/native/sun/font/layout/GXLayoutEngine2.h | 149 + src/share/native/sun/font/layout/GlyphDefinitionTables.cpp | 28 +- src/share/native/sun/font/layout/GlyphDefinitionTables.h | 20 +- src/share/native/sun/font/layout/GlyphIterator.cpp | 27 +- src/share/native/sun/font/layout/GlyphIterator.h | 6 +- src/share/native/sun/font/layout/GlyphLookupTables.cpp | 15 +- src/share/native/sun/font/layout/GlyphLookupTables.h | 4 +- src/share/native/sun/font/layout/GlyphPositioningTables.cpp | 6 +- src/share/native/sun/font/layout/GlyphPositioningTables.h | 5 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp | 36 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp | 28 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp | 7 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.h | 5 +- src/share/native/sun/font/layout/HanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ICUFeatures.h | 9 +- src/share/native/sun/font/layout/IndicClassTables.cpp | 6 +- src/share/native/sun/font/layout/IndicLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/IndicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/IndicRearrangement.h | 10 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp | 14 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.h | 7 +- src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp | 425 +++ src/share/native/sun/font/layout/IndicRearrangementProcessor2.h | 88 + src/share/native/sun/font/layout/IndicReordering.cpp | 15 +- src/share/native/sun/font/layout/IndicReordering.h | 6 +- src/share/native/sun/font/layout/KernTable.cpp | 77 +- src/share/native/sun/font/layout/KernTable.h | 12 +- src/share/native/sun/font/layout/KhmerLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/KhmerLayoutEngine.h | 2 +- src/share/native/sun/font/layout/LEFontInstance.h | 19 + src/share/native/sun/font/layout/LEGlyphFilter.h | 4 +- src/share/native/sun/font/layout/LEInsertionList.h | 4 +- src/share/native/sun/font/layout/LEScripts.h | 24 +- src/share/native/sun/font/layout/LETableReference.h | 443 ++++ src/share/native/sun/font/layout/LETypes.h | 168 +- src/share/native/sun/font/layout/LayoutEngine.cpp | 159 +- src/share/native/sun/font/layout/LayoutEngine.h | 25 +- src/share/native/sun/font/layout/LigatureSubstProc.cpp | 68 +- src/share/native/sun/font/layout/LigatureSubstProc.h | 6 +- src/share/native/sun/font/layout/LigatureSubstProc2.cpp | 170 + src/share/native/sun/font/layout/LigatureSubstProc2.h | 97 + src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 4 +- src/share/native/sun/font/layout/LigatureSubstSubtables.h | 5 +- src/share/native/sun/font/layout/LigatureSubstitution.h | 19 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 125 +- src/share/native/sun/font/layout/LookupProcessor.h | 19 +- src/share/native/sun/font/layout/LookupTables.cpp | 29 +- src/share/native/sun/font/layout/LookupTables.h | 10 +- src/share/native/sun/font/layout/Lookups.cpp | 36 +- src/share/native/sun/font/layout/Lookups.h | 29 +- src/share/native/sun/font/layout/MPreFixups.cpp | 6 +- src/share/native/sun/font/layout/MarkArrays.h | 1 + src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 6 +- src/share/native/sun/font/layout/MarkToBasePosnSubtables.h | 4 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 6 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h | 5 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp | 6 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h | 4 +- src/share/native/sun/font/layout/MorphStateTables.h | 7 +- src/share/native/sun/font/layout/MorphTables.cpp | 40 +- src/share/native/sun/font/layout/MorphTables.h | 306 ++- src/share/native/sun/font/layout/MorphTables2.cpp | 248 ++ src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 4 +- src/share/native/sun/font/layout/MultipleSubstSubtables.h | 4 +- src/share/native/sun/font/layout/NonContextualGlyphSubst.h | 7 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp | 23 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h | 6 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.cpp | 88 + src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.h | 68 + src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp | 221 +- src/share/native/sun/font/layout/OpenTypeLayoutEngine.h | 16 +- src/share/native/sun/font/layout/OpenTypeTables.h | 3 +- src/share/native/sun/font/layout/OpenTypeUtilities.cpp | 98 +- src/share/native/sun/font/layout/OpenTypeUtilities.h | 13 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 27 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 10 +- src/share/native/sun/font/layout/ScriptAndLanguage.cpp | 65 +- src/share/native/sun/font/layout/ScriptAndLanguage.h | 9 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp | 15 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.h | 13 +- src/share/native/sun/font/layout/SegmentArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SegmentArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp | 84 + src/share/native/sun/font/layout/SegmentArrayProcessor2.h | 82 + src/share/native/sun/font/layout/SegmentSingleProcessor.cpp | 17 +- src/share/native/sun/font/layout/SegmentSingleProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentSingleProcessor2.cpp | 79 + src/share/native/sun/font/layout/SegmentSingleProcessor2.h | 82 + src/share/native/sun/font/layout/ShapingTypeData.cpp | 2 + src/share/native/sun/font/layout/SimpleArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SimpleArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SimpleArrayProcessor2.cpp | 78 + src/share/native/sun/font/layout/SimpleArrayProcessor2.h | 83 + src/share/native/sun/font/layout/SinglePositioningSubtables.cpp | 18 +- src/share/native/sun/font/layout/SinglePositioningSubtables.h | 7 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 18 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.h | 7 +- src/share/native/sun/font/layout/SingleTableProcessor.cpp | 13 +- src/share/native/sun/font/layout/SingleTableProcessor.h | 6 +- src/share/native/sun/font/layout/SingleTableProcessor2.cpp | 77 + src/share/native/sun/font/layout/SingleTableProcessor2.h | 82 + src/share/native/sun/font/layout/StateTableProcessor.cpp | 24 +- src/share/native/sun/font/layout/StateTableProcessor.h | 9 +- src/share/native/sun/font/layout/StateTableProcessor2.cpp | 236 ++ src/share/native/sun/font/layout/StateTableProcessor2.h | 85 + src/share/native/sun/font/layout/StateTables.h | 54 +- src/share/native/sun/font/layout/SubtableProcessor.cpp | 6 +- src/share/native/sun/font/layout/SubtableProcessor.h | 6 +- src/share/native/sun/font/layout/SubtableProcessor2.cpp | 57 + src/share/native/sun/font/layout/SubtableProcessor2.h | 70 + src/share/native/sun/font/layout/ThaiLayoutEngine.cpp | 9 +- src/share/native/sun/font/layout/TibetanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/TibetanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.h | 6 +- src/share/native/sun/font/layout/TrimmedArrayProcessor2.cpp | 82 + src/share/native/sun/font/layout/TrimmedArrayProcessor2.h | 84 + src/share/native/sun/font/layout/ValueRecords.h | 1 + src/share/native/sun/font/sunFont.c | 18 +- src/solaris/bin/java_md_solinux.c | 1 - src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java | 9 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 4 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 6 +- src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java | 32 +- src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 14 +- src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java | 16 +- src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java | 27 +- src/solaris/classes/sun/print/UnixPrintJob.java | 2 +- src/solaris/native/java/lang/java_props_macosx.c | 5 - src/solaris/native/java/lang/java_props_md.c | 5 + src/solaris/native/java/net/Inet4AddressImpl.c | 22 +- src/solaris/native/java/net/Inet6AddressImpl.c | 13 +- src/solaris/native/java/net/NetworkInterface.c | 15 +- src/solaris/native/java/net/PlainDatagramSocketImpl.c | 55 +- src/solaris/native/java/net/net_util_md.c | 6 +- src/solaris/native/sun/nio/ch/DatagramChannelImpl.c | 9 +- src/solaris/native/sun/nio/ch/SctpChannelImpl.c | 27 +- src/windows/bin/cmdtoargs.c | 13 +- src/windows/bin/java_md.c | 47 +- src/windows/classes/java/lang/ProcessImpl.java | 139 +- src/windows/classes/sun/awt/windows/WComponentPeer.java | 9 +- src/windows/classes/sun/awt/windows/WDesktopPeer.java | 17 +- src/windows/classes/sun/awt/windows/WEmbeddedFrame.java | 15 +- src/windows/classes/sun/awt/windows/WFileDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WPrintDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WWindowPeer.java | 6 +- src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java | 31 +- src/windows/native/java/io/WinNTFileSystem_md.c | 8 +- src/windows/native/java/net/Inet4AddressImpl.c | 14 +- src/windows/native/java/net/Inet6AddressImpl.c | 13 +- src/windows/native/java/net/NetworkInterface.c | 47 +- src/windows/native/java/net/NetworkInterface.h | 1 - src/windows/native/java/net/NetworkInterface_winXP.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 52 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 9 +- src/windows/native/java/net/net_util_md.c | 6 +- src/windows/native/sun/nio/ch/DatagramChannelImpl.c | 10 +- src/windows/native/sun/windows/awt_Desktop.cpp | 10 +- src/windows/native/sun/windows/awt_TextComponent.cpp | 22 +- src/windows/native/sun/windows/awt_TextComponent.h | 3 +- test/Makefile | 7 + test/ProblemList.txt | 123 +- test/TEST.ROOT | 10 +- test/com/sun/jdi/ShellScaffold.sh | 3 +- test/demo/jvmti/mtrace/TraceJFrame.java | 29 +- test/java/awt/DataFlavor/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java | 37 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/DataFlavorSearcher.java | 47 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java | 28 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html | 27 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java | 205 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MyTransferable.java | 62 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/NextFramePositionCalculator.java | 20 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/SourcePanel.java | 26 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/TargetPanel.java | 83 + test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java | 98 + test/java/awt/Frame/WindowDragTest/WindowDragTest.java | 5 +- test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java | 10 + test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html | 43 + test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java | 246 ++ test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java | 441 +++ test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java | 8 +- test/java/awt/font/TextLayout/TestKerning.java | 94 + test/java/beans/Introspector/Test7192955.java | 15 +- test/java/io/FileInputStream/LargeFileAvailable.java | 66 +- test/java/io/Serializable/resolveClass/deserializeButton/Foo.java | 17 +- test/java/io/Serializable/resolveClass/deserializeButton/Test.java | 4 +- test/java/io/Serializable/resolveClass/deserializeButton/run.sh | 4 +- test/java/lang/Runtime/exec/StreamsSurviveDestroy.java | 47 +- test/java/lang/Runtime/exec/WinCommand.java | 31 +- test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java | 56 + test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh | 96 + test/java/lang/Thread/ThreadStateTest.java | 158 +- test/java/lang/ThreadGroup/NullThreadName.java | 5 +- test/java/lang/ThreadGroup/Stop.java | 61 +- test/java/lang/instrument/ManifestTest.sh | 23 +- test/java/net/BindException/Test.java | 23 +- test/java/net/DatagramPacket/ReuseBuf.java | 3 +- test/java/net/InetAddress/GetLocalHostWithSM.java | 14 +- test/java/net/Socks/SocksServer.java | 39 +- test/java/net/Socks/SocksV4Test.java | 38 +- test/java/net/ipv6tests/B6521014.java | 4 +- test/java/nio/channels/DatagramChannel/SelectWhenRefused.java | 17 +- test/java/nio/channels/DatagramChannel/SendToUnresolved.java | 2 +- test/java/nio/file/Files/Misc.java | 2 +- test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java | 8 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java | 4 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/CallbackInterface.java | 29 - test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java | 122 - test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java | 136 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java | 144 - test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy | 1 - test/java/rmi/activation/checkusage/CheckUsage.java | 24 +- test/java/rmi/registry/altSecurityManager/AltSecurityManager.java | 5 +- test/java/rmi/registry/checkusage/CheckUsage.java | 28 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 3 +- test/java/rmi/registry/readTest/readTest.sh | 3 +- test/java/rmi/registry/reexport/Reexport.java | 8 +- test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java | 4 + test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy | 2 + test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java | 3 +- test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy | 1 + test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java | 100 + test/java/rmi/testlibrary/JavaVM.java | 151 +- test/java/rmi/testlibrary/RMID.java | 7 +- test/java/rmi/testlibrary/StreamPipe.java | 92 +- test/java/rmi/testlibrary/TestLibrary.java | 75 +- test/java/rmi/transport/checkFQDN/CheckFQDN.java | 8 +- test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java | 5 +- test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 1 + test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java | 9 +- test/java/security/cert/pkix/policyChanges/TestPolicy.java | 12 +- test/java/text/Bidi/BidiConformance.java | 151 +- test/java/text/Bidi/Bug8005277.java | 67 + test/java/util/HashMap/HashMapCloneLeak.java | 70 + test/java/util/Timer/KillThread.java | 7 +- test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java | 4 +- test/java/util/concurrent/Phaser/Basic.java | 10 +- test/java/util/concurrent/ThreadPoolExecutor/Custom.java | 8 +- test/java/util/concurrent/locks/Lock/FlakyMutex.java | 2 +- test/java/util/logging/CustomLogManager.java | 177 + test/java/util/logging/CustomLogManagerTest.java | 63 + test/java/util/logging/DrainFindDeadlockTest.java | 196 + test/java/util/logging/SimpleLogManager.java | 113 + test/java/util/prefs/AddNodeChangeListener.java | 3 +- test/java/util/prefs/CheckUserPrefsStorage.sh | 8 +- test/java/util/prefs/CommentsInXml.java | 3 +- test/java/util/prefs/ConflictInFlush.java | 3 +- test/java/util/prefs/ExportNode.java | 3 +- test/java/util/prefs/ExportSubtree.java | 7 +- test/java/util/prefs/PrefsSpi.sh | 6 +- test/java/util/prefs/RemoveNullKeyCheck.java | 45 + test/java/util/prefs/RemoveReadOnlyNode.java | 9 +- test/java/util/prefs/RemoveUnregedListener.java | 3 +- test/javax/management/remote/mandatory/notif/DeadListenerTest.java | 58 +- test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java | 6 +- test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java | 6 +- test/javax/swing/JComboBox/4199622/bug4199622.java | 243 ++ test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java | 78 + test/javax/swing/JFrame/4962534/bug4962534.html | 43 + test/javax/swing/JFrame/4962534/bug4962534.java | 235 ++ test/javax/swing/JMenu/4515762/bug4515762.java | 172 + test/javax/swing/JPopupMenu/6827786/bug6827786.java | 8 +- test/javax/swing/JRootPane/4670486/bug4670486.java | 145 + test/javax/swing/JScrollBar/7163696/Test7163696.java | 103 + test/javax/swing/JSlider/4252173/bug4252173.java | 12 +- test/javax/swing/JSpinner/6532833/bug6532833.java | 11 +- test/javax/swing/JTable/8005019/bug8005019.java | 103 + test/javax/swing/JTree/8003400/Test8003400.java | 109 + test/javax/swing/JTree/8004298/bug8004298.java | 121 + test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java | 80 + test/javax/swing/SpringLayout/4726194/bug4726194.java | 161 + test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java | 9 +- test/javax/swing/regtesthelpers/Util.java | 51 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 3 +- test/lib/testlibrary/OutputAnalyzerTest.java | 181 + test/lib/testlibrary/jdk/testlibrary/JcmdBase.java | 79 + test/lib/testlibrary/jdk/testlibrary/JdkFinder.java | 78 + test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java | 324 ++ test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java | 61 + test/lib/testlibrary/jdk/testlibrary/ProcessTools.java | 151 + test/lib/testlibrary/jdk/testlibrary/StreamPumper.java | 78 + test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java | 165 + test/sun/java2d/OpenGL/CustomCompositeTest.java | 2 +- test/sun/management/jdp/JdpClient.java | 160 + test/sun/management/jdp/JdpDoSomething.java | 103 + test/sun/management/jdp/JdpTest.sh | 335 +++ test/sun/management/jdp/JdpUnitTest.java | 90 + test/sun/misc/IoTrace/IoTraceAgent.java | 21 +- test/sun/misc/IoTrace/IoTraceBase.java | 23 +- test/sun/misc/IoTrace/IoTraceListener.java | 34 +- test/sun/misc/Version/Version.java | 114 +- test/sun/net/www/http/HttpClient/IsAvailable.java | 68 + test/sun/net/www/protocol/http/HttpOnly.java | 36 +- test/sun/net/www/protocol/http/StackTraceTest.java | 36 +- test/sun/net/www/protocol/jar/B4957695.java | 86 +- test/sun/rmi/runtime/Log/4504153/Test4504153.java | 5 +- test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java | 7 +- test/sun/rmi/transport/tcp/DeadCachedConnection.java | 6 +- test/sun/security/krb5/name/Immutable.java | 41 + test/sun/security/mscapi/ShortRSAKey1024.sh | 28 +- test/sun/security/mscapi/ShortRSAKey512.sh | 86 - test/sun/security/mscapi/ShortRSAKey768.sh | 85 - test/sun/security/mscapi/ShortRSAKeyWithinTLS.java | 6 +- test/sun/security/pkcs/pkcs9/UnknownAttribute.java | 81 + test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java | 6 + test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java | 9 +- test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java | 9 +- test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java | 9 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java | 5 + test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java | 433 +++ test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java | 8 + test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java | 11 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java | 14 +- test/sun/security/tools/jarsigner/TimestampCheck.java | 3 + test/sun/security/util/Oid/S11N.java | 246 ++ test/sun/security/util/Oid/S11N.sh | 185 - test/sun/security/util/Oid/SerialTest.java | 66 - test/sun/tools/common/ApplicationSetup.sh | 6 +- test/sun/tools/jcmd/jcmd-Defaults.sh | 4 +- test/sun/tools/jcmd/jcmd-f.sh | 2 +- test/sun/tools/jcmd/jcmd-help-help.sh | 2 +- test/sun/tools/jcmd/jcmd-help.sh | 4 +- test/sun/tools/jcmd/jcmd-pid.sh | 4 +- test/sun/tools/jcmd/jcmd_Output1.awk | 17 +- test/sun/tools/jps/jps-Vvml_2.sh | 4 +- test/sun/tools/jps/jps-l_Output1.awk | 7 +- test/sun/tools/jps/jps-m_2.sh | 4 +- test/sun/tools/jps/jps_Output1.awk | 7 +- test/sun/tools/jstat/jstatClassOutput1.sh | 4 +- test/sun/tools/jstat/jstatClassloadOutput1.sh | 4 +- test/sun/tools/jstat/jstatCompilerOutput1.sh | 4 +- test/sun/tools/jstat/jstatFileURITest1.sh | 6 +- test/sun/tools/jstat/jstatGcCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcCauseOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcNewOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOldOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatLineCounts1.sh | 4 +- test/sun/tools/jstat/jstatLineCounts2.sh | 4 +- test/sun/tools/jstat/jstatLineCounts3.sh | 4 +- test/sun/tools/jstat/jstatLineCounts4.sh | 4 +- test/sun/tools/jstat/jstatOptions1.sh | 6 +- test/sun/tools/jstat/jstatPrintCompilationOutput1.sh | 4 +- test/sun/tools/jstat/jstatSnap1.sh | 4 +- test/sun/tools/jstat/jstatSnap2.sh | 4 +- test/sun/tools/jstat/jstatTimeStamp1.sh | 4 +- test/sun/tools/jstatd/jpsOutput1.awk | 6 +- test/sun/tools/jstatd/jstatdDefaults.sh | 4 +- test/sun/tools/jstatd/jstatdExternalRegistry.sh | 4 +- test/sun/tools/jstatd/jstatdPort.sh | 4 +- test/sun/tools/jstatd/jstatdServerName.sh | 10 +- test/tools/launcher/Arrrghs.java | 8 +- test/tools/launcher/I18NJarTest.java | 17 +- test/tools/launcher/TestHelper.java | 45 + test/tools/launcher/ToolsOpts.java | 1 + 708 files changed, 23104 insertions(+), 6892 deletions(-) diffs (truncated from 47852 to 500 lines): diff -r bbfd732ae37d -r 3594c77c6634 .hgtags --- a/.hgtags Mon Jan 14 15:01:29 2013 +0000 +++ b/.hgtags Wed May 22 17:02:43 2013 +0100 @@ -220,6 +220,8 @@ 901c290c9c8b495a2696f10a87523363239d001b jdk7u9-b02 7302c386ca9c6cd20c27d0a2adb0b142f679d6b3 jdk7u9-b04 ffad06d7009576c3098705e05452ebc309a59e56 jdk7u9-b05 +3b1a395f1948c7063d342a0c3e26c8450c6e7acb jdk7u9-b31 +77f7e5f13763fed11afb6e12840d78bd55c2d979 jdk7u9-b32 c1efb11d7db509dafd7882811b2562ba593f6431 jdk7u10-b10 0243e41000c6f76654725cac31ffdc95633c63e7 jdk7u10-b11 c86a49dd4a0dca3a56f00429cfcffb2ad5f2a224 jdk7u10-b12 @@ -230,6 +232,21 @@ a1c5bac982a6d4aa58f551cb46cde53f526aca48 jdk7u10-b17 115d1e4365293846bbc911cf312886c471e37fbd jdk7u10-b18 84218dff5e4c7bc00fd9266769c0d12bdde866f5 jdk7u10-b30 +3515fd583ede49b125a0b5f72ac403b3984d199b jdk7u10-b31 +ecc14534318c80dc7612c8b1d328a67849c5b07f jdk7u11-b20 +d9969a953f693f5760b1d2759f11a2cb222e4f20 jdk7u11-b21 +c7282a85c6bcc717b7099a03db028ecb77b41098 jdk7u11-b32 +8fd5e105c6a288b01f8809a6c84a5a64a63f39be jdk7u11-b33 +84da14fbd3ac12a3c6734fa4b6a366cfde1426af jdk7u11-b03 +932ef74edbf984299a68c126c70bbe04ffbde9b5 jdk7u11-b04 +fb35fb91f6478f8076993bcc4112746bcd9a2985 jdk7u11-b05 +f26def552d2c4873aeaee00241f60efc462a11a7 jdk7u11-b06 +1d14a3d7bac870423e52a889d2f5f60ee76ddc6a jdk7u11-b07 +ee61b528b3f866b20095f5e9593896d4ea4be468 jdk7u11-b08 +0b9564dab118d40bc5edc60269f736f97ab6f385 jdk7u13-b09 +cbbb166b38eb15f5d5c68e913ee18f6f352b7af0 jdk7u13-b10 +28700a56b69d80e70aecf230ab7f9ad4bb5acf23 jdk7u13-b30 +8eb180a284b0911b2645d5cbdff5be499a75d6b2 jdk7u13-b20 df945ef30444adf08f3ef14b0c49c8bda6dda587 jdk7u8-b01 dd1e513c05b8b8c8402e9ecf9c0d5bdbebb1a089 jdk7u8-b02 355cf1937d0824b54ac38ee5a5496197647840f9 jdk7u8-b03 @@ -249,3 +266,36 @@ b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint +e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10 +9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11 +ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12 +7c0d4bfd9d2c183ebf8566013af5111927b472f6 jdk7u14-b13 +3982fc37bc256b07a710f25215e5525cfbefe2ed jdk7u14-b14 +2eb3ac105b7fe7609a20c9986ecbccab71f1609f jdk7u14-b15 +835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01 +0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02 +70b0f967c0649c501fb14a27bb06daeccbff823a jdk7u15-b30 +9f20468265071696b4d2ece286bc228a4d5a302a jdk7u15-b31 +3ef25219292f57ea56ac0ef338ceadf5fd098bdf jdk7u15-b33 +87e45d30e24db726ea03b20d861f0a025e437641 jdk7u15-b03 +b5ae6fb92e71df1833221026efe50863593bf682 jdk7u17-b01 +b130c8cfecfc552614047b3244d5d94439827fcd jdk7u17-b02 +a474615061bf610105a426780a7ac4c95bd76456 jdk7u17-b30 +1ad6f413e250bd2671b4908e232bd0d244c917a7 jdk7u17-b31 +8261e56b7f91c7553e8485b206bdc9030a3546e4 jdk7u21-b01 +af6be9d7aed7c323858932c908b049f4bcdb6a3e jdk7u21-b05 +ffc1454e644a39265cd6d80ef4b4c12c5dbf35c9 jdk7u21-b06 +b453d9be6b3f5496aa217ade7478d3b7fa32b13b jdk7u21-b07 +de4e41c5c549136209a68154d847cf126e563b88 jdk7u21-b08 +622aedcdda610a148a082558a0c25d8b3b735d07 jdk7u21-b09 +f447c3bbf074439ece0ce9fea82c857f93817801 jdk7u21-b10 +f9323b9d020ce8d313af2d2e2682e2b6cabcc40d jdk7u21-b11 +08ed0bfc9668f04ce4e3803f16aad92f6e50f885 jdk7u21-b30 +f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b12 +555ea0c4e9567294d37793777d521902d43f1a39 jdk7u14-b16 +950fa827c2ec8a3a1ceba755994ae59016daa621 jdk7u14-b17 +e7ba683c15009b166127c3437fe9fbaf4eee6efe jdk7u14-b18 +eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 +eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 +a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19 +bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20 diff -r bbfd732ae37d -r 3594c77c6634 .jcheck/conf --- a/.jcheck/conf Mon Jan 14 15:01:29 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r bbfd732ae37d -r 3594c77c6634 make/altclasses/Makefile --- a/make/altclasses/Makefile Mon Jan 14 15:01:29 2013 +0000 +++ b/make/altclasses/Makefile Wed May 22 17:02:43 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 @@ -42,6 +42,7 @@ ALTRT_JAR_FILE = $(LIBDIR)/alt-rt.jar ALTRT_JAR_SOURCE_FILE = $(TEMPDIR)/alt-rt.jarsrclist ALTRT_JAR_SOURCES = $(wildcard $(ALTCLASSES_SRCDIR)/java/*/*.java) +ALTRT_JAR_SOURCES += $(wildcard $(ALTCLASSES_SRCDIR)/sun/misc/*.java) # Use a special file suffix for the file that holds the source list diff -r bbfd732ae37d -r 3594c77c6634 make/com/oracle/jfr/Makefile --- a/make/com/oracle/jfr/Makefile Mon Jan 14 15:01:29 2013 +0000 +++ b/make/com/oracle/jfr/Makefile Wed May 22 17:02:43 2013 +0100 @@ -42,6 +42,11 @@ AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr +JFC_XSD = oracle/jrockit/jfr/settings/jfc.xsd +JFC_XSD_SRC = $(CLOSED_SHARE_SRC)/classes/$(JFC_XSD) +JFC_XSD_FILE = $(CLASSDESTDIR)/$(JFC_XSD) + + # Find C source files # vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr @@ -59,15 +64,17 @@ $(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr $(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr +# Copy pre-shipped .jfc files +JFR_LIBDIR = $(LIBDIR)/jfr +JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings -# Copy pre-shipped .jfs files -JFR_LIBDIR = $(LIBDIR)/jfr -JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr - -$(JFR_LIBDIR)/%.jfs: $(JFR_SRCDIR)/%.jfs +$(JFR_LIBDIR)/%.jfc: $(JFC_SRCDIR)/%.jfc $(install-file) -JFS_FILES := $(subst $(JFR_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFR_SRCDIR)/*.jfs)) +JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc)) -all build : $(JFS_FILES) +$(JFC_XSD_FILE) : $(JFC_XSD_SRC) + $(install-file) +all build : $(JFC_FILES) $(JFC_XSD_FILE) + diff -r bbfd732ae37d -r 3594c77c6634 make/com/sun/security/Makefile --- a/make/com/sun/security/Makefile Mon Jan 14 15:01:29 2013 +0000 +++ b/make/com/sun/security/Makefile Wed May 22 17:02:43 2013 +0100 @@ -31,7 +31,7 @@ include $(BUILDDIR)/common/Defs.gmk SUBDIRS = auth -SUBDIRS_misc = jgss sasl auth/module +SUBDIRS_misc = jgss sasl auth/module ntlm include $(BUILDDIR)/common/Subdirs.gmk all build clean clobber:: diff -r bbfd732ae37d -r 3594c77c6634 make/com/sun/security/ntlm/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/com/sun/security/ntlm/Makefile Wed May 22 17:02:43 2013 +0100 @@ -0,0 +1,39 @@ +# +# Copyright (c) 2012, Oracle and/or its affiliates. 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. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +BUILDDIR = ../../../.. +PACKAGE = com.sun.security.ntlm +PRODUCT = sun +include $(BUILDDIR)/common/Defs.gmk + +# +# Files +# +AUTO_FILES_JAVA_DIRS = com/sun/security/ntlm + +# +# Rules +# +include $(BUILDDIR)/common/Classes.gmk diff -r bbfd732ae37d -r 3594c77c6634 make/common/Defs-windows.gmk --- a/make/common/Defs-windows.gmk Mon Jan 14 15:01:29 2013 +0000 +++ b/make/common/Defs-windows.gmk Wed May 22 17:02:43 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. 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 @@ -433,40 +433,3 @@ -d "JDK_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \ -d "JDK_NAME=$(JDK_RC_NAME)" \ -d "JDK_FVER=$(JDK_RC_FVER)" - -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available -ifeq ($(ARCH_DATA_MODEL), 32) - ifneq ($(KERNEL), off) - # This is a hack to use until 7-Zip (and UPX) bundles can be put - # under /java/devtools. - ifndef DEPLOY_TOPDIR - DEPLOY_TOPDIR=$(JDK_TOPDIR)/../deploy - endif - # Uncomment this block to cause build failure if above assumption false - #DCHK = $(shell if [ ! -d $(DEPLOY_TOPDIR) ] ; then \ - # $(ECHO) deploy_not_a_peer_of_j2se ; \ - #fi ) - #ifeq ($(DCHK), deploy_not_a_peer_of_j2se) - # If a build failure points to control coming here it means - # it means deploy is not in the same directory - # as j2se. Java Kernel can't tolerate that for the time being. - #endif - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - EXTRA_COMP_INSTALL_PATH = lib\\\\deploy\\\\lzma.dll - # Crazy but true: deploy/make/plugin/jinstall/Makefile.jkernel does - # not include deploy/make/common/Defs-windows.gmk, either directly - # or indirectly. But it does include this file, so redundantly declare - # these variables that are in deploy/make/common/Defs-windows.gmk for - # the sake of the Java Kernel part of the deploy build. Whew! - EXTRA_COMP_LIB_NAME = lzma.dll - EXTRA_COMP_PATH = $(OUTPUTDIR)/tmp/deploy/lzma/win32/obj - EXTRA_COMP_CMD_PATH = $(EXTRA_COMP_PATH)/lzma.exe - EXTRA_COMP_LIB_PATH = $(EXTRA_COMP_PATH)/$(EXTRA_COMP_LIB_NAME) - endif - endif -endif diff -r bbfd732ae37d -r 3594c77c6634 make/common/Defs.gmk --- a/make/common/Defs.gmk Mon Jan 14 15:01:29 2013 +0000 +++ b/make/common/Defs.gmk Wed May 22 17:02:43 2013 +0100 @@ -312,6 +312,7 @@ JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image +JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image #where the demo source can be found DEMOSRCDIR = $(SHARE_SRC)/demo diff -r bbfd732ae37d -r 3594c77c6634 make/common/Release-macosx.gmk --- a/make/common/Release-macosx.gmk Mon Jan 14 15:01:29 2013 +0000 +++ b/make/common/Release-macosx.gmk Wed May 22 17:02:43 2013 +0100 @@ -31,6 +31,8 @@ JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents +JDK_SERVER_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-bundle/jdk$(JDK_VERSION).jdk/Contents +JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image MACOSX_SRC = $(JDK_TOPDIR)/src/macosx @@ -70,6 +72,13 @@ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_BUNDLE_DIR)/Info.plist /usr/bin/SetFile -a B $(JDK_BUNDLE_DIR)/../ -EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files +jdk-server-bundle-files: + $(MKDIR) -p $(JDK_SERVER_BUNDLE_DIR)/MacOS + ln -s ../Home/jre/lib/jli/libjli.dylib $(JDK_SERVER_BUNDLE_DIR)/MacOS/ + $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_BUNDLE_DIR)/Home + $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_SERVER_BUNDLE_DIR)/Info.plist + /usr/bin/SetFile -a B $(JDK_SERVER_BUNDLE_DIR)/../ + +EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS) diff -r bbfd732ae37d -r 3594c77c6634 make/common/Release.gmk --- a/make/common/Release.gmk Mon Jan 14 15:01:29 2013 +0000 +++ b/make/common/Release.gmk Wed May 22 17:02:43 2013 +0100 @@ -171,12 +171,20 @@ endif ifeq ($(PLATFORM), solaris) - MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR) + ifndef OPENJDK + MANBASEDIRS=$(CLOSED_SRC)/solaris/doc $(IMPORTDOCDIR) + else + MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR) + endif MAN1SUBDIR=sun/man/man1 endif # solaris ifeq ($(PLATFORM), linux) - MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR) + ifndef OPENJDK + MANBASEDIRS=$(CLOSED_SRC)/linux/doc $(IMPORTDOCDIR) + else + MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR) + endif MAN1SUBDIR=man JA_DIRNAME=ja_JP.UTF-8 endif # linux @@ -236,8 +244,8 @@ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ process-image-jre process-image-jdk \ -compare-image \ -sec-files sec-files-win jgss-files :: +compare-image \ +sec-files sec-files-win jgss-files server-jdk-image :: @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." # Order is important here, trim jre after jdk image is created @@ -246,16 +254,17 @@ images:: sanity-images post-sanity-images \ $(INITIAL_IMAGE_JRE) $(EXTRA_JRE_TARGETS) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ - identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk sec-files sec-files-win jgss-files \ - $(EXTRA_IMAGE_TARGETS) + identify-image-jre identify-image-jdk \ + process-image-jre process-image-jdk sec-files sec-files-win \ + jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image else images:: sanity-images post-sanity-images \ $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk sec-files sec-files-win jgss-files + process-image-jre process-image-jdk sec-files sec-files-win \ + jgss-files server-jdk-image endif # Don't use these @@ -931,6 +940,27 @@ done $(RM) $(JRE_BIN_LIST) +# Duplicate current j2re-image contents to server-j2re-image +# for the server version of jre, before deploy build +server-jdk-image:: +ifeq ($(PLATFORM), macosx) + $(RM) -r $(JDK_SERVER_BUNDLE_DIR)/Home/demo + $(RM) -r $(JDK_SERVER_BUNDLE_DIR)/Home/sample + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/bin/jcontrol + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/jre/bin/jcontrol + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/ja_JP.UTF-8/man1/javaws.1 + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/man1/javaws.1 +else + $(RM) -r $(JDK_SERVER_IMAGE_DIR) + $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR) + $(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo + $(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample + $(RM) $(JDK_SERVER_IMAGE_DIR)/bin/jcontrol + $(RM) $(JDK_SERVER_IMAGE_DIR)/jre/bin/jcontrol + $(RM) $(JDK_SERVER_IMAGE_DIR)/man/ja_JP.UTF-8/man1/javaws.1 + $(RM) $(JDK_SERVER_IMAGE_DIR)/man/man1/javaws.1 +endif + ###################################################### # JDK Image ###################################################### @@ -1323,8 +1353,8 @@ @$(java-vm-cleanup) # Clean up names in the messages printed out -CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE at g" \ - -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE at g" +CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \ + -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g" # Report on the jre image comparison compare-image-jre: $(TEMP_PREV_JRE_COMPARISON) diff -r bbfd732ae37d -r 3594c77c6634 make/java/text/base/Makefile --- a/make/java/text/base/Makefile Mon Jan 14 15:01:29 2013 +0000 +++ b/make/java/text/base/Makefile Wed May 22 17:02:43 2013 +0100 @@ -81,6 +81,7 @@ $(TEXT_SOURCES) $(MKDIR) -p $(TEXT_CLASSDIR) $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ + -Xbootclasspath/a:$(ABS_OUTPUTDIR)/classes \ -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ -o $(TEXT_CLASSDIR) \ -spec $(UNICODEDATA)/UnicodeData.txt diff -r bbfd732ae37d -r 3594c77c6634 make/sun/font/FILES_c.gmk --- a/make/sun/font/FILES_c.gmk Mon Jan 14 15:01:29 2013 +0000 +++ b/make/sun/font/FILES_c.gmk Wed May 22 17:02:43 2013 +0100 @@ -106,7 +106,21 @@ OpenTypeLayoutEngine.cpp \ ThaiLayoutEngine.cpp \ ScriptAndLanguageTags.cpp \ - FontInstanceAdapter.cpp + FontInstanceAdapter.cpp \ + ContextualGlyphInsertionProc2.cpp \ + ContextualGlyphSubstProc2.cpp \ + GXLayoutEngine2.cpp \ + IndicRearrangementProcessor2.cpp \ + LigatureSubstProc2.cpp \ + MorphTables2.cpp \ + NonContextualGlyphSubstProc2.cpp \ + SegmentArrayProcessor2.cpp \ + SegmentSingleProcessor2.cpp \ + SimpleArrayProcessor2.cpp \ + SingleTableProcessor2.cpp \ + StateTableProcessor2.cpp \ + SubtableProcessor2.cpp \ + TrimmedArrayProcessor2.cpp ifeq ($(PLATFORM),windows) diff -r bbfd732ae37d -r 3594c77c6634 make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Mon Jan 14 15:01:29 2013 +0000 +++ b/make/sun/javazic/tzdata/VERSION Wed May 22 17:02:43 2013 +0100 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2012i +tzdata2013b diff -r bbfd732ae37d -r 3594c77c6634 make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Mon Jan 14 15:01:29 2013 +0000 +++ b/make/sun/javazic/tzdata/africa Wed May 22 17:02:43 2013 +0100 @@ -27,9 +27,9 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz at elsie.nci.nih.gov for general use in the future). +# tz at iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -48,6 +48,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# . +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -139,8 +143,12 @@ 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -212,6 +220,11 @@ # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -352,7 +365,7 @@ Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea @@ -447,6 +460,20 @@ # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). From andrew at icedtea.classpath.org Wed May 22 09:42:30 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:42:30 +0000 Subject: /hg/release/icedtea7-forest-2.3: Remove jcheck Message-ID: changeset fb1ac57ada6c in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=fb1ac57ada6c author: andrew date: Wed May 22 17:41:59 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 73c29b209f76 -r fb1ac57ada6c .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:42:36 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:42:36 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: Remove jcheck Message-ID: changeset d483d101f145 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d483d101f145 author: andrew date: Wed May 22 17:42:08 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r affff8c7b584 -r d483d101f145 .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:10 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:42:42 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:42:42 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxp: Remove jcheck Message-ID: changeset 1a02956fcfaf in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=1a02956fcfaf author: andrew date: Wed May 22 17:42:01 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 26be0c933625 -r 1a02956fcfaf .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:11 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:42:48 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:42:48 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: Remove jcheck Message-ID: changeset 462c087afa98 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=462c087afa98 author: andrew date: Wed May 22 17:42:07 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r ba432018cb80 -r 462c087afa98 .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:13 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:42:54 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:42:54 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: Remove jcheck Message-ID: changeset 2791ba417e96 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=2791ba417e96 author: andrew date: Wed May 22 17:42:04 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 0d9ff3ffd433 -r 2791ba417e96 .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:13 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:43:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:43:00 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Remove jcheck Message-ID: changeset 85d97ab28295 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=85d97ab28295 author: andrew date: Wed May 22 17:42:03 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 332f7e24a493 -r 85d97ab28295 .jcheck/conf --- a/.jcheck/conf Wed Apr 17 21:26:58 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:43:07 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:43:07 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Remove jcheck Message-ID: changeset d9291e4158bb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d9291e4158bb author: andrew date: Wed May 22 17:42:12 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 073c0458daef -r d9291e4158bb .jcheck/conf --- a/.jcheck/conf Wed Apr 17 13:52:20 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:15 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:15 +0000 Subject: /hg/release/icedtea7-forest-2.2: Remove jcheck Message-ID: changeset 0cc24300e6de in /hg/release/icedtea7-forest-2.2 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2?cmd=changeset;node=0cc24300e6de author: andrew date: Wed May 22 17:56:59 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r e9f163772cc1 -r 0cc24300e6de .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:22 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:21 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:21 +0000 Subject: /hg/release/icedtea7-forest-2.2/corba: Remove jcheck Message-ID: changeset a4775a012956 in /hg/release/icedtea7-forest-2.2/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=a4775a012956 author: andrew date: Wed May 22 17:57:06 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r ac8577a3d814 -r a4775a012956 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:23 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:27 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:27 +0000 Subject: /hg/release/icedtea7-forest-2.2/jaxp: Remove jcheck Message-ID: changeset 5ce90e84aa21 in /hg/release/icedtea7-forest-2.2/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=5ce90e84aa21 author: andrew date: Wed May 22 17:57:01 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 15ed6fe28351 -r 5ce90e84aa21 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:24 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:33 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:33 +0000 Subject: /hg/release/icedtea7-forest-2.2/jaxws: Remove jcheck Message-ID: changeset 1257bb90b9c0 in /hg/release/icedtea7-forest-2.2/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws?cmd=changeset;node=1257bb90b9c0 author: andrew date: Wed May 22 17:57:04 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r a8bd8eb5f503 -r 1257bb90b9c0 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:25 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:39 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:39 +0000 Subject: /hg/release/icedtea7-forest-2.2/langtools: Remove jcheck Message-ID: changeset 42c083007206 in /hg/release/icedtea7-forest-2.2/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools?cmd=changeset;node=42c083007206 author: andrew date: Wed May 22 17:57:03 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r ec2046261dd2 -r 42c083007206 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:26 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:45 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:45 +0000 Subject: /hg/release/icedtea7-forest-2.2/hotspot: Remove jcheck Message-ID: changeset be28736de085 in /hg/release/icedtea7-forest-2.2/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=be28736de085 author: andrew date: Wed May 22 17:57:02 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r bb93816a6af8 -r be28736de085 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:47:27 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 09:57:51 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 16:57:51 +0000 Subject: /hg/release/icedtea7-forest-2.2/jdk: Remove jcheck Message-ID: changeset 518d2e1d3549 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=518d2e1d3549 author: andrew date: Wed May 22 17:57:08 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r dd9d3f378968 -r 518d2e1d3549 .jcheck/conf --- a/.jcheck/conf Mon Apr 29 14:59:40 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:20:35 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:20:35 +0000 Subject: /hg/release/icedtea7-forest-2.1: Remove jcheck Message-ID: changeset 34d809e0dba3 in /hg/release/icedtea7-forest-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1?cmd=changeset;node=34d809e0dba3 author: andrew date: Wed May 22 18:20:17 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r e81133df0e68 -r 34d809e0dba3 .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:09 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:20:41 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:20:41 +0000 Subject: /hg/release/icedtea7-forest-2.1/corba: Remove jcheck Message-ID: changeset 2302bd5191fe in /hg/release/icedtea7-forest-2.1/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=2302bd5191fe author: andrew date: Wed May 22 18:20:25 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 993b231e094c -r 2302bd5191fe .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:11 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:20:47 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:20:47 +0000 Subject: /hg/release/icedtea7-forest-2.1/jaxp: Remove jcheck Message-ID: changeset 2c3bc21169f9 in /hg/release/icedtea7-forest-2.1/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp?cmd=changeset;node=2c3bc21169f9 author: andrew date: Wed May 22 18:20:18 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 8d85c6ed5d9b -r 2c3bc21169f9 .jcheck/conf --- a/.jcheck/conf Fri Apr 19 14:19:40 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:20:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:20:52 +0000 Subject: /hg/release/icedtea7-forest-2.1/jaxws: Remove jcheck Message-ID: changeset 3b68ea3b56d8 in /hg/release/icedtea7-forest-2.1/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxws?cmd=changeset;node=3b68ea3b56d8 author: andrew date: Wed May 22 18:20:24 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 3575c3e3ea54 -r 3b68ea3b56d8 .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:12 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:20:58 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:20:58 +0000 Subject: /hg/release/icedtea7-forest-2.1/langtools: Remove jcheck Message-ID: changeset 9a3628594576 in /hg/release/icedtea7-forest-2.1/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools?cmd=changeset;node=9a3628594576 author: andrew date: Wed May 22 18:20:23 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 6ba437b7f00c -r 9a3628594576 .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:13 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:21:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:21:04 +0000 Subject: /hg/release/icedtea7-forest-2.1/hotspot: Remove jcheck Message-ID: changeset 4a73d25caf23 in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=4a73d25caf23 author: andrew date: Wed May 22 18:20:20 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 2e9917f8c2b2 -r 4a73d25caf23 .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:15 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed May 22 10:21:11 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 22 May 2013 17:21:11 +0000 Subject: /hg/release/icedtea7-forest-2.1/jdk: Remove jcheck Message-ID: changeset b14271a17d58 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b14271a17d58 author: andrew date: Wed May 22 18:20:28 2013 +0100 Remove jcheck diffstat: .jcheck/conf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (6 lines): diff -r 2d91409e8c5d -r b14271a17d58 .jcheck/conf --- a/.jcheck/conf Thu Apr 18 15:05:19 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From ptisnovs at icedtea.classpath.org Thu May 23 02:00:46 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 23 May 2013 09:00:46 +0000 Subject: /hg/gfx-test: Five new helper methods added into ClippingCircleB... Message-ID: changeset d6873b45de6e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d6873b45de6e author: Pavel Tisnovsky date: Thu May 23 11:04:10 2013 +0200 Five new helper methods added into ClippingCircleByRectangleShape test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java | 125 ++++++++++ 2 files changed, 130 insertions(+), 0 deletions(-) diffs (154 lines): diff -r f9cf11fe37b7 -r d6873b45de6e ChangeLog --- a/ChangeLog Wed May 22 10:18:54 2013 +0200 +++ b/ChangeLog Thu May 23 11:04:10 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-23 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: + Five new helper methods added into ClippingCircleByRectangleShape test suite. + 2013-05-22 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleArea.java: diff -r f9cf11fe37b7 -r d6873b45de6e src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Wed May 22 10:18:54 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Thu May 23 11:04:10 2013 +0200 @@ -120,6 +120,31 @@ /** * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * black color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintBlack(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillBlackColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with * red color and selected transparency. * * @param image @@ -194,6 +219,106 @@ } /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * magenta color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintMagenta(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillMagentaColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * cyan color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintCyan(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillCyanColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * yellow color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintYellow(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillYellowColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * white color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintWhite(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillWhiteColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** * Check if circle shape could be clipped by a rectangle shape. Circle is * rendered using stroke paint. * From ptisnovs at icedtea.classpath.org Thu May 23 02:03:44 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 23 May 2013 09:03:44 +0000 Subject: /hg/rhino-tests: Updated four tests in InvocableClassTest for (O... Message-ID: changeset a78c74e600b3 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a78c74e600b3 author: Pavel Tisnovsky date: Thu May 23 11:07:12 2013 +0200 Updated four tests in InvocableClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/InvocableClassTest.java | 62 ++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diffs (113 lines): diff -r dcd99aa87cdd -r a78c74e600b3 ChangeLog --- a/ChangeLog Wed May 22 10:29:08 2013 +0200 +++ b/ChangeLog Thu May 23 11:07:12 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-23 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Updated four tests in InvocableClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-22 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r dcd99aa87cdd -r a78c74e600b3 src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Wed May 22 10:29:08 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Thu May 23 11:07:12 2013 +0200 @@ -440,9 +440,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.invocableClass.getFields(); @@ -467,10 +480,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.invocableClass.getDeclaredFields(); @@ -495,8 +521,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -522,8 +561,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From andrew at icedtea.classpath.org Thu May 23 03:27:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 23 May 2013 10:27:09 +0000 Subject: /hg/icedtea7: 3 new changesets Message-ID: changeset bf48618cb792 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=bf48618cb792 author: Andrew John Hughes date: Wed May 22 18:36:25 2013 +0100 Add latest release notes. 2013-05-22 Andrew John Hughes * NEWS: Add latest release notes. changeset fd1f181911cc in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fd1f181911cc author: Andrew John Hughes date: Wed May 22 20:59:34 2013 +0100 Remove CACAO changes which only appear on the loop branch. 2013-05-22 Andrew John Hughes * NEWS: Remove CACAO changes which only appear on the loop branch. changeset 02bbff3d71ff in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=02bbff3d71ff author: Andrew John Hughes date: Thu May 23 11:26:52 2013 +0100 Synchronise NEWS with forest updates. 2013-05-23 Andrew John Hughes * NEWS: Update with fixes brought in by latest forest updates. diffstat: ChangeLog | 14 +++ NEWS | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 274 insertions(+), 14 deletions(-) diffs (truncated from 529 to 500 lines): diff -r c8821d8403ff -r 02bbff3d71ff ChangeLog --- a/ChangeLog Thu May 16 14:27:22 2013 +0100 +++ b/ChangeLog Thu May 23 11:26:52 2013 +0100 @@ -1,3 +1,17 @@ +2013-05-23 Andrew John Hughes + + * NEWS: Update with fixes brought in by latest + forest updates. + +2013-05-22 Andrew John Hughes + + * NEWS: Remove CACAO changes which only appear + on the loop branch. + +2013-05-22 Andrew John Hughes + + * NEWS: Add latest release notes. + 2013-05-16 Andrew John Hughes * javac.in: Fix accidental inclusion of diff -r c8821d8403ff -r 02bbff3d71ff NEWS --- a/NEWS Thu May 16 14:27:22 2013 +0100 +++ b/NEWS Thu May 23 11:26:52 2013 +0100 @@ -16,12 +16,17 @@ - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. - PR1206, S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK - S2202276: Swing HTML parser can't properly decode codepoints outside the Unicode Plane 0 into a surrogate pair + - S2223196: [macosx] Situation when KeyEventDispatcher doesn't work on AWT but does on Swing - S4310381: Text in multi-row/col JTabbedPane tabs can be truncated/clipped - S4631925: JColor Chooser is not fully accessible - S4988100: oop_verify_old_oop appears to be dead + - S6183404: Many eudc characters are incorrectly mapped in MS936 and GBK converter - S6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K - S6310967: SA: jstack -m produce failures in output - S6340864: Implement vectorization optimizations in hotspot-server + - S6444286: Possible naked oop related to biased locking revocation safepoint in jni_exit() + - S6512101: Incorrect encoding in NetworkInterface.getDisplayName() + - S6550588: java.awt.Desktop cannot open file with Windows UNC filename - S6610897: New constructor in sun.tools.java.ClassPath builds a path using File.separator instead of File.pathSeparator - S6625113: Add the normalize and rmkw perl script to the openjdk repository or openjdk site? - S6633549: (dc) Include-mode filtering of IPv6 sources does not block datagrams on Linux @@ -30,8 +35,14 @@ - S6677625: Move platform specific flags from globals.hpp to globals_.hpp - S6711908: JVM needs direct access to some annotations - S6720349: (ch) Channels tests depending on hosts inside Sun + - S6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient + - S6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX - S6789984: JPasswordField can not receive keyboard input + - S6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently - S6818524: G1: use ergonomic resizing of PLABs + - S6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java + - S6871190: Don't terminate JVM if it is running in a non-interactive session + - S6877495: JTextField and JTextArea does not support supplementary characters - S6910461: Register allocator may insert spill code at wrong insertion index - S6910464: Lookupswitch and Tableswitch default branches not recognized as safepoints - S6921087: G1: remove per-GC-thread expansion tables from the fine-grain remembered sets @@ -40,20 +51,29 @@ - S6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently - S6952814: sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java failing in PIT - S6953455: CookieStore.add() cannot handle null URI parameter, contrary to the API + - S6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing + - S6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh + - S6963841: java/util/concurrent/Phaser/Basic.java fails intermittently - S6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long - S6983728: JSR 292 remove argument count limitations + - S6983966: remove lzma and upx from repository JDK7u - S6984705: JSR 292 method handle creation should not go through JNI - S6988099: jvmti demos missing Publisher (COMPANY resource) in dlls/exes on windows - S6995781: Native Memory Tracking (Phase 1) - S6997116: The case automatically failed due to java.lang.ClassCastException. - S7017818: NLS: JConsoleResources.java cannot be handled by translation team + - S7021010: java/lang/Thread/ThreadStateTest.java fails intermittently - S7023639: JSR 292 method handle invocation needs a fast path for compiled code - S7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement() - S7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f - S7025938: Add bitmap mime type to content-types.properties + - S7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space - S7032018: The file list in JFileChooser does not have an accessible name + - S7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address - S7032436: When running with the Nimbus look and feel, the JFileChooser does not display mnemonics - S7041879: G1: introduce stress testing parameter to cause frequent evacuation failures + - S7042126: (alt-rt) HashMap.clone implementation should be re-examined + - S7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 - S7049024: DnD fails with JTextArea and JTextField - S7053586: TEST: runtime/7020373/Test7020373.sh fails on 64-bit platforms - S7054918: jdk_security1 test target cleanup @@ -68,26 +88,40 @@ - S7068471: NPE in sun.font.FontConfigManager.getFontConfigFont() when libfontconfig.so is not installed - S7068625: Testing 8 bytes of card table entries at a time speeds up card-scanning - S7072120: No mac os x support in several regression tests + - S7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) + - S7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin - S7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows + - S7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal + - S7078386: NetworkInterface.getNetworkInterfaces() may return corrupted results on linux + - S7081476: test/java/net/InetSocketAddress/B6469803.java failing intermittently - S7083664: TEST_BUG: test hard code of using c:/temp but this dir might not exist + - S7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently - S7084560: Crash in net.dll - S7087357: JSR 292: remove obsolete code after 7085860 - S7087658: MethodHandles.Lookup.findVirtual is confused by interface methods that are multiply inherited - S7087969: GarbageCollectorMXBean notification contains ticks vs millis - S7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile - S7089914: Focus on image icons are not visible in javaws cache with high contrast mode + - S7092905: C2: Keep track of the number of dead nodes - S7093328: JVMTI: jvmtiPrimitiveFieldCallback always report 0's for static primitives - S7094176: (tz) Incorrect TimeZone display name when DST not applicable / disabled - S7100054: (porting) Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h - S7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified + - S7102300: performance warnings cause results diff failure in Test6890943 - S7103665: HeapWord*ParallelScavengeHeap::failed_mem_allocate(unsigned long,bool)+0x97 + - S7103957: NegativeArraySizeException while initializing class IntegerCache - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu - S7104209: Cleanup and remove librmi (native library) - S7104577: Changes for 7104209 cause many RMI tests to fail + - S7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default - S7105640: Unix printing does not check the result of exec'd lpr/lp command + - S7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc + - S7107135: Stack guard pages are no more protected after loading a shared library with executable stack - S7107613: scalability blocker in javax.crypto.CryptoPermissions - S7107616: scalability blocker in javax.crypto.JceSecurityManager - S7107957: AWT: Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h + - S7109096: keytool -genkeypair needn't call -selfcert + - S7109274: Restrict the use of certificates with RSA keys less than 1024 bits - S7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field. - S7110104: It should be possible to stop and start JMX Agent at runtime - S7110151: Use underlying platform's zlib library for Java zlib support @@ -105,11 +139,13 @@ - S7123170: JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02 - S7123767: Wrong tooltip location in Multi-Monitor configurations - S7123926: Some CTW test crash: !_control.contains(ctrl) + - S7124209: [macosx] SpringLayout issue. BASELINE is not in the range: [NORTH, SOUTH] - S7124242: [macosx] Test doesn't work because of the frame round corners in the LaF - S7124244: [macosx] Shaped windows support - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage - S7124375: [macosx] Focus isn't transfered as expected between components - S7124513: [macosx] Support NSTexturedBackgroundWindowMask/different titlebar styles to create unified toolbar + - S7124525: [macosx] No animation on certain Swing components in Aqua LaF - S7127687: MethodType leaks memory due to interning - S7127697: G1: remove dead code after recent concurrent mark changes - S7127792: Add the ability to change an existing PeriodicTask's execution interval @@ -128,10 +164,12 @@ - S7131629: Generalize the CMS free list code - S7132070: Use a mach_port_t as the OSThread thread_id rather than pthread_t on BSD/OSX - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin + - S7132385: [macosx] IconifyTest of RepaintManager could use some delay - S7132889: (se) AbstractSelectableChannel.register and configureBlocking not safe from asynchronous close - S7132924: (dc) DatagramChannel.disconnect throws SocketException with IPv4 socket and IPv6 enabled [macosx] - S7133111: libsaproc debug print should be printed as unsigned long to fit large numbers on 64bit platform - S7133857: exp() and pow() should use the x87 ISA on x86 + - S7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData - S7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable - S7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built - S7142596: RMI JPRT tests are failing @@ -140,6 +178,7 @@ - S7143511: G1: Another instance of high GC Worker Other time (50ms) - S7143858: G1: Back to back young GCs with the second GC having a minimally sized eden - S7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages + - S7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently - S7144861: speed up RMI activation tests - S7145024: Crashes in ucrypto related to C2 - S7145358: SA throws ClassCastException for partially loaded ConstantPool @@ -149,9 +188,11 @@ - S7146442: assert(false) failed: bad AD file - S7146506: (fc) Add EACCES check to the return of fcntl native method - S7146572: enableInputMethod(false) does not work in the TextArea and TextField on the linux platform + - S7146636: compiler/6865265/StackOverflowBug.java fails due to changed stack minimum - S7146700: new hotspot build - hs24-b01 - S7146763: Warnings cleanup in the sun.rmi and related packages - S7147064: assert(allocates2(pc)) failed: not in CodeBuffer memory: 0xffffffff778d9d60 <= 0xffffffff778da69c + - S7147075: JTextField doesn't get focus or loses focus forever - S7147408: [macosx] Add autodelay to fix a regression test - S7147416: LogCompilation tool does not work with post parse inlining - S7147464: Java crashed while executing method with over 8k of dneg operations @@ -187,8 +228,10 @@ - S7152519: Dependency on non-POSIX header file causes portability problem - S7152700: new hotspot build - hs24-b04 - S7152791: wbapi tests fail on cygwin + - S7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate - S7152800: All tests using the attach API fail with "well-known file is not secure" on Mac OS X - S7152811: Issues in client compiler + - S7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows - S7152948: DatagramDispatcher.c should memset msghdr to make it portable to other platforms - S7152954: G1: Native memory leak during full GCs - S7152955: print_method crashes with null root @@ -197,7 +240,9 @@ - S7153339: InternalError when drawLine with Xor and Antialiasing - S7153343: Dependency on non-POSIX header file causes portability problem - S7153374: ARM ONLY .. linking problem with new compilers.. Need to use -fPIC + - S7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java - S7154030: java.awt.Component.hide() does not repaint parent component + - S7154114: jstat tests failing on non-english locales - S7154333: JVM fails to start if -XX:+AggressiveHeap is set - S7154517: Build error in hotspot-gc without precompiled headers - S7154638: Change download.oracle.com to docs.oracle.com in jdk/make/docs/Makefile @@ -252,10 +297,13 @@ - S7161437: [macosx] awt.FileDialog doesn't respond appropriately for mac when selecting folders - S7161545: G1: Minor cleanups to the G1 logging - S7161732: Improve handling of thread_id in OSThread + - S7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified - S7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7162063: libsaproc debug print should format size_t correctly on 64bit platform - S7162094: LateInlineCallGenerator::do_late_inline crashed on uninitialized _call_node + - S7162111: TEST_BUG: change tests run in headless mode [macosx] - S7162144: Missing AWT thread in headless mode in 7u4 b06 + - S7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again - S7162488: VM not printing unknown -XX options - S7162726: Wrong filter predicate of visible locals in SA JSJavaFrame - S7162955: Attach api on Solaris, too many open files @@ -377,6 +425,7 @@ - S7178667: ALT_EXPORT_PATH does not export server jvm on macosx - S7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table - S7178703: Fix handling of quoted arguments and better error messages in dcmd + - S7178741: SA: jstack -m produce UnalignedAddressException in output (Linux) - S7178846: IterateThroughHeap: heap_iteration_callback passes a negative size - S7179138: Incorrect result with String concatenation optimization - S7179305: (fs) Method name sun.nio.fs.UnixPath.getPathForExecptionMessage is misspelled @@ -404,12 +453,14 @@ - S7181986: NMT ON: Assertion failure when running jdi ExpiredRequestDeletionTest - S7181989: NMT ON: Assertion failure when NMT checks thread's native stack base address - S7181995: NMT ON: NMT assertion failure assert(cur_vm->is_uncommit_record() || cur_vm->is_deallocation_record + - S7182152: Instrumentation hot swap test incorrect monitor count - S7182226: NLS: jdk7u6 message drop20 integration - S7182260: G1: Fine grain RSet freeing bottleneck - S7182500: OCSP revocation checking fails if OCSP responce does not contain certificates - S7182543: NMT ON: Aggregate a few NMT related bugs - S7182902: [macosx] Test api/java_awt/GraphicsDevice/indexTGF.html#SetDisplayMode fails on Mac OS X 10.7 - S7182971: Need to include documentation content for JCMD man page + - S7183203: ShortRSAKeynnn.sh tests intermittent failure - S7183209: Backout 7105952 changes for jdk7u - S7183251: Netbeans editor renders text wrong on JDK 7u6 build - S7183292: HttpURLConnection.getHeaderFields() throws IllegalArgumentException: Illegal cookie name @@ -455,6 +506,7 @@ - S7187618: PropertyDescriptor Performance Slow - S7187834: [macosx] Usage of private API in macosx 2d implementation causes Apple Store rejection - S7187876: ClassCastException in TCPTransport.executeAcceptLoop + - S7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently - S7188114: (launcher) need an alternate command line parser for Windows - S7188168: 7071904 broke the DEBUG_BINARIES option on Linux - S7188176: The JVM should differentiate between T and M series and adjust GC ergonomics @@ -517,6 +569,7 @@ - S7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties - S7194004: new hotspot build - hs24-b22 - S7194032: update tests for upcoming changes for jtreg + - S7194035: update tests for upcoming changes for jtreg - S7194184: JColorChooser swatch cannot accessed from keyboard - S7194409: os::javaTimeNanos() shows hot on CPU_CLK_UNHALTED profiles - S7194469: Pressing the Enter key results in an alert tone beep when focus is TextField @@ -614,6 +667,7 @@ - S8001071: Add simple range check into VM implemenation of Unsafe access methods - S8001101: C2: more general vector rule subsetting - S8001124: jdk7u ProblemList.txt updates (10/2012) + - S8001161: mac: EmbeddedFrame doesn't become active window - S8001174: new hotspot build - hs24-b23 - S8001175: new hotspot build - hs24-b24 - S8001183: incorrect results of char vectors right shift operaiton @@ -621,6 +675,7 @@ - S8001208: Fix for KRB5CCNAME not complete - S8001591: NMT: assertion failed: assert(rec->addr() + rec->size() <= cur->base()) failed: Can not overlap in memSnapshot.cpp - S8001592: NMT: assertion failed: assert(_amount >= amt) failed: Just check: memBaseline.hpp:180 + - S8001621: Update awk scripts that check output from jps/jcmd - S8001635: assert(in_bb(n)) failed: must be - S8001662: new hotspot build - hs24-b25 - S8001756: Hotspot makefiles report missing OBJCOPY command in the wrong circumstances @@ -636,6 +691,8 @@ - S8002227: (tz) Support tzdata2012i - S8002273: NMT to report JNI memory leaks when -Xcheck:jni is on - S8002294: assert(VM_Version::supports_ssse3()) failed + - S8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently + - S8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode - S8002344: Krb5LoginModule config class does not return proper KDC list from DNS - S8002362: Build fails after integration of 7185280 to jdk7u-dev - S8003230: new hotspot build - hs24-b26 @@ -657,16 +714,83 @@ - S8004131: move jdi tests out of core testset - S8004170: G1: Verbose GC output is not getting flushed to log file using JDK 8 - S8004188: Rename src/share/lib/security/java.security to java.security-linux + - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported - S8004337: java/sql tests aren't run in test/Makefile - S8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c - S8004391: Bug fix in jtreg causes test failures in pre jdk 8 langtools tests + - S8004640: C2 assert failure in memnode.cpp: NULL+offs not RAW address - S8004713: Stackoverflowerror thrown when thread stack straddles 0x80000000 - S8004748: clean up @build tags in RMI tests - S8004802: jcmd VM.native_memory baseline=false crashes VM - S8004846: Time-specific certpath validation applies to all certs involved + - S8004925: java/net/Socks/SocksV4Test.java failing on all platforms - S8005035: new hotspot build - hs24-b28 + - S8005290: remove -showversion from RMI test library subprocess mechanism + - S8005460: [findbugs] Probably returned array should be cloned + - S8005556: java/net/Socks/SocksV4Test.java is missing @run tag + - S8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running + - S8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. + - S8005943: (process) Improved Runtime.exec + - S8006120: Provide "Server JRE" for 7u train + - S8006309: More reliable control panel operation + - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X + - S8006435: Improvements in JMX + - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times + - S8006536: [launcher] removes trailing slashes on arguments + - S8006560: java/net/ipv6tests/B6521014.java fails intermittently + - S8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit + - S8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac + - S8006753: fix failed for JDK-8002415 White box testing API for HotSpot + - S8006777: Improve TLS handling of invalid messages + - S8006790: Improve checking for windows + - S8006795: Improve font warning messages + - S8007014: Improve image handling + - S8007406: Improve accessibility of AccessBridge + - S8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 + - S8007617: Better validation of images + - S8007667: Better image reading + - S8007675: Improve color conversion + - S8007688: Blacklist known bad certificate + - S8007701: Hotspot trace allocation events + - S8007918: Better image writing + - S8008081: Print outs do not have matching arguments + - S8008140: Better method handle resolution + - S8008223: java/net/BindException/Test.java fails rarely + - S8008249: Sync ICU into JDK : + - S8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. + - S8008737: The trace event vm/gc/heap/summary is missing for CMS + - S8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up + - S8008917: CMS: Concurrent mode failure tracing event + - S8008920: Tracing events for heap statistics + - S8009032: Implement evacuation info event + - S8009165: Fix for 8008817 needs revision + - S8009305: Improve AWT data transfer + - S8009399: Bump the hsx build number for APRIL CPU + - S8009460: C2compiler crash in machnode::in_regmask(unsigned int) + - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. + - S8009530: ICU Kern table support broken + - S8009610: Blacklist certificate used with malware. + - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version + - S8009677: Better setting of setters + - S8009699: Methodhandle lookup + - S8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode + - S8009814: Better driver management + - S8009857: Problem with plugin + - S8009881: TEST_BUG: javax/swing/JTree/8004298/bug8004298.java should be modified + - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) + - S8010294: Refactor HeapInspection to make it more reusable + - S8010651: create.bat still builds the kernel + - S8010916: Add tenuring threshold to young garbage collection events + - S8010939: Deadlock in LogManager + - S8011021: new hotspot build - hs24-b39 + - S8011400: missing define OPENJDK for windows builds + - S8011583: new hotspot build - hs24-b40 + - S8011699: CMS: assert(_shared_gc_info.id() != SharedGCInfo::UNSET_GCID) failed: GC not started? + - S8011745: Unknown CertificateChoices + - S8011867: Accept unknown PKCS #9 attributes + - S8012572: Exclude sun/tools/jmap/Basic.sh for short term * Backports - - PR1197, S8003120: ResourceManager.getApplicationResources() does not close InputStreams + - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams * Bug fixes - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use - Add NSS (commented out) to other platforms. @@ -677,8 +801,14 @@ - Remove file apparently removed as part of upstreaming of Zero. - Revert 7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - - Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg to fix PR473 + - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg - PR716: IcedTea7 should bootstrap with IcedTea6 + - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6. + - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set + - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. + - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. + - Make sure libffi cflags and libs are used. + - PR1378: Add AArch64 support to Zero * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. @@ -690,18 +820,6 @@ - arm: Thumb interworking should work on armv5 - Fixed using typename declarations for clang - src/native/vm/openjdk/sun_misc_Perf.cpp: Implement high resolution timer. - - Loop analysis completed. - - Finding variable assignments between block and idom(block). - - fully redundant ABC removal - - finding counter variables - - more efficient version of Interval, Scalar and NumericInstruction. - - simple loop duplication - - loop duplication: nested loops - - loop duplication: non-negative increments - - loop duplication: decreasing index - - ABC grouping implemented, NullPointerException now thrown at correct position after loop duplication - - NullPointerException now thrown at the correct position after ABC grouping. - - IntervalMap improved. - CA166: make check-langtools failure: MineField.sh - CA167: intern strings in get_StackTraceElement - src/native/vm/openjdk/jvm.cpp: Recreate JVM_Available. @@ -727,6 +845,134 @@ - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives +New in release 2.1.8 (2013-05-02): + +* Security fixes + - S6657673, CVE-2013-1518: Issues with JAXP + - S7200507: Refactor Introspector internals + - S8000724, CVE-2013-2417: Improve networking serialization + - S8001031, CVE-2013-2419: Better font processing + - S8001040, CVE-2013-1537: Rework RMI model + - S8001322: Refactor deserialization + - S8001329, CVE-2013-1557: Augment RMI logging + - S8003335: Better handling of Finalizer thread + - S8003445: Adjust JAX-WS to focus on API + - S8003543, CVE-2013-2415: Improve processing of MTOM attachments + - S8004261: Improve input validation + - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames + - S8004986, CVE-2013-2383: Better handling of glyph table + - S8004987, CVE-2013-2384: Improve font layout + - S8004994, CVE-2013-1569: Improve checking of glyph table + - S8005432: Update access to JAX-WS + - S8005943: (process) Improved Runtime.exec + - S8006309: More reliable control panel operation + - S8006435, CVE-2013-2424: Improvements in JMX + - S8006790: Improve checking for windows + - S8006795: Improve font warning messages + - S8007406: Improve accessibility of AccessBridge + - S8007617, CVE-2013-2420: Better validation of images + - S8007667, CVE-2013-2430: Better image reading + - S8007918, CVE-2013-2429: Better image writing + - S8008140: Better method handle resolution + - S8009049, CVE-2013-2436: Better method handle binding + - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap + - S8009305, CVE-2013-0401: Improve AWT data transfer + - S8009677, CVE-2013-2423: Better setting of setters + - S8009699, CVE-2013-2421: Methodhandle lookup + - S8009814, CVE-2013-1488: Better driver management + - S8009857, CVE-2013-2422: Problem with plugin +* Backports + - S7130662, RH928500: GTK file dialog crashes with a NPE +* Bug fixes + - PR1363: Fedora 19 / rawhide FTBFS SIGILL + - Fix offset problem in ICU LETableReference. + - Don't create debuginfo files if not stripping. + +New in release 2.2.8 (2013-04-30): + +* Security fixes + - S6657673, CVE-2013-1518: Issues with JAXP + - S7200507: Refactor Introspector internals + - S8000724, CVE-2013-2417: Improve networking serialization + - S8001031, CVE-2013-2419: Better font processing + - S8001040, CVE-2013-1537: Rework RMI model + - S8001322: Refactor deserialization + - S8001329, CVE-2013-1557: Augment RMI logging + - S8003335: Better handling of Finalizer thread + - S8003445: Adjust JAX-WS to focus on API + - S8003543, CVE-2013-2415: Improve processing of MTOM attachments + - S8004261: Improve input validation + - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames + - S8004986, CVE-2013-2383: Better handling of glyph table + - S8004987, CVE-2013-2384: Improve font layout + - S8004994, CVE-2013-1569: Improve checking of glyph table + - S8005432: Update access to JAX-WS + - S8005943: (process) Improved Runtime.exec + - S8006309: More reliable control panel operation + - S8006435, CVE-2013-2424: Improvements in JMX + - S8006790: Improve checking for windows + - S8006795: Improve font warning messages + - S8007406: Improve accessibility of AccessBridge + - S8007617, CVE-2013-2420: Better validation of images + - S8007667, CVE-2013-2430: Better image reading + - S8007918, CVE-2013-2429: Better image writing + - S8008140: Better method handle resolution + - S8009049, CVE-2013-2436: Better method handle binding + - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap + - S8009305, CVE-2013-0401: Improve AWT data transfer + - S8009677, CVE-2013-2423: Better setting of setters + - S8009699, CVE-2013-2421: Methodhandle lookup + - S8009814, CVE-2013-1488: Better driver management + - S8009857, CVE-2013-2422: Problem with plugin +* Backports + - S7130662, RH928500: GTK file dialog crashes with a NPE + - S8009530: ICU Kern table support broken + +New in release 2.3.9 (2013-04-21): + +* Security fixes + - S6657673, CVE-2013-1518: Issues with JAXP + - S7200507: Refactor Introspector internals + - S8000724, CVE-2013-2417: Improve networking serialization + - S8001031, CVE-2013-2419: Better font processing + - S8001040, CVE-2013-1537: Rework RMI model + - S8001322: Refactor deserialization + - S8001329, CVE-2013-1557: Augment RMI logging + - S8003335: Better handling of Finalizer thread + - S8003445: Adjust JAX-WS to focus on API + - S8003543, CVE-2013-2415: Improve processing of MTOM attachments + - S8004261: Improve input validation + - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames + - S8004986, CVE-2013-2383: Better handling of glyph table + - S8004987, CVE-2013-2384: Improve font layout + - S8004994, CVE-2013-1569: Improve checking of glyph table + - S8005432: Update access to JAX-WS From adomurad at redhat.com Thu May 23 12:19:34 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 23 May 2013 15:19:34 -0400 Subject: [icedtea-web][rfc] Extract native code caching from JNLPClassLoader into a small class In-Reply-To: <513F3AFC.2040109@redhat.com> References: <5136618B.70505@redhat.com> <513F3AFC.2040109@redhat.com> Message-ID: <519E6BC6.7070007@redhat.com> On 03/12/2013 10:26 AM, Jiri Vanek wrote: > On 03/05/2013 10:20 PM, Adam Domurad wrote: >> This is an incremental part of the effort to reduce the >> responsibilities of JNLPClassLoader. >> >> 2013-03-05 Adam Domurad >> >> * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New, >> stores and searches for native library files that are loaded from jars. >> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code >> that handled native jar caching to NativeLibraryStorage. >> >> Happy hacking, >> -Adam > > Is there any more reason for this refactoring then much nicer, more > readable, and testable jnlpclasslaoder? > Anyway I'm fan of this kind of refactoring. And I'm for this to be done. > > - there must be unittests for this chnage > - i would like to see even reproducer for this > - it should go to 1.3 to after some time in head. Probably a little late now, but 1.4 sure, unless you think 1.3 is still a good idea. > > I have not check if there is something more then pure refactoring, but > if there isn't and tsts will be added, then this will be approved. It is a refactoring only. > > J. I have created some unit tests, hopefully it is enough to push with ? There is some bundled refactoring of the test extensions, hopefully it is ok. 2013-05-23 Adam Domurad * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: Moved MockedOneJarJNLPFile to separate DummyJNLPFileWithJar. Moved utilities to ExecUtils & FileDescriptorUtils. * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java: New, tests lookup of native libraries from folders and jars. * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java: Moved from JNLPClassLoaderTest.MockedOneJarJNLPFile. * tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java: New, provides utility for exec'ing cleanly and logging. * tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java (getOpenFileDescriptorCount): Moved here, counts open files. (assertNoFileLeak): Moved here, asserts a runnable does not leak file descriptors. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: test-native-library-storage.patch Type: text/x-patch Size: 26631 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130523/5be7e012/test-native-library-storage.patch From bugzilla-daemon at icedtea.classpath.org Fri May 24 00:00:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 24 May 2013 07:00:06 +0000 Subject: [Bug 1455] New: JVM crashing - SSL_write causing the issue Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 Bug ID: 1455 Summary: JVM crashing - SSL_write causing the issue Classification: Unclassified Product: IcedTea Version: 6-1.8.13 Hardware: 64-bit OS: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: senthil.jayakumar at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 874 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=874&action=edit coredump logs Hi, JVM crashes, while running automation (perl) script, to those scripts are used test some of the core functionality of our product, however the automation script is not interacting with JAVA at all. openjdk version used by us: (java -version output) OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) I have attached coredump file for your reference. Appreciate your quick response on this. Thanks, Senthil Jayakumar -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130524/979536f6/attachment.html From ptisnovs at icedtea.classpath.org Fri May 24 02:58:08 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 24 May 2013 09:58:08 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltBasicTests test suite. Message-ID: changeset 5cadebb88f79 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5cadebb88f79 author: Pavel Tisnovsky date: Fri May 24 12:01:33 2013 +0200 Six new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 91 ++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diffs (113 lines): diff -r d6873b45de6e -r 5cadebb88f79 ChangeLog --- a/ChangeLog Thu May 23 11:04:10 2013 +0200 +++ b/ChangeLog Fri May 24 12:01:33 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-24 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Six new tests added into BitBltBasicTests test suite. + 2013-05-23 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: diff -r d6873b45de6e -r 5cadebb88f79 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu May 23 11:04:10 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri May 24 12:01:33 2013 +0200 @@ -4065,6 +4065,97 @@ } /** + * Test basic BitBlt operation for vertical blue gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Fri May 24 03:01:32 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 24 May 2013 10:01:32 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptEngineFactoryClassT... Message-ID: changeset 81b74072fff0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=81b74072fff0 author: Pavel Tisnovsky date: Fri May 24 12:04:59 2013 +0200 Updated four tests in ScriptEngineFactoryClassTest for (Open)JDK8 API: getField, getDeclaredField, getFields and getDeclaredFields. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 62 ++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diffs (113 lines): diff -r a78c74e600b3 -r 81b74072fff0 ChangeLog --- a/ChangeLog Thu May 23 11:07:12 2013 +0200 +++ b/ChangeLog Fri May 24 12:04:59 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-24 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Updated four tests in ScriptEngineFactoryClassTest for (Open)JDK8 API: + getField, getDeclaredField, getFields and getDeclaredFields. + 2013-05-23 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r a78c74e600b3 -r 81b74072fff0 src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Thu May 23 11:07:12 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Fri May 24 12:04:59 2013 +0200 @@ -440,9 +440,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.scriptEngineFactoryClass.getFields(); @@ -467,10 +480,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.scriptEngineFactoryClass.getDeclaredFields(); @@ -495,8 +521,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -522,8 +561,23 @@ }; final String[] declaredFieldsThatShouldExist_jdk7 = { }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From bugzilla-daemon at icedtea.classpath.org Fri May 24 06:23:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 24 May 2013 13:23:25 +0000 Subject: [Bug 1455] JVM crashing - SSL_write causing the issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |adomurad at redhat.com --- Comment #1 from Adam Domurad --- Hi, do you have any steps to reproduce this problem? Can you see what is being done by Java right before the crash ? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130524/70fa8db9/attachment.html From aazores at redhat.com Fri May 24 07:06:33 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 24 May 2013 10:06:33 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls Message-ID: <519F73E9.8070101@redhat.com> As per this bug , added some logic to JNLP Parser to "strip" any characters after and including semicolons following file extension for resource files. eg if there is a file specified as "lib/application.jar;no_javaws_cheat" then it will be parsed as "lib/application.jar" instead. Changelog: netx/net/sourceforge/jnlp/Parser.java Andrew A -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130524/056d98d0/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: jar_name_semicolon_stripping.patch Type: text/x-patch Size: 929 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130524/056d98d0/jar_name_semicolon_stripping.patch From bugzilla-daemon at icedtea.classpath.org Fri May 24 11:16:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 24 May 2013 18:16:32 +0000 Subject: [Bug 1252] icedtea-web-1.3 on icedtea-2.3.3 with seamonkey-2.13.2 plugin not detected In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1252 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |jvanek at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130524/7ea92ce7/attachment.html From aazores at redhat.com Fri May 24 12:45:46 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 24 May 2013 15:45:46 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <519CD4B1.3030708@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> Message-ID: <519FC36A.8070505@redhat.com> On 05/22/2013 10:22 AM, Jiri Vanek wrote: > On 05/22/2013 03:25 PM, Andrew Azores wrote: >> Removed applications.html and references to it in "jawas -about" >> >> Changelog: >> >> extra/net/sourceforge/javaws/about/Main.java: Removed applications tab >> extra/net/sourceforge/javaws/about/resources/applications.html: >> Removed unneeded file > > > Hi! To be honest - I'm for complete removal of this "about". Or at > least of much more havy refactoring > > Also to be honest(2) this is so deeply needed that it deserves an line > in http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 table. > > It should work at least somehow in headless mode, and should be > generated from already existing resources (eg authors, news...) > > So in short - get rid of "extras" jar (and it logic in makefile) and > write specialised about dialogue inisde netx itself:) Feel free to be > inspired by existing one, but avoid duplicated resources. > > if you want to bother with it (+1!) then please assign yourself on > http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5, and go on! > > > > Best regards from CZ! > J. Hi Jiri, I'll take a look into creating that dialogue, it should be a good opportunity for me to keep learning more about the code base before delving into more difficult tasks. Thanks for the feedback. Andrew A From bugzilla-daemon at icedtea.classpath.org Sun May 26 06:05:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 26 May 2013 13:05:08 +0000 Subject: [Bug 1455] JVM crashing - SSL_write causing the issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #874|application/octet-stream |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130526/df2c9896/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun May 26 06:06:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 26 May 2013 13:06:18 +0000 Subject: [Bug 1455] JVM crashing - SSL_write causing the issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Hardware|64-bit |x86_64 Resolution|--- |WONTFIX Severity|critical |normal --- Comment #2 from Andrew John Hughes --- 1.8.13 has not been supported for a long time. Please re-open this bug if you can replicate this on a supported version (1.11.x or 1.12.x). -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130526/10748a4f/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 02:57:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 09:57:21 +0000 Subject: [Bug 1458] New: [IcedTea6] Make use of bootstrap tools & -Xbootclasspath patches optional Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1458 Bug ID: 1458 Summary: [IcedTea6] Make use of bootstrap tools & -Xbootclasspath patches optional Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org This syncs IcedTea 1.x with the changes made to 2.x in PR716. It reduces the bootstrap patch footprint and makes it clearer what each patch is for. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/6be94e21/attachment.html From andrew at icedtea.classpath.org Mon May 27 03:02:06 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 27 May 2013 10:02:06 +0000 Subject: /hg/icedtea6: PR1458: Make use of bootstrap tools & -Xbootclassp... Message-ID: changeset 632c42c569f8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=632c42c569f8 author: Andrew John Hughes date: Mon May 27 11:00:32 2013 +0100 PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional 2013-05-15 Andrew John Hughes PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional * INSTALL: Document --disable-bootstrap-tools. * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException if any of the constructors are missing. (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, no-sun-classes, bootstrap-tools and xbootclasspath patches from icedtea.patch. Make the latter two conditional. * NEWS: Updated. * acinclude.m4: (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools to decide whether to use the boot javac/javah or the one built as part of langtools. Defaults to on. (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java can be passed -Xbootclasspath/p to prepend a path to the bootclasspath or not. * configure.ac: Invoke the new macros and test for the java.sql.SQLException constructors. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, respectively. * patches/ecj/bootstrap-tools.patch: Split from icedtea.patch. Uses the bootstrap javac and javah rather than the langtools one for CORBA and JDK. * patches/ecj/corba-dependencies.patch: Include the langtools source directory on the sourcepath. * patches/ecj/fphexconstants.patch: Split replacements of floating point hex constants out from icedtea.patch. * patches/ecj/icedtea.patch: Remove split-out segements. Drop addition of ICEDTEA_RT in BuildToolJar.gmk and common/Rules.gmk in JDK altogether, along with setting of bootclasspath in langtools. * patches/ecj/needs-6.patch: Add java.awt Makefile. * patches/ecj/no-sun-classes.patch: Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the bootclasspath in java.text, sun.text and sun.javazic Makefiles for VMs without internal Sun classes. * patches/ecj/xbootclasspath.patch: Replaces the use of -Xbootclasspath in java.text, sun.text and sun.javazic for those VMs that don't support it (gcj). diffstat: ChangeLog | 50 +++++++ INSTALL | 13 +- Makefile.am | 35 +++++- NEWS | 1 + acinclude.m4 | 61 +++++++++ configure.ac | 9 + javac.in | 24 +++- patches/ecj/bootstrap-tools.patch | 87 +++++++++++++ patches/ecj/corba-dependencies.patch | 14 +- patches/ecj/fphexconstants.patch | 60 +++++++++ patches/ecj/icedtea.patch | 233 ----------------------------------- patches/ecj/needs-6.patch | 12 + patches/ecj/no-sun-classes.patch | 35 +++++ patches/ecj/xbootclasspath.patch | 45 ++++++ 14 files changed, 440 insertions(+), 239 deletions(-) diffs (truncated from 880 to 500 lines): diff -r a371c1860804 -r 632c42c569f8 ChangeLog --- a/ChangeLog Mon May 20 13:25:41 2013 +0200 +++ b/ChangeLog Mon May 27 11:00:32 2013 +0100 @@ -1,3 +1,53 @@ +2013-05-15 Andrew John Hughes + + PR1458: Make use of bootstrap tools & -Xbootclasspath + patches optional + * INSTALL: Document --disable-bootstrap-tools. + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException + if any of the constructors are missing. + (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, + no-sun-classes, bootstrap-tools and xbootclasspath + patches from icedtea.patch. Make the latter two + conditional. + * NEWS: Updated. + * acinclude.m4: + (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools + to decide whether to use the boot javac/javah or the + one built as part of langtools. Defaults to on. + (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java + can be passed -Xbootclasspath/p to prepend a path + to the bootclasspath or not. + * configure.ac: Invoke the new macros and test + for the java.sql.SQLException constructors. + * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath + and -Xbootclasspath/a by prepending, setting or appending + its value to the bootclasspath option used to ecj, + respectively. + * patches/ecj/bootstrap-tools.patch: + Split from icedtea.patch. Uses the bootstrap + javac and javah rather than the langtools one for + CORBA and JDK. + * patches/ecj/corba-dependencies.patch: + Include the langtools source directory on the sourcepath. + * patches/ecj/fphexconstants.patch: + Split replacements of floating point hex constants out + from icedtea.patch. + * patches/ecj/icedtea.patch: + Remove split-out segements. Drop addition of ICEDTEA_RT + in BuildToolJar.gmk and common/Rules.gmk in JDK altogether, + along with setting of bootclasspath in langtools. + * patches/ecj/needs-6.patch: + Add java.awt Makefile. + * patches/ecj/no-sun-classes.patch: + Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the + bootclasspath in java.text, sun.text and sun.javazic + Makefiles for VMs without internal Sun classes. + * patches/ecj/xbootclasspath.patch: + Replaces the use of -Xbootclasspath in java.text, + sun.text and sun.javazic for those VMs that don't + support it (gcj). + 2013-05-20 Pavel Tisnovsky * patches/jtreg-TextLayoutBoundsChecks.patch: diff -r a371c1860804 -r 632c42c569f8 INSTALL --- a/INSTALL Mon May 20 13:25:41 2013 +0200 +++ b/INSTALL Mon May 27 11:00:32 2013 +0100 @@ -154,6 +154,7 @@ * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset. * --with-llvm-config: Specify the location of the llvm-config binary. +* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below. @@ -191,7 +192,7 @@ PulseAudio which can be enabled using --enable-pulse-java. The resulting provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider. -Xrender Support +XRender Support =============== IcedTea6 includes support for an Xrender-based rendering pipeline @@ -329,7 +330,7 @@ other than x86/x86_64/sparc). As 'hs23' is known not to work with Zero or Shark, 'original' is still the default for these builds. -Javascript Support +JavaScript Support ================== IcedTea6 adds Javascript support via the javax.script API by using @@ -348,6 +349,14 @@ avoids conflicts between the JDK's copy of Rhino and any used by other applications. +Bootstrap Tools +=============== + +For bootstrap builds, the option --disable-bootstrap-tools can be used +to make use of the javac and javah built as part of the langtools build, +rather than the bootstrap tools. The default setting of this option is +to use the bootstrap tools. + Building Additional Virtual Machines ==================================== diff -r a371c1860804 -r 632c42c569f8 Makefile.am --- a/Makefile.am Mon May 20 13:25:41 2013 +0200 +++ b/Makefile.am Mon May 27 11:00:32 2013 +0100 @@ -140,6 +140,27 @@ $(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java endif +#PR57420 - java.sql.SQLException +if LACKS_JAVA_SQL_EXCEPTION_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +endif +endif +endif +endif + # Flags MEMORY_LIMIT = -J-Xmx1024m IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -678,7 +699,9 @@ patches/ecj/corba-dependencies.patch \ patches/ecj/jaxws-langtools-dependency.patch \ patches/ecj/jaxws-jdk-dependency.patch \ - patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch + patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch \ + patches/ecj/fphexconstants.patch \ + patches/ecj/no-sun-classes.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ @@ -692,6 +715,16 @@ endif endif +if !DISABLE_BOOTSTRAP_TOOLS +ICEDTEA_ECJ_PATCHES += \ + patches/ecj/bootstrap-tools.patch +endif + +if !VM_SUPPORTS_XBOOTCLASSPATH +ICEDTEA_ECJ_PATCHES += \ + patches/ecj/xbootclasspath.patch +endif + if !WITH_PAX ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif diff -r a371c1860804 -r 632c42c569f8 NEWS --- a/NEWS Mon May 20 13:25:41 2013 +0200 +++ b/NEWS Mon May 27 11:00:32 2013 +0100 @@ -15,6 +15,7 @@ * New features - PR1317: Provide an option to build with a more up-to-date HotSpot + - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional * Backports - S8009641: OpenJDK 6 build broken via 8007675 fix - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build diff -r a371c1860804 -r 632c42c569f8 acinclude.m4 --- a/acinclude.m4 Mon May 20 13:25:41 2013 +0200 +++ b/acinclude.m4 Mon May 27 11:00:32 2013 +0100 @@ -1933,6 +1933,67 @@ AC_PROVIDE([$0])dnl ]) +AC_DEFUN_ONCE([IT_USE_BOOTSTRAP_TOOLS], +[ + AC_MSG_CHECKING([whether to disable the use of bootstrap tools for bootstrapping]) + AC_ARG_ENABLE([bootstrap-tools], + [AS_HELP_STRING(--disable-bootstrap-tools, + disable the use of bootstrap tools for bootstrapping [[default=no]])], + [ + case "${enableval}" in + no) + disable_bootstrap_tools=yes + ;; + *) + disable_bootstrap_tools=no + ;; + esac + ], + [ + disable_bootstrap_tools=no; + ]) + AC_MSG_RESULT([$disable_bootstrap_tools]) + AM_CONDITIONAL([DISABLE_BOOTSTRAP_TOOLS], test x"${disable_bootstrap_tools}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_XBOOTCLASSPATH], +[ + AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) + AC_CACHE_CHECK([if the VM supports -Xbootclasspath], it_cv_xbootclasspath_works, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ + +public class Test +{ + public static void main(String[] args) + { + System.out.println("Hello World!"); + } +}] +EOF + mkdir build + if $JAVAC -d build -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -Xbootclasspath/p:build $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_xbootclasspath_works=yes; + else + it_cv_xbootclasspath_works=no; + fi + else + it_cv_xbootclasspath_works=no; + fi + rm -f $CLASS build/*.class + rmdir build + cd .. + rmdir tmp.$$ + ]) + AC_PROVIDE([$0])dnl + AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes") +]) + AC_DEFUN_ONCE([IT_WITH_PAX], [ AC_MSG_CHECKING([for pax utility to use]) diff -r a371c1860804 -r 632c42c569f8 configure.ac --- a/configure.ac Mon May 20 13:25:41 2013 +0200 +++ b/configure.ac Mon May 27 11:00:32 2013 +0100 @@ -154,6 +154,12 @@ [new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList()).getParameters()] ) +dnl PR57420 - java.sql.SQLException +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()]) + # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) @@ -254,6 +260,9 @@ AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) +IT_USE_BOOTSTRAP_TOOLS +IT_CHECK_FOR_XBOOTCLASSPATH + IT_FIND_RHINO_JAR IT_WITH_OPENJDK_SRC_ZIP IT_WITH_HOTSPOT_SRC_ZIP diff -r a371c1860804 -r 632c42c569f8 javac.in --- a/javac.in Mon May 20 13:25:41 2013 +0200 +++ b/javac.in Mon May 27 11:00:32 2013 +0100 @@ -7,7 +7,29 @@ my $JAVAC_WARNINGS="-nowarn"; my @bcoption; -push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' +my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; +my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV; +my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV; +my $bcp = $bcoptionsp[0]; +my $bc = $bcoptions[0]; +my $bca = $bcoptionsa[0]; +my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +if ($bcp) +{ + $bcp =~ s/^[^:]*://; + $systembc = join ":", $bcp, $systembc; +} +if ($bc) +{ + $bc =~ s/^[^:]*://; + $systembc = $bc; +} +if ($bca) +{ + $bca =~ s/^[^:]*://; + $systembc = join ":", $systembc, $bca; +} +push @bcoption, '-bootclasspath', $systembc unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-XDignore.symbol.file=true'); diff -r a371c1860804 -r 632c42c569f8 patches/ecj/bootstrap-tools.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/bootstrap-tools.patch Mon May 27 11:00:32 2013 +0100 @@ -0,0 +1,87 @@ +diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -116,35 +116,17 @@ + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar ++JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + +-# Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -124,34 +124,18 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR) + + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + + # Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif ++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC diff -r a371c1860804 -r 632c42c569f8 patches/ecj/corba-dependencies.patch --- a/patches/ecj/corba-dependencies.patch Mon May 20 13:25:41 2013 +0200 +++ b/patches/ecj/corba-dependencies.patch Mon May 27 11:00:32 2013 +0100 @@ -8,11 +8,21 @@ - $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \ -+ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \ ++ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(LANGTOOLS_TOPDIR)/src/share/classes" \ + -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \ -+ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \ ++ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(LANGTOOLS_TOPDIR)/src/share/classes" \ + -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup) +--- openjdk-ecj.orig/make/Defs-internal.gmk ++++ openjdk-ecj/make/Defs-internal.gmk +@@ -305,6 +305,7 @@ + + # Common make arguments (supplied to all component builds) + COMMON_BUILD_ARGUMENTS = \ ++ LANGTOOLS_TOPDIR=$(ABS_LANGTOOLS_TOPDIR) \ + JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ + JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \ + EXTERNALSANITYCONTROL=true \ diff -r a371c1860804 -r 632c42c569f8 patches/ecj/fphexconstants.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/fphexconstants.patch Mon May 27 11:00:32 2013 +0100 @@ -0,0 +1,60 @@ +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffffffffffP+1023} and also equal to + * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. + */ +- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 ++ public static final double MAX_VALUE = 1.7976931348623157e+308; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 ++ public static final double MIN_NORMAL = 2.2250738585072014E-308; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -95,7 +95,7 @@ + * {@code 0x0.0000000000001P-1022} and also equal to + * {@code Double.longBitsToDouble(0x1L)}. + */ +- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 ++ public static final double MIN_VALUE = 4.9e-324; + + /** + * Maximum exponent a finite {@code double} variable may have. +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffeP+127f} and also equal to + * {@code Float.intBitsToFloat(0x7f7fffff)}. + */ +- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f ++ public static final float MAX_VALUE = 3.4028235e+38f; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f ++ public static final float MIN_NORMAL = 1.17549435E-38f; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -94,7 +94,7 @@ + * hexadecimal floating-point literal {@code 0x0.000002P-126f} + * and also equal to {@code Float.intBitsToFloat(0x1)}. + */ +- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f ++ public static final float MIN_VALUE = 1.4e-45f; + + /** + * Maximum exponent a finite {@code float} variable may have. It diff -r a371c1860804 -r 632c42c569f8 patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Mon May 20 13:25:41 2013 +0200 +++ b/patches/ecj/icedtea.patch Mon May 27 11:00:32 2013 +0100 @@ -327,50 +327,6 @@ # # We want to privatize JVM symbols on Solaris. This is so the user can -diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk ---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 -@@ -116,35 +116,17 @@ - CLASS_VERSION = -target $(TARGET_CLASS_VERSION) - JAVACFLAGS += $(CLASS_VERSION) - JAVACFLAGS += -encoding ascii --JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar -+JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:02:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:02:19 +0000 Subject: [Bug 1458] [IcedTea6] Make use of bootstrap tools & -Xbootclasspath patches optional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1458 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=632c42c569f8 author: Andrew John Hughes date: Mon May 27 11:00:32 2013 +0100 PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional 2013-05-15 Andrew John Hughes PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional * INSTALL: Document --disable-bootstrap-tools. * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException if any of the constructors are missing. (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, no-sun-classes, bootstrap-tools and xbootclasspath patches from icedtea.patch. Make the latter two conditional. * NEWS: Updated. * acinclude.m4: (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools to decide whether to use the boot javac/javah or the one built as part of langtools. Defaults to on. (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java can be passed -Xbootclasspath/p to prepend a path to the bootclasspath or not. * configure.ac: Invoke the new macros and test for the java.sql.SQLException constructors. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, respectively. * patches/ecj/bootstrap-tools.patch: Split from icedtea.patch. Uses the bootstrap javac and javah rather than the langtools one for CORBA and JDK. * patches/ecj/corba-dependencies.patch: Include the langtools source directory on the sourcepath. * patches/ecj/fphexconstants.patch: Split replacements of floating point hex constants out from icedtea.patch. * patches/ecj/icedtea.patch: Remove split-out segements. Drop addition of ICEDTEA_RT in BuildToolJar.gmk and common/Rules.gmk in JDK altogether, along with setting of bootclasspath in langtools. * patches/ecj/needs-6.patch: Add java.awt Makefile. * patches/ecj/no-sun-classes.patch: Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the bootclasspath in java.text, sun.text and sun.javazic Makefiles for VMs without internal Sun classes. * patches/ecj/xbootclasspath.patch: Replaces the use of -Xbootclasspath in java.text, sun.text and sun.javazic for those VMs that don't support it (gcj). -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/36519a62/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:03:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:03:43 +0000 Subject: [Bug 1458] [IcedTea6] Make use of bootstrap tools & -Xbootclasspath patches optional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1458 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Blocks| |1272 Resolution|--- |FIXED Target Milestone|--- |6-1.13.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/1b0ff692/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:03:45 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:03:45 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Bug 1272 depends on bug 1458, which changed state. Bug 1458 Summary: [IcedTea6] Make use of bootstrap tools & -Xbootclasspath patches optional http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1458 What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/1082428c/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:03:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:03:43 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1458 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/a1b92e1e/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:08:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:08:27 +0000 Subject: [Bug 1411] openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh test failure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1411 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Version|unspecified |2.3.9 Target Milestone|--- |2.3.10 --- Comment #1 from Andrew John Hughes --- I think you'll find it's more that 2.3.x doesn't have 7142596 because it's based on u6. We can certainly backport it to the 2.3.x branch. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/bf4638ba/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:10:10 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:10:10 +0000 Subject: [Bug 1413] IcedTea 3; OpenJDK 8 undefined reference to libz during link of unpack200 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1413 --- Comment #1 from Andrew John Hughes --- How are you configuring IcedTea to trigger this error? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/03ea6c85/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:10:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:10:43 +0000 Subject: [Bug 1427] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1427 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #866|text/x-log |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/b6856efd/attachment.html From ptisnovs at icedtea.classpath.org Mon May 27 03:12:38 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 27 May 2013 10:12:38 +0000 Subject: /hg/gfx-test: Added support for generating five new procedural t... Message-ID: changeset 4cc60b13c813 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4cc60b13c813 author: Pavel Tisnovsky date: Mon May 27 12:16:05 2013 +0200 Added support for generating five new procedural texture types. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/ProceduralTextureFactory.java | 160 ++++++++++++++++ 2 files changed, 165 insertions(+), 0 deletions(-) diffs (180 lines): diff -r 5cadebb88f79 -r 4cc60b13c813 ChangeLog --- a/ChangeLog Fri May 24 12:01:33 2013 +0200 +++ b/ChangeLog Mon May 27 12:16:05 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-27 Pavel Tisnovsky + + * src/org/gfxtest/framework/ProceduralTextureFactory.java: + Added support for generating five new procedural texture types. + 2013-05-24 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 5cadebb88f79 -r 4cc60b13c813 src/org/gfxtest/framework/ProceduralTextureFactory.java --- a/src/org/gfxtest/framework/ProceduralTextureFactory.java Fri May 24 12:01:33 2013 +0200 +++ b/src/org/gfxtest/framework/ProceduralTextureFactory.java Mon May 27 12:16:05 2013 +0200 @@ -1047,4 +1047,164 @@ return RGBTexture1; } + /** + * Create new RGB pattern using given image type. + * + * @param width + * width of a texture + * @param height + * height of a texture + * @param imageType + * required image type + * @return buffered image containing texture + */ + public static BufferedImage createRGBTexture2(int width, int height, int imageType) + { + // create new texture instead + RGBTexture2 = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int red = colorComponentFromXOrYCoordinate(width, x); + int green = colorComponentFromXOrYCoordinate(height, y); + int blue = 0xff; + int color = makeRGBColor(red, green, blue); + RGBTexture2.setRGB(x, y, color); + } + } + return RGBTexture2; + } + + /** + * Create new RGB pattern using given image type. + * + * @param width + * width of a texture + * @param height + * height of a texture + * @param imageType + * required image type + * @return buffered image containing texture + */ + public static BufferedImage createRGBTexture3(int width, int height, int imageType) + { + // create new texture instead + RGBTexture3 = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int red = 0; + int green = colorComponentFromXOrYCoordinate(height, y); + int blue = colorComponentFromXOrYCoordinate(width, x); + int color = makeRGBColor(red, green, blue); + RGBTexture3.setRGB(x, y, color); + } + } + return RGBTexture3; + } + + /** + * Create new RGB pattern using given image type. + * + * @param width + * width of a texture + * @param height + * height of a texture + * @param imageType + * required image type + * @return buffered image containing texture + */ + public static BufferedImage createRGBTexture4(int width, int height, int imageType) + { + // create new texture instead + RGBTexture4 = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int red = 0xff; + int green = colorComponentFromXOrYCoordinate(width, x); + int blue = colorComponentFromXOrYCoordinate(height, y); + int color = makeRGBColor(red, green, blue); + RGBTexture4.setRGB(x, y, color); + } + } + return RGBTexture4; + } + + /** + * Create new RGB pattern using given image type. + * + * @param width + * width of a texture + * @param height + * height of a texture + * @param imageType + * required image type + * @return buffered image containing texture + */ + public static BufferedImage createRGBTexture5(int width, int height, int imageType) + { + // create new texture instead + RGBTexture5 = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int red = colorComponentFromXOrYCoordinate(width, x); + int green = 0; + int blue = colorComponentFromXOrYCoordinate(height, y); + int color = makeRGBColor(red, green, blue); + RGBTexture5.setRGB(x, y, color); + } + } + return RGBTexture5; + } + + /** + * Create new RGB pattern using given image type. + * + * @param width + * width of a texture + * @param height + * height of a texture + * @param imageType + * required image type + * @return buffered image containing texture + */ + public static BufferedImage createRGBTexture6(int width, int height, int imageType) + { + // create new texture instead + RGBTexture6 = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int red = colorComponentFromXOrYCoordinate(width, x); + int green = 0xff; + int blue = colorComponentFromXOrYCoordinate(height, y); + int color = makeRGBColor(red, green, blue); + RGBTexture6.setRGB(x, y, color); + } + } + return RGBTexture6; + } + } From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:13:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:13:44 +0000 Subject: [Bug 1427] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1427 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Version|unspecified |6-1.8.13 Resolution|--- |INVALID --- Comment #1 from Andrew John Hughes --- This version is no longer supported. >From the log, it seems that this is an Eclipse error. It fails in Gtk+ code. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/a6e52065/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:14:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:14:37 +0000 Subject: [Bug 1429] Problem with Java run time environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1429 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Version|unspecified |6-1.8.13 Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- This version is no longer supported. Please re-open if this bug can be reproduced on 1.11.x or 1.12.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/ee27421c/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 03:15:52 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 10:15:52 +0000 Subject: [Bug 1432] Runescape updater gets stuck at 2 percent In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1432 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea |Plugin Version|2.3.8 |unspecified Assignee|gnu.andrew at redhat.com |dbhole at redhat.com Product|IcedTea |IcedTea-Web --- Comment #3 from Andrew John Hughes --- Moving to plugin. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/854d52e6/attachment.html From ptisnovs at icedtea.classpath.org Mon May 27 03:19:45 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 27 May 2013 10:19:45 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptEngineFactoryClassT... Message-ID: changeset 40d19c67580c in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=40d19c67580c author: Pavel Tisnovsky date: Mon May 27 12:23:11 2013 +0200 Updated four tests in ScriptEngineFactoryClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 114 ++++++++++++++++++- 2 files changed, 116 insertions(+), 4 deletions(-) diffs (172 lines): diff -r 81b74072fff0 -r 40d19c67580c ChangeLog --- a/ChangeLog Fri May 24 12:04:59 2013 +0200 +++ b/ChangeLog Mon May 27 12:23:11 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-27 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Updated four tests in ScriptEngineFactoryClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-05-24 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 81b74072fff0 -r 40d19c67580c src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Fri May 24 12:04:59 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Mon May 27 12:23:11 2013 +0200 @@ -629,6 +629,21 @@ "public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getLanguageName()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getLanguageVersion()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getMethodCallSyntax(java.lang.String,java.lang.String,java.lang.String[])", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getOutputStatement(java.lang.String)", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getProgram(java.lang.String[])", + "public abstract java.util.List javax.script.ScriptEngineFactory.getExtensions()", + "public abstract java.util.List javax.script.ScriptEngineFactory.getMimeTypes()", + "public abstract java.util.List javax.script.ScriptEngineFactory.getNames()", + "public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()", + }; + // get all inherited methods Method[] methods = this.scriptEngineFactoryClass.getMethods(); // and transform the array into a list of method names @@ -636,7 +651,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -679,6 +707,21 @@ "public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.ScriptEngineFactory.getParameter(java.lang.String)", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineName()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getEngineVersion()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getLanguageName()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getLanguageVersion()", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getMethodCallSyntax(java.lang.String,java.lang.String,java.lang.String[])", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getOutputStatement(java.lang.String)", + "public abstract java.lang.String javax.script.ScriptEngineFactory.getProgram(java.lang.String[])", + "public abstract java.util.List javax.script.ScriptEngineFactory.getExtensions()", + "public abstract java.util.List javax.script.ScriptEngineFactory.getMimeTypes()", + "public abstract java.util.List javax.script.ScriptEngineFactory.getNames()", + "public abstract javax.script.ScriptEngine javax.script.ScriptEngineFactory.getScriptEngine()", + }; + // get all declared methods Method[] declaredMethods = this.scriptEngineFactoryClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -686,7 +729,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -727,7 +783,32 @@ methodsThatShouldExist_jdk7.put("getProgram", new Class[] {String[].class}); methodsThatShouldExist_jdk7.put("getScriptEngine", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("getEngineName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getEngineVersion", new Class[] {}); + methodsThatShouldExist_jdk8.put("getMimeTypes", new Class[] {}); + methodsThatShouldExist_jdk8.put("getNames", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLanguageName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLanguageVersion", new Class[] {}); + methodsThatShouldExist_jdk8.put("getParameter", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getMethodCallSyntax", new Class[] {java.lang.String.class, java.lang.String.class, String[].class}); + methodsThatShouldExist_jdk8.put("getOutputStatement", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getProgram", new Class[] {String[].class}); + methodsThatShouldExist_jdk8.put("getScriptEngine", new Class[] {}); + methodsThatShouldExist_jdk8.put("getExtensions", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -781,7 +862,32 @@ methodsThatShouldExist_jdk7.put("getProgram", new Class[] {String[].class}); methodsThatShouldExist_jdk7.put("getScriptEngine", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("getEngineName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getEngineVersion", new Class[] {}); + methodsThatShouldExist_jdk8.put("getMimeTypes", new Class[] {}); + methodsThatShouldExist_jdk8.put("getNames", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLanguageName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLanguageVersion", new Class[] {}); + methodsThatShouldExist_jdk8.put("getParameter", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getMethodCallSyntax", new Class[] {java.lang.String.class, java.lang.String.class, String[].class}); + methodsThatShouldExist_jdk8.put("getOutputStatement", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getProgram", new Class[] {String[].class}); + methodsThatShouldExist_jdk8.put("getScriptEngine", new Class[] {}); + methodsThatShouldExist_jdk8.put("getExtensions", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From jvanek at redhat.com Mon May 27 03:56:28 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 27 May 2013 12:56:28 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <519FC36A.8070505@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> Message-ID: <51A33BDC.4090002@redhat.com> On 05/24/2013 09:45 PM, Andrew Azores wrote: > On 05/22/2013 10:22 AM, Jiri Vanek wrote: >> On 05/22/2013 03:25 PM, Andrew Azores wrote: >>> Removed applications.html and references to it in "jawas -about" >>> >>> Changelog: >>> >>> extra/net/sourceforge/javaws/about/Main.java: Removed applications tab >>> extra/net/sourceforge/javaws/about/resources/applications.html: Removed unneeded file >> >> >> Hi! To be honest - I'm for complete removal of this "about". Or at least of much more havy >> refactoring >> >> Also to be honest(2) this is so deeply needed that it deserves an line in >> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 table. >> >> It should work at least somehow in headless mode, and should be generated from already existing >> resources (eg authors, news...) >> >> So in short - get rid of "extras" jar (and it logic in makefile) and write specialised about >> dialogue inisde netx itself:) Feel free to be inspired by existing one, but avoid duplicated >> resources. >> >> if you want to bother with it (+1!) then please assign yourself on >> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5, and go on! >> >> >> >> Best regards from CZ! >> J. > > Hi Jiri, > > I'll take a look into creating that dialogue, it should be a good opportunity for me to keep > learning more about the code base before delving into more difficult tasks. > here you are http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 :)) Please try to move in as small steps as possible or split the patch to as many logically-complete parts as possible, otherwise they will be very difficult to review. This change should be simple code, but there will be probably huger amount of it. You can start with moving the window into embedded one out of extreas. Also it would be nice to have as much of it generated from NEWS, AUTHORS, maybe Changelog, COPYING? Reuse the rest? just nits... I do not wont to put boundaries to your imagination which must be much more fresh then my is :) Best regards J. From bugzilla-daemon at icedtea.classpath.org Mon May 27 04:11:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 11:11:04 +0000 Subject: [Bug 1413] IcedTea 3; OpenJDK 8 undefined reference to libz during link of unpack200 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1413 --- Comment #2 from Xerxes R?nby --- (In reply to comment #1) > How are you configuring IcedTea to trigger this error? This build used the following config: hg clone http://icedtea.classpath.org/hg/icedtea cd icedtea ./autogen.sh cd .. mkdir icedtea-8-b80 cd icedtea-8-b80 ../icedtea/configure --enable-jamvm --with-jdk-home=/usr/lib/jvm/java-7-openjdk-i386 make -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/1dab6881/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon May 27 04:47:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 27 May 2013 11:47:04 +0000 Subject: [Bug 1432] Runescape updater gets stuck at 2 percent In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1432 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |jvanek at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130527/ba196e9d/attachment.html From jvanek at redhat.com Mon May 27 05:41:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 27 May 2013 14:41:00 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <519F73E9.8070101@redhat.com> References: <519F73E9.8070101@redhat.com> Message-ID: <51A3545C.3070405@redhat.com> Hi! At first several global hint: Following of http://icedtea.classpath.org/wiki/CommitPolicy is moreover a must, especially: "IcedTea-Web code changes/new feature should be accompanied with appropriate tests (JUnit class and/or reproducer). If no tests are added/modified, changes should be accompanied with an explanation as to why. " This is exactly the situation when both of them is worthy. To add an unittest you need one or more method to be added into same package and SameFileTest in tests/unit/sampe_package/SameFile.Test In case that your method will remain where it is now then into tests/netx/unit/net/sourceforge/jnlp/ParserTest.java will be added test method(s) for getURL(..) where you will try to torture this method as much as possible (....;.)(...;)(;....) as much corner cases as possible.. and of course some normal cases. Also include please some filing cases (where failure is en expectation). If you will include tests also for already existing code, even better! By this many bugs have been already cough and found. Maybe some refactoring will be needed in current code to make it testable eg: - your new code will be moved to separate method, so you will be able to test it atomically - maybe method getURL will jsut call static getURL with some more parameters. static getUrl may have better testability. (but it is you decision whether make static getURL or create Parser instances in tests - choose wise!-)) To add an reproducer is a little bit more work. Pelase read http://icedtea.classpath.org/wiki/Reproducers. Me, jfabriko or adam may provide xchat-help if needed :) Basically you will provide one or more jnlp files which will be testing the ";" appearences and class with main method to be jarred and launched via your jnlp. Maybe your exact case will need also second jar as with extension. Then yoou create testcase where you will call individual jnlp. If your case is affecting also applets, then html file9s) have to be provided. The main class(es) is mostly very simple - just printing out :aplet name launched" "service name used". In testcase you are then just examining the output. Don't get scared if you will found that more code is needed to test your change then to achieve the desired fix. I'm sorry for "redundant" work, but it is really necessary. To code itself: On 05/24/2013 04:06 PM, Andrew Azores wrote: > As per this bug , added some logic to JNLP > Parser to "strip" any characters after and including semicolons following file extension for > resource files. eg if there is a file specified as "lib/application.jar;no_javaws_cheat" then it > will be parsed as "lib/application.jar" instead. > > Changelog: > netx/net/sourceforge/jnlp/Parser.java > > Andrew A > > jar_name_semicolon_stripping.patch > > > diff --git a/netx/net/sourceforge/jnlp/Parser.java b/netx/net/sourceforge/jnlp/Parser.java > --- a/netx/net/sourceforge/jnlp/Parser.java > +++ b/netx/net/sourceforge/jnlp/Parser.java > @@ -1064,6 +1064,15 @@ class Parser { > */ > public URL getURL(Node node, String name, URL base) throws ParseException { > String href = getAttribute(node, name, null); > + > + if (href != null) { Maybe this can be moved behinf the if (href == null) block, and so avid this check. Please if so, add the brackets to if (href == null) check: > if (href == null){ > return null; // so that code can throw an exception if attribute was required > } > + int lastPeriod = href.lastIndexOf('.'); I'm not 100% sure what this means - you are checking of last appearence of dot, why? You wan to avoid case like this;is;my.jar;and_this_not ? Then maybe little bit of sophistication like href.toUpperCase.lastIndexof(".JAR") is worhty. If so, are you really trying to avoid case like starngejar;ignored;ignored;ignored ? I must say I do not like this, but maybe your aporach is good middle way. If nothing else comment would be nice. > + int firstSemiColon = lastPeriod == -1 ? -1 : href.indexOf(';', lastPeriod); Please avoid ?: construction as much as possible. This is exactly the case where it should not be. > + href = firstSemiColon == -1 ? href : href.substring(0, firstSemiColon); Again... not shortest possible code, most readable code :) > + // Strip any characters after the file extension iff there is a semicolon after the extension. > + // eg "lib/applet.jar;no_javaws_cheat" should become "lib/applet.jar" > + } > + > if (href == null) > return null; // so that code can throw an exception if attribute was required > Anyway I'm quite wondering if this is best place for this. This is transforming all urls which appears in jnlp file. Cant there be some case where ";" is valid part? I can imagine some obscure http://my.url.net/myPage?my.script_returning;jar;version;15 I would maybe rather see this as fall back when jar is not found, then try to cut it later. But I do not insist, and am open to rfc as I'm not sure here :) J. From aazores at redhat.com Mon May 27 07:27:52 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 27 May 2013 10:27:52 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51A3545C.3070405@redhat.com> References: <519F73E9.8070101@redhat.com> <51A3545C.3070405@redhat.com> Message-ID: <51A36D68.7020101@redhat.com> Hi, I actually am already working on producing unit testing for this change, but hadn't included it yet by the time I sent the previous email. Next time I will wait and include unit testing code first. Also thanks very much for the input on how to produce unit tests properly, I'll take that into account as I continue to work on it. > I'm not 100% sure what this means - you are checking of last > appearence of dot, why? You wan to avoid case like > this;is;my.jar;and_this_not ? > > Then maybe little bit of sophistication like > href.toUpperCase.lastIndexof(".JAR") is worhty. I was not sure if every case of file extension would contain the ".jar" substring. I suppose a JAR filename should have a file extension containing this substring, or perhaps not have a file extension, but should not have a file extension which does not contain the ".jar" substring. eg "file.jar" or "file.jar.gz" or "file.jar.pack.gz" are all good names, "file" alone is reasonable, but "file.zip" is not a reasonable name to be specified as the URL for a JAR. I will change the check to search for the .jar substring rather than the last occurrence of a '.'. > If so, are you really trying to avoid case like > starngejar;ignored;ignored;ignored ? I must say I do not like this, > but maybe your aporach is good middle way. > If nothing else comment would be nice. In such a case, no "file extension" is found, and so none of the "stripping" logic would be performed and the file's URL would be left unchanged. If the file was for example specified in the .jnlp as "strange.jar;ignored;ignored," then the parser would write this URL as "strange.jar" instead. > >> + int firstSemiColon = lastPeriod == -1 ? -1 : >> href.indexOf(';', lastPeriod); > > > Please avoid ?: construction as much as possible. This is exactly the > case where it should not be. > >> + href = firstSemiColon == -1 ? href : href.substring(0, >> firstSemiColon); > > Again... not shortest possible code, most readable code :) Okay, thank you for the feedback, I will make this more readable and avoid ternary operators. > >> + // Strip any characters after the file extension iff >> there is a semicolon after the extension. >> + // eg "lib/applet.jar;no_javaws_cheat" should become >> "lib/applet.jar" >> + } >> + >> if (href == null) >> return null; // so that code can throw an exception if >> attribute was required >> > > Anyway I'm quite wondering if this is best place for this. This is > transforming all urls which appears in jnlp file. Cant there be some > case where ";" is valid part? > I can imagine some obscure > http://my.url.net/myPage?my.script_returning;jar;version;15 > > > I would maybe rather see this as fall back when jar is not found, then > try to cut it later. But I do not insist, and am open to rfc as I'm > not sure here :) > > J. > Yes, my first thought was putting this check somewhere like the ResourceTracker, so that if downloadResource fails due to this bug, then we can apply this logic and try again. I'm not sure that ResourceTracker would have been the best location in the first place, but I don't really know if Parser is any better as you pointed out. I moved the check based on other feedback I received, so I will keep looking into better places to perform this. Thanks very much, Andrew A From andrew at icedtea.classpath.org Mon May 27 10:33:12 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 27 May 2013 17:33:12 +0000 Subject: /hg/release/icedtea7-forest-2.1/hotspot: PR1095: Allow -Werror t... Message-ID: changeset b965a723122e in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=b965a723122e author: andrew date: Wed Aug 22 16:25:23 2012 +0100 PR1095: Allow -Werror to be turned off. diffstat: make/linux/makefiles/adlc.make | 2 ++ make/linux/makefiles/gcc.make | 2 ++ make/solaris/makefiles/adlc.make | 6 ++++-- make/solaris/makefiles/gcc.make | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diffs (56 lines): diff -r 4a73d25caf23 -r b965a723122e make/linux/makefiles/adlc.make --- a/make/linux/makefiles/adlc.make Wed May 22 18:20:20 2013 +0100 +++ b/make/linux/makefiles/adlc.make Wed Aug 22 16:25:23 2012 +0100 @@ -61,7 +61,9 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) CFLAGS_WARN = -Werror +endif CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ diff -r 4a73d25caf23 -r b965a723122e make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Wed May 22 18:20:20 2013 +0100 +++ b/make/linux/makefiles/gcc.make Wed Aug 22 16:25:23 2012 +0100 @@ -143,7 +143,9 @@ endif # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) WARNINGS_ARE_ERRORS = -Werror +endif # Except for a few acceptable ones # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff -r 4a73d25caf23 -r b965a723122e make/solaris/makefiles/adlc.make --- a/make/solaris/makefiles/adlc.make Wed May 22 18:20:20 2013 +0100 +++ b/make/solaris/makefiles/adlc.make Wed Aug 22 16:25:23 2012 +0100 @@ -68,8 +68,10 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) - CFLAGS_WARN = +w -errwarn +ifneq ($(COMPILER_WARNINGS_FATAL),false) + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) + CFLAGS_WARN = +w -errwarn + endif endif CFLAGS += $(CFLAGS_WARN) diff -r 4a73d25caf23 -r b965a723122e make/solaris/makefiles/gcc.make --- a/make/solaris/makefiles/gcc.make Wed May 22 18:20:20 2013 +0100 +++ b/make/solaris/makefiles/gcc.make Wed Aug 22 16:25:23 2012 +0100 @@ -113,7 +113,9 @@ # Compiler warnings are treated as errors -WARNINGS_ARE_ERRORS = -Werror +ifneq ($(COMPILER_WARNINGS_FATAL),false) +WARNINGS_ARE_ERRORS = -Werror +endif # Enable these warnings. See 'info gcc' about details on these options ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) From ptisnovs at icedtea.classpath.org Tue May 28 01:30:16 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 28 May 2013 08:30:16 +0000 Subject: /hg/gfx-test: Helper methods for generation of new types of text... Message-ID: changeset 3e88cf8d0498 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=3e88cf8d0498 author: Pavel Tisnovsky date: Tue May 28 10:33:43 2013 +0200 Helper methods for generation of new types of textures. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/CommonBitmapOperations.java | 280 +++++++++++++++++- 2 files changed, 283 insertions(+), 2 deletions(-) diffs (314 lines): diff -r 4cc60b13c813 -r 3e88cf8d0498 ChangeLog --- a/ChangeLog Mon May 27 12:16:05 2013 +0200 +++ b/ChangeLog Tue May 28 10:33:43 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-28 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Helper methods for generation of new types of textures. + 2013-05-27 Pavel Tisnovsky * src/org/gfxtest/framework/ProceduralTextureFactory.java: diff -r 4cc60b13c813 -r 3e88cf8d0498 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Mon May 27 12:16:05 2013 +0200 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Tue May 28 10:33:43 2013 +0200 @@ -2050,7 +2050,7 @@ } /** - * Create new buffered image containing RGB patter #1 and then perform + * Create new buffered image containing RGB pattern #1 and then perform * basic BitBlt test. * * @param image @@ -2075,7 +2075,7 @@ } /** - * Create new buffered image containing RGB patter #1 and then perform + * Create new buffered image containing RGB pattern #1 and then perform * basic BitBlt test. * * @param image @@ -2104,4 +2104,280 @@ return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } + /** + * Create new buffered image containing RGB pattern #2 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithRGBTexture2Image(TestImage image, Graphics2D graphics2d, int imageType) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture2(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #2 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param width + * width of a image after BitBlt operation is performed + * @param height + * height of a image after BitBlt operation is performed + */ + public static TestResult doBitBltTestWithRGBTexture2Image(TestImage image, Graphics2D graphics2d, int imageType, + int width, int height) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture2(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #3 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithRGBTexture3Image(TestImage image, Graphics2D graphics2d, int imageType) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture3(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #3 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param width + * width of a image after BitBlt operation is performed + * @param height + * height of a image after BitBlt operation is performed + */ + public static TestResult doBitBltTestWithRGBTexture3Image(TestImage image, Graphics2D graphics2d, int imageType, + int width, int height) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture3(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #4 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithRGBTexture4Image(TestImage image, Graphics2D graphics2d, int imageType) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture4(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #4 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param width + * width of a image after BitBlt operation is performed + * @param height + * height of a image after BitBlt operation is performed + */ + public static TestResult doBitBltTestWithRGBTexture4Image(TestImage image, Graphics2D graphics2d, int imageType, + int width, int height) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture4(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #5 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithRGBTexture5Image(TestImage image, Graphics2D graphics2d, int imageType) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture5(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #5 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param width + * width of a image after BitBlt operation is performed + * @param height + * height of a image after BitBlt operation is performed + */ + public static TestResult doBitBltTestWithRGBTexture5Image(TestImage image, Graphics2D graphics2d, int imageType, + int width, int height) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture5(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #6 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithRGBTexture6Image(TestImage image, Graphics2D graphics2d, int imageType) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture6(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing RGB pattern #6 and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param width + * width of a image after BitBlt operation is performed + * @param height + * height of a image after BitBlt operation is performed + */ + public static TestResult doBitBltTestWithRGBTexture6Image(TestImage image, Graphics2D graphics2d, int imageType, + int width, int height) + { + // create new buffered bitmap with given type + BufferedImage bufferedImage = ProceduralTextureFactory.createRGBTexture6(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + } + From ptisnovs at icedtea.classpath.org Tue May 28 01:38:47 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 28 May 2013 08:38:47 +0000 Subject: /hg/rhino-tests: Updated to work correctly in JDK6-JDK8. Message-ID: changeset 3604b6b22396 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=3604b6b22396 author: Pavel Tisnovsky date: Tue May 28 10:42:15 2013 +0200 Updated to work correctly in JDK6-JDK8. diffstat: ChangeLog | 5 ++++ src/org/RhinoTests/CompilableClassTest.java | 36 +++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 40d19c67580c -r 3604b6b22396 ChangeLog --- a/ChangeLog Mon May 27 12:23:11 2013 +0200 +++ b/ChangeLog Tue May 28 10:42:15 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-28 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Updated to work correctly in JDK6-JDK8. + 2013-05-27 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 40d19c67580c -r 3604b6b22396 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Mon May 27 12:23:11 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Tue May 28 10:42:15 2013 +0200 @@ -799,6 +799,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.compilableClass.getAnnotations(); // and transform the array into a list of annotation names @@ -806,7 +809,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -825,6 +841,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.compilableClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -832,7 +851,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From andrew at icedtea.classpath.org Tue May 28 02:34:36 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 28 May 2013 09:34:36 +0000 Subject: /hg/release/icedtea7-forest-2.1/jdk: 7171223: Building Extension... Message-ID: changeset 2c423d0b1965 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=2c423d0b1965 author: andrew date: Wed May 30 16:17:48 2012 +0100 7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing Summary: GCC 4.4+ have stricter aliasing requirements which produces a new warning from this code Reviewed-by: prr, ohair diffstat: make/sun/font/Makefile | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r b14271a17d58 -r 2c423d0b1965 make/sun/font/Makefile --- a/make/sun/font/Makefile Wed May 22 18:20:28 2013 +0100 +++ b/make/sun/font/Makefile Wed May 30 16:17:48 2012 +0100 @@ -90,6 +90,12 @@ endif # PLATFORM +# Turn off aliasing with GCC for ExtensionSubtables.cpp +ifeq ($(PLATFORM), linux) + CXXFLAGS += $(CXXFLAGS_$(@F)) + CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing +endif + #In the non-OpenJDK mode we need to build T2K ifndef OPENJDK t2k: From andrew at icedtea.classpath.org Tue May 28 04:05:39 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 28 May 2013 11:05:39 +0000 Subject: /hg/release/icedtea7-2.1: S7171223, RH967436: Building Extension... Message-ID: changeset 578209f3f761 in /hg/release/icedtea7-2.1 details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=578209f3f761 author: Andrew John Hughes date: Tue May 28 12:05:24 2013 +0100 S7171223, RH967436: Building ExtensionSubtables.cpp should use -fno-strict-aliasing PR1095, PR1409: Allow -Werror to be turned off (HotSpot repository only). 2013-05-10 Andrew John Hughes * Makefile.am, (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD, bringing in -Werror fix for HotSpot (used by 2.3.x Zero builds) and S7171223 backport. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. diffstat: ChangeLog | 19 +++++++++++++++++++ Makefile.am | 28 ++++++++++++++-------------- NEWS | 5 +++++ 3 files changed, 38 insertions(+), 14 deletions(-) diffs (80 lines): diff -r 611d74f7a36c -r 578209f3f761 ChangeLog --- a/ChangeLog Fri May 10 21:14:46 2013 +0100 +++ b/ChangeLog Tue May 28 12:05:24 2013 +0100 @@ -1,3 +1,22 @@ +2013-05-10 Andrew John Hughes + + * Makefile.am, + (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD, + bringing in -Werror fix for HotSpot (used by 2.3.x Zero + builds) and S7171223 backport. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + 2013-05-10 Andrew John Hughes * configure.ac: Bump to 2.1.9pre. diff -r 611d74f7a36c -r 578209f3f761 Makefile.am --- a/Makefile.am Fri May 10 21:14:46 2013 +0100 +++ b/Makefile.am Tue May 28 12:05:24 2013 +0100 @@ -4,21 +4,21 @@ JDK_UPDATE_VERSION = 03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -HOTSPOT_CHANGESET = 2c4981784101 -CORBA_CHANGESET = 313f1ee32118 -JAXP_CHANGESET = c04b95aa746c -JAXWS_CHANGESET = d04602077b14 -JDK_CHANGESET = acaa2de9f547 -LANGTOOLS_CHANGESET = c63c8a2164e4 -OPENJDK_CHANGESET = c1c649636704 +HOTSPOT_CHANGESET = b965a723122e +CORBA_CHANGESET = 2302bd5191fe +JAXP_CHANGESET = 2c3bc21169f9 +JAXWS_CHANGESET = 3b68ea3b56d8 +JDK_CHANGESET = 2c423d0b1965 +LANGTOOLS_CHANGESET = 9a3628594576 +OPENJDK_CHANGESET = 34d809e0dba3 -HOTSPOT_SHA256SUM = 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b -CORBA_SHA256SUM = 9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952 -JAXP_SHA256SUM = 9df7d4d04168c9c6e57c5b51ca3a54defe5e892d56a256b3d3deda3b12173e63 -JAXWS_SHA256SUM = 1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d -JDK_SHA256SUM = bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf -LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6 -OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f +HOTSPOT_SHA256SUM = 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912 +CORBA_SHA256SUM = 13691bea9f5b448da3e18307b3ec7d1e7fb984b5d590fcf8e350101fa67106df +JAXP_SHA256SUM = 244aab62b946361e6442b63acc91fd209829946daed2dc1ee0c1c3e256bf9c29 +JAXWS_SHA256SUM = 96ff4f30736a5d329cf236a6c53d9d1f30c251bd59a698cfcbe36d8803782fd0 +JDK_SHA256SUM = b5c8a00886725a7cc6c764b3d44ff1382f5942c8a4f8a3e2046e4af971fcfae2 +LANGTOOLS_SHA256SUM = e6bf6b4dae96b4b2517aa1847dc21b91d0cd0048f6b47479ab8e50263bf8e519 +OPENJDK_SHA256SUM = f213703df7c2331826c1b8e35fed7079d1b21fe6b8210fdb108f8bacc42e714f CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r 611d74f7a36c -r 578209f3f761 NEWS --- a/NEWS Fri May 10 21:14:46 2013 +0100 +++ b/NEWS Tue May 28 12:05:24 2013 +0100 @@ -12,6 +12,11 @@ New in release 2.1.9 (2013-06-02): +* Backports + - S7171223, RH967436: Building ExtensionSubtables.cpp should use -fno-strict-aliasing +* Bug fixes + - PR1095, PR1409: Allow -Werror to be turned off (HotSpot repository only). + New in release 2.1.8 (2013-05-02): * Security fixes From bugzilla-daemon at icedtea.classpath.org Tue May 28 04:05:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 11:05:50 +0000 Subject: [Bug 1409] IcedTea 2.3.9 fails to build Zero due to -Werror In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1409 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.1?cmd=changeset;node=578209f3f761 author: Andrew John Hughes date: Tue May 28 12:05:24 2013 +0100 S7171223, RH967436: Building ExtensionSubtables.cpp should use -fno-strict-aliasing PR1095, PR1409: Allow -Werror to be turned off (HotSpot repository only). 2013-05-10 Andrew John Hughes * Makefile.am, (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD, bringing in -Werror fix for HotSpot (used by 2.3.x Zero builds) and S7171223 backport. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/14078413/attachment.html From elisa.deugenio at gmail.com Tue May 28 07:00:40 2013 From: elisa.deugenio at gmail.com (Elisa D'Eugenio) Date: Tue, 28 May 2013 16:00:40 +0200 Subject: GNU Classpath Summer of Code 2013 Message-ID: Hello! I'm Elisa and I'm taking part to Google Summer of Code 2013 with GNU Classpath project. I proposed one of the projects, the new Gtk3 Look and Feel for OpenJDK, and it was accepted. I'm looking forward to start this project. It's a big opportunity for test my knowledge and work this summer in my job field. I would like to keep project discussion on swing-dev cause the code is managed by this group. I hope to have a little bit of help if I ever need. Thanks -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/519865a6/attachment.html From xranby at icedtea.classpath.org Tue May 28 07:47:14 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 28 May 2013 14:47:14 +0000 Subject: /hg/icedtea6: PR1188: ASM Interpreter and Thumb2 JIT javac misco... Message-ID: changeset 427412f94dc4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=427412f94dc4 author: Xerxes Ranby date: Tue May 28 19:56:33 2013 +0200 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. 2013-05-28 Xerxes Ranby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (POPF1): The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. * NEWS: Updated. diffstat: ChangeLog | 10 ++++++++++ NEWS | 1 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diffs (40 lines): diff -r 632c42c569f8 -r 427412f94dc4 ChangeLog --- a/ChangeLog Mon May 27 11:00:32 2013 +0100 +++ b/ChangeLog Tue May 28 19:56:33 2013 +0200 @@ -1,3 +1,13 @@ +2013-05-28 Xerxes R??nby + + PR1188: ASM Interpreter and Thumb2 JIT javac miscompile + modulo reminder on armel. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (POPF1): The POPF1 macro used wrong destination register + r0 instead of r1 on ARM armel causing issues with the frem bytecode. + The frem bytecode was the only bytecode using the defect macro. + * NEWS: Updated. + 2013-05-15 Andrew John Hughes PR1458: Make use of bootstrap tools & -Xbootclasspath diff -r 632c42c569f8 -r 427412f94dc4 NEWS --- a/NEWS Mon May 27 11:00:32 2013 +0100 +++ b/NEWS Tue May 28 19:56:33 2013 +0200 @@ -21,6 +21,7 @@ - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) * Bug fixes + - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only) * JamVM diff -r 632c42c569f8 -r 427412f94dc4 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon May 27 11:00:32 2013 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue May 28 19:56:33 2013 +0200 @@ -345,7 +345,7 @@ flds s1, [stack, #4] add stack, #4 #else - POP r0 + POP r1 #endif .endm From xranby at icedtea.classpath.org Tue May 28 07:47:57 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 28 May 2013 14:47:57 +0000 Subject: /hg/release/icedtea7-forest-2.1/hotspot: PR1188: ASM Interpreter... Message-ID: changeset 04c3fb903cf3 in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=04c3fb903cf3 author: Xerxes Ranby date: Tue May 28 19:43:58 2013 +0200 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel Summary: The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. diffstat: src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b965a723122e -r 04c3fb903cf3 src/cpu/zero/vm/cppInterpreter_arm.S --- a/src/cpu/zero/vm/cppInterpreter_arm.S Wed Aug 22 16:25:23 2012 +0100 +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Tue May 28 19:43:58 2013 +0200 @@ -367,7 +367,7 @@ flds s1, [stack, #4] add stack, #4 #else - POP r0 + POP r1 #endif .endm From bugzilla-daemon at icedtea.classpath.org Tue May 28 07:58:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 14:58:39 +0000 Subject: [Bug 1410] Icedtea 2.3.9 fails to build using icedtea 1.12.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1410 --- Comment #3 from Andrew John Hughes --- Sorry, my mistake; that's a bootstrap build with 6. This has been broken because: if echo openjdk-boot/jdk/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java | grep '\S' &> /dev/null now holds (it was empty before the changes for ecj 4.2). -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/c95cf4f2/attachment.html From andrew at icedtea.classpath.org Tue May 28 08:04:56 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 28 May 2013 15:04:56 +0000 Subject: /hg/release/icedtea7-2.3: PR1378: Add AArch64 support to Zero Message-ID: changeset b13f012ad143 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=b13f012ad143 author: Andrew John Hughes date: Tue May 28 16:04:38 2013 +0100 PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror 2013-05-28 Andrew John Hughes PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror * Makefile.am: (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Mention PR1378 and PR1409 fixes. * hotspot.map: Update default to bring in HotSpot with AArch64 support. Update zero to bring in HotSpot from 2.1 with the fix for -Werror. diffstat: ChangeLog | 24 ++++++++++++++++++++++++ Makefile.am | 24 ++++++++++++------------ NEWS | 5 +++++ hotspot.map | 4 ++-- 4 files changed, 43 insertions(+), 14 deletions(-) diffs (90 lines): diff -r fe12a3a45692 -r b13f012ad143 ChangeLog --- a/ChangeLog Mon Apr 22 13:45:31 2013 +0100 +++ b/ChangeLog Tue May 28 16:04:38 2013 +0100 @@ -1,3 +1,27 @@ +2013-05-28 Andrew John Hughes + + PR1378: Add AArch64 support to Zero + PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: + Mention PR1378 and PR1409 fixes. + * hotspot.map: + Update default to bring in HotSpot with + AArch64 support. Update zero to bring + in HotSpot from 2.1 with the fix for -Werror. + 2013-04-22 Andrew John Hughes * configure.ac: Bump to 2.3.10pre. diff -r fe12a3a45692 -r b13f012ad143 Makefile.am --- a/Makefile.am Mon Apr 22 13:45:31 2013 +0100 +++ b/Makefile.am Tue May 28 16:04:38 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 21 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 47a6bf94ce11 -JAXP_CHANGESET = d2142901bcb7 -JAXWS_CHANGESET = b1877762d45c -JDK_CHANGESET = 8e91101e36f0 -LANGTOOLS_CHANGESET = fd956199cb82 -OPENJDK_CHANGESET = 12b96a57263c +CORBA_CHANGESET = affff8c7b584 +JAXP_CHANGESET = 26be0c933625 +JAXWS_CHANGESET = ba432018cb80 +JDK_CHANGESET = 073c0458daef +LANGTOOLS_CHANGESET = 0d9ff3ffd433 +OPENJDK_CHANGESET = 73c29b209f76 -CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934 -JAXP_SHA256SUM = 8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6 -JAXWS_SHA256SUM = b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc -JDK_SHA256SUM = 349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e -LANGTOOLS_SHA256SUM = 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12 -OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc +CORBA_SHA256SUM = 675d44ab92c3a86a91cbd23bf97ccdb6f3a1c3ac3d5a1191afd36790453270a8 +JAXP_SHA256SUM = 54c106a092f43431133cd6f149f8e615353a9b3c574eade7a444cf97ee92a379 +JAXWS_SHA256SUM = 07a47e77e78bb3bf4df6997eefa078631d7f69260966104d38590b7f499af14f +JDK_SHA256SUM = 2c985f0b30b3f6762d99262d7b0b7dfa241fe5b9e8046c878148ef47ac09c82b +LANGTOOLS_SHA256SUM = 53c6a2e450c3621379c26e3be6a72eebf6cae252dabaa7c79a3d786381e644f6 +OPENJDK_SHA256SUM = 8c9222984aa5f0dad7fc14c7b7d4bed354fb86027592896113301a1e97bdad18 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r fe12a3a45692 -r b13f012ad143 NEWS --- a/NEWS Mon Apr 22 13:45:31 2013 +0100 +++ b/NEWS Tue May 28 16:04:38 2013 +0100 @@ -12,6 +12,11 @@ New in release 2.3.10 (2013-06-XX): +* New features + - PR1378: Add AArch64 support to Zero +* Bug fixes + - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror + New in release 2.3.9 (2013-04-21): * Security fixes diff -r fe12a3a45692 -r b13f012ad143 hotspot.map --- a/hotspot.map Mon Apr 22 13:45:31 2013 +0100 +++ b/hotspot.map Tue May 28 16:04:38 2013 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad5a321edea2 c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac -zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 2c4981784101 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98 +zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b965a723122e 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912 From bugzilla-daemon at icedtea.classpath.org Tue May 28 08:05:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 15:05:05 +0000 Subject: [Bug 1409] IcedTea 2.3.9 fails to build Zero due to -Werror In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1409 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.3?cmd=changeset;node=b13f012ad143 author: Andrew John Hughes date: Tue May 28 16:04:38 2013 +0100 PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror 2013-05-28 Andrew John Hughes PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror * Makefile.am: (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Mention PR1378 and PR1409 fixes. * hotspot.map: Update default to bring in HotSpot with AArch64 support. Update zero to bring in HotSpot from 2.1 with the fix for -Werror. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/f30a7ef5/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 28 08:05:09 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 15:05:09 +0000 Subject: [Bug 1378] [IcedTea7] Add AArch64 support to Zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.3?cmd=changeset;node=b13f012ad143 author: Andrew John Hughes date: Tue May 28 16:04:38 2013 +0100 PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror 2013-05-28 Andrew John Hughes PR1378: Add AArch64 support to Zero PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror * Makefile.am: (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Mention PR1378 and PR1409 fixes. * hotspot.map: Update default to bring in HotSpot with AArch64 support. Update zero to bring in HotSpot from 2.1 with the fix for -Werror. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/ec25f560/attachment.html From andrew at icedtea.classpath.org Tue May 28 08:42:38 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 28 May 2013 15:42:38 +0000 Subject: /hg/release/icedtea7-2.3: PR1410: Icedtea 2.3.9 fails to build u... Message-ID: changeset a91c52e39914 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=a91c52e39914 author: Andrew John Hughes date: Tue May 28 16:42:32 2013 +0100 PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 2013-05-28 Andrew John Hughes PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 * Makefile.am: (STAGE1_BOOT_RUNTIME): New variable to store path to stage 1 rt.jar. (STAGE2_BOOT_RUNTIME): Likewise for stage 2. (bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME. (rt): Only update STAGE1_BOOT_RUNTIME if it exists. (clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in bootstrap-directory-stage1. * NEWS: Updated. diffstat: ChangeLog | 13 +++++++++++++ Makefile.am | 17 ++++++++++------- NEWS | 1 + 3 files changed, 24 insertions(+), 7 deletions(-) diffs (83 lines): diff -r b13f012ad143 -r a91c52e39914 ChangeLog --- a/ChangeLog Tue May 28 16:04:38 2013 +0100 +++ b/ChangeLog Tue May 28 16:42:32 2013 +0100 @@ -1,3 +1,16 @@ +2013-05-28 Andrew John Hughes + + PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 + * Makefile.am: + (STAGE1_BOOT_RUNTIME): New variable to store path + to stage 1 rt.jar. + (STAGE2_BOOT_RUNTIME): Likewise for stage 2. + (bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME. + (rt): Only update STAGE1_BOOT_RUNTIME if it exists. + (clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in + bootstrap-directory-stage1. + * NEWS: Updated. + 2013-05-28 Andrew John Hughes PR1378: Add AArch64 support to Zero diff -r b13f012ad143 -r a91c52e39914 Makefile.am --- a/Makefile.am Tue May 28 16:04:38 2013 +0100 +++ b/Makefile.am Tue May 28 16:42:32 2013 +0100 @@ -66,6 +66,8 @@ STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot +STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar +STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar # Source directories @@ -1630,14 +1632,13 @@ ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap mkdir -p $(STAGE1_BOOT_DIR)/lib/modules mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \ - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ - $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ - chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) && \ + chmod u+w $(STAGE1_BOOT_RUNTIME) mkdir -p $(STAGE1_BOOT_DIR)/lib && \ if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \ ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ else \ - ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + ln -sf $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ fi ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ $(STAGE1_BOOT_DIR)/jre/lib/ && \ @@ -2434,8 +2435,9 @@ mkdir -p `dirname $$destpath` ; \ cp -a ../../$$dirs $$destpath ; \ done ; \ - $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \ - com java javax sun ); \ + if [ -w $(STAGE1_BOOT_RUNTIME) ] ; then \ + $(ZIP) -qur $(STAGE1_BOOT_RUNTIME) com java javax sun ; \ + fi ; ) \ fi mkdir -p stamps touch $@ @@ -2445,7 +2447,8 @@ rm -f stamps/rt-class-files.stamp stamps/rt.stamp rm -f rt-source-files.txt if [ -e $(STAGE1_BOOT_DIR)/jre/lib ] ; then \ - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \ + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) ; \ + chmod u+w $(STAGE1_BOOT_RUNTIME) ; \ fi # Target Aliases diff -r b13f012ad143 -r a91c52e39914 NEWS --- a/NEWS Tue May 28 16:04:38 2013 +0100 +++ b/NEWS Tue May 28 16:42:32 2013 +0100 @@ -16,6 +16,7 @@ - PR1378: Add AArch64 support to Zero * Bug fixes - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror + - PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 New in release 2.3.9 (2013-04-21): From bugzilla-daemon at icedtea.classpath.org Tue May 28 08:42:45 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 15:42:45 +0000 Subject: [Bug 1410] Icedtea 2.3.9 fails to build using icedtea 1.12.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1410 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.3?cmd=changeset;node=a91c52e39914 author: Andrew John Hughes date: Tue May 28 16:42:32 2013 +0100 PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 2013-05-28 Andrew John Hughes PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 * Makefile.am: (STAGE1_BOOT_RUNTIME): New variable to store path to stage 1 rt.jar. (STAGE2_BOOT_RUNTIME): Likewise for stage 2. (bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME. (rt): Only update STAGE1_BOOT_RUNTIME if it exists. (clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in bootstrap-directory-stage1. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/f4e52309/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 28 08:43:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 28 May 2013 15:43:49 +0000 Subject: [Bug 1410] Icedtea 2.3.9 fails to build using icedtea 1.12.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1410 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED Target Milestone|2.3.9 |2.3.10 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130528/da776a65/attachment.html From neugens at redhat.com Tue May 28 08:51:48 2013 From: neugens at redhat.com (Mario Torre) Date: Tue, 28 May 2013 17:51:48 +0200 Subject: GNU Classpath Summer of Code 2013 In-Reply-To: References: Message-ID: <1369756308.9538.120.camel@galactica.localdomain> On Tue, 2013-05-28 at 16:00 +0200, Elisa D'Eugenio wrote: > Hello! I'm Elisa and I'm taking part to Google Summer of Code 2013 > with GNU Classpath project. I proposed one of the projects, the new > Gtk3 Look and Feel for OpenJDK, and it was accepted. > I'm looking forward to start this project. It's a big opportunity for > test my knowledge and work this summer in my job field. I would like > to keep project discussion on swing-dev cause the code is managed by > this group. I hope to have a little bit of help if I ever need. > Thanks Hi Elisa, Welcome! For the record, together with the GNU Classpath and IcedTea communities we decided to do this experiment, and allocated one resource to help students to be introduced to OpenJDK development. The project is still part of the GNU Classpath umbrella and will be followed by GNU Classpath people. If the experiment will succeed, we may try to turn next year into a proper organisation fully dedicated to OpenJDK. I will be mentoring Elisa, and the code will be probably hosted on the icedtea server once ready for use (although for the time being we will develop the code on an external repository until everything is set correctly). Once again, welcome Elisa! Cheers, Mario From gnu.andrew at redhat.com Tue May 28 08:53:24 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 28 May 2013 11:53:24 -0400 (EDT) Subject: /hg/icedtea6: PR1188: ASM Interpreter and Thumb2 JIT javac misco... In-Reply-To: References: Message-ID: <800210738.9154274.1369756404980.JavaMail.root@redhat.com> ----- Original Message ----- > changeset 427412f94dc4 in /hg/icedtea6 > details: > http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=427412f94dc4 > author: Xerxes Ranby > date: Tue May 28 19:56:33 2013 +0200 > > PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on > armel. > > 2013-05-28 Xerxes Ranby > > PR1188: ASM Interpreter and Thumb2 JIT javac miscompile > modulo reminder on armel. > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (POPF1): The POPF1 macro used wrong destination register > r0 instead of r1 on ARM armel causing issues with the frem bytecode. > The frem bytecode was the only bytecode using the defect macro. > * NEWS: Updated. > > > diffstat: > > ChangeLog | 10 ++++++++++ > NEWS | 1 + > arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- > 3 files changed, 12 insertions(+), 1 deletions(-) > > diffs (40 lines): > > diff -r 632c42c569f8 -r 427412f94dc4 ChangeLog > --- a/ChangeLog Mon May 27 11:00:32 2013 +0100 > +++ b/ChangeLog Tue May 28 19:56:33 2013 +0200 > @@ -1,3 +1,13 @@ > +2013-05-28 Xerxes R??nby > + > + PR1188: ASM Interpreter and Thumb2 JIT javac miscompile > + modulo reminder on armel. > + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > + (POPF1): The POPF1 macro used wrong destination register > + r0 instead of r1 on ARM armel causing issues with the frem bytecode. > + The frem bytecode was the only bytecode using the defect macro. > + * NEWS: Updated. > + > 2013-05-15 Andrew John Hughes > > PR1458: Make use of bootstrap tools & -Xbootclasspath > diff -r 632c42c569f8 -r 427412f94dc4 NEWS > --- a/NEWS Mon May 27 11:00:32 2013 +0100 > +++ b/NEWS Tue May 28 19:56:33 2013 +0200 > @@ -21,6 +21,7 @@ > - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow > Snappy to build > - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) > * Bug fixes > + - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder > on armel. > - PR1318: Fix automatic enabling of the Zero build on non-JIT > architectures which don't use CACAO or JamVM. > - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice > Writer installed (hs23 only) > * JamVM > diff -r 632c42c569f8 -r 427412f94dc4 > arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon May 27 > 11:00:32 2013 +0100 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue May 28 > 19:56:33 2013 +0200 > @@ -345,7 +345,7 @@ > flds s1, [stack, #4] > add stack, #4 > #else > - POP r0 > + POP r1 > #endif > .endm > > Does this apply to the version in 7 too? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From xerxes at zafena.se Tue May 28 10:49:46 2013 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Tue, 28 May 2013 19:49:46 +0200 Subject: /hg/icedtea6: PR1188: ASM Interpreter and Thumb2 JIT javac misco... In-Reply-To: <800210738.9154274.1369756404980.JavaMail.root@redhat.com> References: <800210738.9154274.1369756404980.JavaMail.root@redhat.com> Message-ID: <51A4EE3A.4070104@zafena.se> 2013-05-28 17:53, Andrew Hughes skrev: > > > ----- Original Message ----- >> changeset 427412f94dc4 in /hg/icedtea6 >> details: >> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=427412f94dc4 >> author: Xerxes Ranby >> date: Tue May 28 19:56:33 2013 +0200 >> >> PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on >> armel. >> >> 2013-05-28 Xerxes Ranby >> >> PR1188: ASM Interpreter and Thumb2 JIT javac miscompile >> modulo reminder on armel. >> * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> (POPF1): The POPF1 macro used wrong destination register >> r0 instead of r1 on ARM armel causing issues with the frem bytecode. >> The frem bytecode was the only bytecode using the defect macro. >> * NEWS: Updated. >> >> >> diffstat: >> >> ChangeLog | 10 ++++++++++ >> NEWS | 1 + >> arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- >> 3 files changed, 12 insertions(+), 1 deletions(-) >> >> diffs (40 lines): >> >> diff -r 632c42c569f8 -r 427412f94dc4 ChangeLog >> --- a/ChangeLog Mon May 27 11:00:32 2013 +0100 >> +++ b/ChangeLog Tue May 28 19:56:33 2013 +0200 >> @@ -1,3 +1,13 @@ >> +2013-05-28 Xerxes R??nby >> + >> + PR1188: ASM Interpreter and Thumb2 JIT javac miscompile >> + modulo reminder on armel. >> + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> + (POPF1): The POPF1 macro used wrong destination register >> + r0 instead of r1 on ARM armel causing issues with the frem bytecode. >> + The frem bytecode was the only bytecode using the defect macro. >> + * NEWS: Updated. >> + >> 2013-05-15 Andrew John Hughes >> >> PR1458: Make use of bootstrap tools & -Xbootclasspath >> diff -r 632c42c569f8 -r 427412f94dc4 NEWS >> --- a/NEWS Mon May 27 11:00:32 2013 +0100 >> +++ b/NEWS Tue May 28 19:56:33 2013 +0200 >> @@ -21,6 +21,7 @@ >> - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow >> Snappy to build >> - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) >> * Bug fixes >> + - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder >> on armel. >> - PR1318: Fix automatic enabling of the Zero build on non-JIT >> architectures which don't use CACAO or JamVM. >> - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice >> Writer installed (hs23 only) >> * JamVM >> diff -r 632c42c569f8 -r 427412f94dc4 >> arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon May 27 >> 11:00:32 2013 +0100 >> +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue May 28 >> 19:56:33 2013 +0200 >> @@ -345,7 +345,7 @@ >> flds s1, [stack, #4] >> add stack, #4 >> #else >> - POP r0 >> + POP r1 >> #endif >> .endm >> >> > > Does this apply to the version in 7 too? > Yes it apply for the version in 7 as well, I have patched the forest. http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/rev/04c3fb903cf3 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1188 From doko at ubuntu.com Tue May 28 15:54:05 2013 From: doko at ubuntu.com (Matthias Klose) Date: Wed, 29 May 2013 00:54:05 +0200 Subject: GNU Classpath Summer of Code 2013 In-Reply-To: <1369756308.9538.120.camel@galactica.localdomain> References: <1369756308.9538.120.camel@galactica.localdomain> Message-ID: <51A5358D.1000006@ubuntu.com> Am 28.05.2013 17:51, schrieb Mario Torre: > On Tue, 2013-05-28 at 16:00 +0200, Elisa D'Eugenio wrote: >> Hello! I'm Elisa and I'm taking part to Google Summer of Code 2013 >> with GNU Classpath project. I proposed one of the projects, the new >> Gtk3 Look and Feel for OpenJDK, and it was accepted. >> I'm looking forward to start this project. It's a big opportunity for >> test my knowledge and work this summer in my job field. I would like >> to keep project discussion on swing-dev cause the code is managed by >> this group. I hope to have a little bit of help if I ever need. >> Thanks > > Hi Elisa, > > Welcome! > > For the record, together with the GNU Classpath and IcedTea communities > we decided to do this experiment, and allocated one resource to help > students to be introduced to OpenJDK development. The project is still > part of the GNU Classpath umbrella and will be followed by GNU Classpath > people. If the experiment will succeed, we may try to turn next year > into a proper organisation fully dedicated to OpenJDK. > > I will be mentoring Elisa, and the code will be probably hosted on the > icedtea server once ready for use (although for the time being we will > develop the code on an external repository until everything is set > correctly). > > Once again, welcome Elisa! Welcome! Just to clarify, this is not to update Classpath to Gtk3 as well? Matthias From jvanek at redhat.com Wed May 29 01:50:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 29 May 2013 10:50:15 +0200 Subject: [voting] move or not move icedtea-web to XDG specification in icedtea-web [0] Message-ID: <51A5C147.3090709@redhat.com> I have proposed patch to move IcedTea-Web [2] to XDG specification and Omair took the review (the backward compatibility is kept) But we get into deadlock - Although personally I do not care if we will keep ~/.icedtea/{.config .cache} or move to ~/{.config .cache}/.icedtea and afaik Omair is more inclined for XDG specification there are several issues which made this decision 50/50 for us. points to *do not* move to XDG * Initially the file structure was designed to be as similar as proprietary plugin as possible * also not XDG systems are using netx (we know about at least two windows users :) points *to move* to XDG * we have already some differences in file structure (from proprietary plugin) * All modern distributions are following XDG as much as possible and the trend is to convert all Linux applications to it. * there is no known specification for windows which I'm aware of. I would like to avoid to support both... If somebody can give as golden ration or just vote for one of them then we will be very happy :) Best regards, J. [0] See https://bugzilla.redhat.com/show_bug.cgi?id=947647 for more details - but not necessary :) [1] I have tried to "fix this bug" and moved the icedtea-web to this specifikati - https://bugzilla.redhat.com/show_bug.cgi?id=947647 - but agian not neccesary. From jvanek at redhat.com Wed May 29 03:21:33 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 29 May 2013 12:21:33 +0200 Subject: [icedtea-web][rfc] Extract native code caching from JNLPClassLoader into a small class In-Reply-To: <519E6BC6.7070007@redhat.com> References: <5136618B.70505@redhat.com> <513F3AFC.2040109@redhat.com> <519E6BC6.7070007@redhat.com> Message-ID: <51A5D6AD.7040100@redhat.com> On 05/23/2013 09:19 PM, Adam Domurad wrote: > On 03/12/2013 10:26 AM, Jiri Vanek wrote: >> On 03/05/2013 10:20 PM, Adam Domurad wrote: >>> This is an incremental part of the effort to reduce the responsibilities of JNLPClassLoader. >>> >>> 2013-03-05 Adam Domurad >>> >>> * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New, >>> stores and searches for native library files that are loaded from jars. >>> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code >>> that handled native jar caching to NativeLibraryStorage. >>> >>> Happy hacking, >>> -Adam >> >> Is there any more reason for this refactoring then much nicer, more readable, and testable >> jnlpclasslaoder? >> Anyway I'm fan of this kind of refactoring. And I'm for this to be done. >> >> - there must be unittests for this chnage >> - i would like to see even reproducer for this >> - it should go to 1.3 to after some time in head. > > Probably a little late now, but 1.4 sure, unless you think 1.3 is still a good idea. I'm hesitating with 1.4 now. But probably yes. But you owe me your head:) > >> >> I have not check if there is something more then pure refactoring, but if there isn't and tsts >> will be added, then this will be approved. > > It is a refactoring only. > >> >> J. > > I have created some unit tests, hopefully it is enough to push with ? nope. Some moreover important changes needed. Especially ExecUtils.execAndLog have no reason to live. Please use processWrapper. It is designed for this and have logging correctly adapted. Also I'm against such a huge usage of ecxec. Java is not Python. Especiallythe touch and mkdir is nothing but pure laziness :) Please use java calls. For jar -cf ... well.. Java have api to work with its own jars.. please follow this api. Do not fork processes if possible. But ..well. this api can be trap :) So choose wisely. I would recommend to do the refactoring of DummyJNLPFileWithJar into separate changset which you can proceed immediately, but I do not insists. In all cases, thanx for check and refactoring! It is deeply appreciated. J. > There is some bundled refactoring of the test extensions, hopefully it is ok. > > 2013-05-23 Adam Domurad > > * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: > Moved MockedOneJarJNLPFile to separate DummyJNLPFileWithJar. Moved > utilities to ExecUtils & FileDescriptorUtils. > * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java: > New, tests lookup of native libraries from folders and jars. > * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java: > Moved from JNLPClassLoaderTest.MockedOneJarJNLPFile. > * tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java: > New, provides utility for exec'ing cleanly and logging. > * tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java > (getOpenFileDescriptorCount): Moved here, counts open files. > (assertNoFileLeak): Moved here, asserts a runnable does not leak file > descriptors. > > Happy hacking, > -Adam > > test-native-library-storage.patch > > > diff --git a/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java b/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java > @@ -0,0 +1,173 @@ > +/* > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.cache; > + > +import static net.sourceforge.jnlp.util.FileDescriptorUtils.assertNoFileLeak; > +import static org.junit.Assert.assertEquals; > +import static org.junit.Assert.assertFalse; > +import static org.junit.Assert.assertTrue; > + > +import java.io.File; > +import java.net.URL; > + > +import net.sourceforge.jnlp.Version; > +import net.sourceforge.jnlp.util.ExecUtils; > + > +import org.junit.Test; > + > +public class NativeLibraryStorageTest { > + > + /************************************************************************** > + * Test helpers * > + **************************************************************************/ > + > + /* Associates an extension with whether it represents a native library */ > + static class FileExtension { > + public FileExtension(String extension, boolean isNative) { > + this.extension = extension; > + this.isNative = isNative; > + } > + final String extension; > + final boolean isNative; > + } > + > + /* Saves typing when creating a FileExtension */ > + static FileExtension fileExt(String extension, boolean isNative) { > + return new FileExtension(extension, isNative); > + } > + > + /* All the native library types we support, as well as one negative test */ > + static final FileExtension[] extensionsToTest = { > + fileExt(".foobar", false), /* Dummy non-native test extension */ > + fileExt(".so", true), > + fileExt(".dylib", true), > + fileExt(".jnilib", true), > + fileExt(".framework", true), > + fileExt(".dll", true) > + }; > + > + static File createTempDirectory() throws Exception { > + return new File(ExecUtils.execAndLog(null /* current working dir */, "mktemp", "-d")); > + } > + > + /* Creates a jar in a temporary directory, with the given name & contents */ > + static File createTempJarWithFile(String jarName, String file) throws Exception { > + File dir = createTempDirectory(); > + ExecUtils.execAndLog(dir, "touch", file); > + ExecUtils.execAndLog(dir, "jar", "-cf", jarName, file); > + return new File(dir.getAbsolutePath() + "/" + jarName); > + } > + > + /* Creates a NativeLibraryStorage object, caching the given URLs */ > + static NativeLibraryStorage nativeLibraryStorageWithCache(URL... urlsToCache) { > + ResourceTracker tracker = new ResourceTracker(); > + for (URL urlToCache : urlsToCache) { > + tracker.addResource(urlToCache, new Version("1.0"), null, UpdatePolicy.ALWAYS); > + } > + > + return new NativeLibraryStorage(tracker); > + } > + > + /************************************************************************** > + * Test cases * > + **************************************************************************/ > + > + /* Tests searching for native libraries in jars */ > + @Test > + public void testJarFileSearch() throws Exception { > + for (FileExtension ext : extensionsToTest) { > + String testFile = "foobar" + ext.extension; > + final URL tempJarUrl = createTempJarWithFile("test.jar", testFile).toURI().toURL(); > + final NativeLibraryStorage storage = nativeLibraryStorageWithCache(tempJarUrl); > + > + assertNoFileLeak( new Runnable () { > + @Override > + public void run() { > + storage.addSearchJar(tempJarUrl); > + } > + }); > + > + /* This check isn't critical, but ensures we do not accidentally add jars as search directories */ > + assertFalse(storage.getSearchDirectories().contains(tempJarUrl)); > + > + /* If the file we added is native, it should be found > + * Due to an implementation detail, non-native files will not be found */ > + boolean testFileWasFound = storage.findLibrary(testFile) != null; > + assertEquals(ext.isNative, testFileWasFound); > + } > + } > + > + /* Tests searching for native libraries in directories */ > + @Test > + public void testDirectorySearch() throws Exception { > + for (FileExtension ext : extensionsToTest) { > + String testFile = "foobar" + ext.extension; > + File tempDirectory = createTempDirectory(); > + > + /* Create an empty file with the name 'testFile' */ > + ExecUtils.execAndLog(tempDirectory, "touch", testFile); > + > + NativeLibraryStorage storage = nativeLibraryStorageWithCache(/* None needed */); > + storage.addSearchDirectory(tempDirectory); > + > + /* Ensure directory is in our search list */ > + assertTrue(storage.getSearchDirectories().contains(tempDirectory)); > + > + /* The file should be found, regardless if it was native */ > + boolean testFileWasFound = storage.findLibrary(testFile) != null; > + assertTrue(testFileWasFound); > + } > + } > + > + @Test > + public void testCleanupTemporaryFolder() throws Exception { > + NativeLibraryStorage storage = nativeLibraryStorageWithCache(/* None needed */); > + storage.ensureNativeStoreDirectory(); > + > + /* The temporary native store directory should be our only search folder */ > + assertTrue(storage.getSearchDirectories().size() == 1); > + > + File searchDirectory = storage.getSearchDirectories().get(0); > + assertTrue(searchDirectory.exists()); > + > + /* Test that it has been deleted */ > + storage.cleanupTemporaryFolder(); > + assertFalse(searchDirectory.exists()); > + > + } > +} > \ No newline at end of file > diff --git a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java > --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java > +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java > @@ -36,136 +36,46 @@ exception statement from your version. > > package net.sourceforge.jnlp.runtime; > > +import static net.sourceforge.jnlp.util.FileDescriptorUtils.assertNoFileLeak; > + > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.assertFalse; > import static org.junit.Assert.fail; > > import java.io.File; > -import java.lang.management.ManagementFactory; > -import java.net.MalformedURLException; > -import java.net.URL; > import java.util.ArrayList; > -import java.util.Arrays; > import java.util.List; > -import java.util.Locale; > > -import javax.management.MBeanServer; > -import javax.management.ObjectName; > - > -import net.sourceforge.jnlp.InformationDesc; > -import net.sourceforge.jnlp.JARDesc; > -import net.sourceforge.jnlp.JNLPFile; > import net.sourceforge.jnlp.LaunchException; > -import net.sourceforge.jnlp.ResourcesDesc; > -import net.sourceforge.jnlp.SecurityDesc; > -import net.sourceforge.jnlp.ServerAccess; > -import net.sourceforge.jnlp.Version; > import net.sourceforge.jnlp.cache.UpdatePolicy; > -import net.sourceforge.jnlp.util.StreamUtils; > +import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar; > +import net.sourceforge.jnlp.util.ExecUtils; > > import org.junit.Test; > > public class JNLPClassLoaderTest { > > - /* Get the open file-descriptor count for the process. > - * Note that this is specific to Unix-like operating systems. > - * As well, it relies on */ > - static public long getOpenFileDescriptorCount() { > - MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer(); > - try { > - return (Long) beanServer.getAttribute( > - new ObjectName("java.lang:type=OperatingSystem"), > - "OpenFileDescriptorCount" > - ); > - } catch (Exception e) { > - // Effectively disables leak tests > - ServerAccess.logErrorReprint("Warning: Cannot get file descriptors for this platform!"); > - return 0; > - } > - } > - > - /* Check the amount of file descriptors before and after a Runnable */ > - static private void assertNoFileLeak(Runnable runnable) { > - long filesOpenBefore = getOpenFileDescriptorCount(); > - runnable.run(); > - long filesLeaked = getOpenFileDescriptorCount() - filesOpenBefore; > - assertEquals(0, filesLeaked); > - } > - > - static private String cleanExec(File directory, String... command) throws Exception { > - Process p = Runtime.getRuntime().exec(command, new String[]{}, directory); > - > - String stdOut = StreamUtils.readStreamAsString(p.getInputStream()); > - String stdErr = StreamUtils.readStreamAsString(p.getErrorStream()); > - > - ServerAccess.logNoReprint("Running " + Arrays.toString(command)); > - ServerAccess.logNoReprint("Standard output was: \n" + stdOut); > - ServerAccess.logNoReprint("Standard error was: \n" + stdErr); > - > - p.getInputStream().close(); > - p.getErrorStream().close(); > - p.getOutputStream().close(); > - > - return stdOut; > - > + static public File createTempDirectory() throws Exception { > + return new File(ExecUtils.execAndLog(null /* current working dir */, "mktemp", "-d")); > } > > /* Creates a jar in a temporary directory, with the given name & manifest contents. */ > - static private File createTempJar(String jarName, String manifestContents) throws Exception { > - File dir = new File(cleanExec(null /* current working dir */, "mktemp", "-d")); > - cleanExec(dir, "/bin/bash", "-c", "echo '" + manifestContents + "' > Manifest.txt"); > - cleanExec(dir, "jar", "-cfm", jarName, "Manifest.txt"); > + static public File createTempJar(String jarName, String manifestContents) throws Exception { > + File dir = createTempDirectory(); > + ExecUtils.execAndLog(dir, "/bin/sh", "-c", "echo '" + manifestContents + "' > Manifest.txt"); > + ExecUtils.execAndLog(dir, "jar", "-cfm", jarName, "Manifest.txt"); > return new File(dir.getAbsolutePath() + "/" + jarName); > } > > /* Creates a jar in a temporary directory, with the given name & an empty manifest. */ > - static private File createTempJar(String jarName) throws Exception { > + static public File createTempJar(String jarName) throws Exception { > return createTempJar(jarName, ""); > } > > - /* Create a JARDesc for the given URL location */ > - static private JARDesc makeJarDesc(URL jarLocation) { > - return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false); > - } > - > - /* A mocked dummy JNLP file with a single JAR. */ > - private class MockedOneJarJNLPFile extends JNLPFile { > - URL codeBase, jarLocation; > - JARDesc jarDesc; > - > - MockedOneJarJNLPFile(File jarFile) throws MalformedURLException { > - codeBase = jarFile.getParentFile().toURI().toURL(); > - jarLocation = jarFile.toURI().toURL(); > - jarDesc = makeJarDesc(jarLocation); > - info = new ArrayList(); > - } > - > - @Override > - public ResourcesDesc getResources() { > - ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > - resources.addResource(jarDesc); > - return resources; > - } > - @Override > - public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) { > - return new ResourcesDesc[] { getResources() }; > - } > - > - @Override > - public URL getCodeBase() { > - return codeBase; > - } > - > - @Override > - public SecurityDesc getSecurity() { > - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > - } > - }; > - > /* Note: Only does file leak testing for now. */ > @Test > public void constructorFileLeakTest() throws Exception { > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); > + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar")); > > assertNoFileLeak( new Runnable () { > @Override > @@ -183,7 +93,7 @@ public class JNLPClassLoaderTest { > * However, it is tricky without it erroring-out. */ > @Test > public void isInvalidJarTest() throws Exception { > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); > + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar")); > final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); > > assertNoFileLeak( new Runnable () { > @@ -194,25 +104,11 @@ public class JNLPClassLoaderTest { > }); > > } > - > - /* Note: Only does file leak testing for now, but more testing could be added. */ > - @Test > - public void activateNativeFileLeakTest() throws Exception { > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); > - final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); > - > - assertNoFileLeak( new Runnable () { > - @Override > - public void run() { > - classLoader.activateNative(jnlpFile.jarDesc); > - } > - }); > - } > > @Test > public void getMainClassNameTest() throws Exception { > /* Test with main-class */{ > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "Main-Class: DummyClass\n")); > + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "Main-Class: DummyClass\n")); > final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); > > assertNoFileLeak(new Runnable() { > @@ -223,7 +119,7 @@ public class JNLPClassLoaderTest { > }); > } > /* Test with-out main-class */{ > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "")); > + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "")); > final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); > > assertNoFileLeak(new Runnable() { > @@ -246,7 +142,7 @@ public class JNLPClassLoaderTest { > /* Note: Although it does a basic check, this mainly checks for file-descriptor leak */ > @Test > public void checkForMainFileLeakTest() throws Exception { > - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "")); > + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "")); > final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); > assertNoFileLeak(new Runnable() { > @Override > diff --git a/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java > new file mode 100644 > --- /dev/null > +++ b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java > @@ -0,0 +1,91 @@ > +/* > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.mock; > + > +import java.io.File; > +import java.net.MalformedURLException; > +import java.net.URL; > +import java.util.ArrayList; > +import java.util.Locale; > + > +import net.sourceforge.jnlp.InformationDesc; > +import net.sourceforge.jnlp.JARDesc; > +import net.sourceforge.jnlp.JNLPFile; > +import net.sourceforge.jnlp.ResourcesDesc; > +import net.sourceforge.jnlp.SecurityDesc; > +import net.sourceforge.jnlp.Version; > + > +/* A mocked dummy JNLP file with a single JAR. */ > +public class DummyJNLPFileWithJar extends JNLPFile { > + > + /* Create a JARDesc for the given URL location */ > + static private JARDesc makeJarDesc(URL jarLocation) { > + return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false); > + } > + > + public URL codeBase, jarLocation; > + public JARDesc jarDesc; > + > + public DummyJNLPFileWithJar(File jarFile) throws MalformedURLException { > + codeBase = jarFile.getParentFile().toURI().toURL(); > + jarLocation = jarFile.toURI().toURL(); > + jarDesc = makeJarDesc(jarLocation); > + info = new ArrayList(); > + } > + > + @Override > + public ResourcesDesc getResources() { > + ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > + resources.addResource(jarDesc); > + return resources; > + } > + @Override > + public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) { > + return new ResourcesDesc[] { getResources() }; > + } > + > + @Override > + public URL getCodeBase() { > + return codeBase; > + } > + > + @Override > + public SecurityDesc getSecurity() { > + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > + } > +}; > \ No newline at end of file > diff --git a/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java b/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java > new file mode 100644 > --- /dev/null > +++ b/tests/test-extensions/net/sourceforge/jnlp/util/ExecUtils.java > @@ -0,0 +1,64 @@ > +/* > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.util; > + > +import java.io.File; > +import java.util.Arrays; > + > +import net.sourceforge.jnlp.ServerAccess; > + > +public class ExecUtils { > + > + static public String execAndLog(File directory, String... command) throws Exception { > + Process p = Runtime.getRuntime().exec(command, new String[]{}, directory); > + > + String stdOut = StreamUtils.readStreamAsString(p.getInputStream()); > + String stdErr = StreamUtils.readStreamAsString(p.getErrorStream()); > + > + ServerAccess.logNoReprint("Running " + Arrays.toString(command)); > + ServerAccess.logNoReprint("Standard output was: \n" + stdOut); > + ServerAccess.logNoReprint("Standard error was: \n" + stdErr); > + > + p.getInputStream().close(); > + p.getErrorStream().close(); > + p.getOutputStream().close(); > + > + return stdOut; > + > + } > +} > diff --git a/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java b/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java > new file mode 100644 > --- /dev/null > +++ b/tests/test-extensions/net/sourceforge/jnlp/util/FileDescriptorUtils.java > @@ -0,0 +1,76 @@ > +/* > +Copyright (C) 2013 Red Hat, Inc. > + > +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, version 2. > + > +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 net.sourceforge.jnlp.util; > + > +import static org.junit.Assert.assertEquals; > + > +import java.lang.management.ManagementFactory; > + > +import javax.management.MBeanServer; > +import javax.management.ObjectName; > + > +import net.sourceforge.jnlp.ServerAccess; > + > +public class FileDescriptorUtils { > + > + /* Get the open file-descriptor count for the process. > + * Note that this is specific to Unix-like operating systems. > + * As well, it relies on */ > + static public long getOpenFileDescriptorCount() { > + MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer(); > + try { > + return (Long) beanServer.getAttribute( > + new ObjectName("java.lang:type=OperatingSystem"), > + "OpenFileDescriptorCount" > + ); > + } catch (Exception e) { > + // Effectively disables leak tests > + ServerAccess.logErrorReprint("Warning: Cannot get file descriptors for this platform!"); > + return 0; > + } > + } > + > + /* Check the amount of file descriptors before and after a Runnable */ > + static public void assertNoFileLeak(Runnable runnable) { > + long filesOpenBefore = getOpenFileDescriptorCount(); > + runnable.run(); > + long filesLeaked = getOpenFileDescriptorCount() - filesOpenBefore; > + assertEquals(0, filesLeaked); > + } > + > +} > From ptisnovs at icedtea.classpath.org Wed May 29 03:55:34 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 29 May 2013 10:55:34 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset b97c3acc4538 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b97c3acc4538 author: Pavel Tisnovsky date: Wed May 29 12:59:02 2013 +0200 Ten new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 152 +++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diffs (174 lines): diff -r 3e88cf8d0498 -r b97c3acc4538 ChangeLog --- a/ChangeLog Tue May 28 10:33:43 2013 +0200 +++ b/ChangeLog Wed May 29 12:59:02 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-29 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-05-28 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r 3e88cf8d0498 -r b97c3acc4538 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue May 28 10:33:43 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed May 29 12:59:02 2013 +0200 @@ -4156,6 +4156,158 @@ } /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for vertical blue gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalBlueGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalBlueGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Wed May 29 04:18:59 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 29 May 2013 11:18:59 +0000 Subject: /hg/rhino-tests: Fixed minor issues in CompiledScriptClassTest t... Message-ID: changeset 08a0486c9c98 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=08a0486c9c98 author: Pavel Tisnovsky date: Wed May 29 13:22:26 2013 +0200 Fixed minor issues in CompiledScriptClassTest test case. diffstat: ChangeLog | 5 +++ src/org/RhinoTests/CompiledScriptClassTest.java | 36 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 3604b6b22396 -r 08a0486c9c98 ChangeLog --- a/ChangeLog Tue May 28 10:42:15 2013 +0200 +++ b/ChangeLog Wed May 29 13:22:26 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-29 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Fixed minor issues. + 2013-05-28 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: diff -r 3604b6b22396 -r 08a0486c9c98 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Tue May 28 10:42:15 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Wed May 29 13:22:26 2013 +0200 @@ -960,6 +960,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.compiledScriptClass.getAnnotations(); // and transform the array into a list of annotation names @@ -967,7 +970,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -986,6 +1002,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.compiledScriptClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -993,7 +1012,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From adomurad at redhat.com Wed May 29 07:33:52 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 29 May 2013 10:33:52 -0400 Subject: [rfc][icedtea-web] Remove 'serious' from 'A serious exception has occurred' Message-ID: <51A611D0.5010708@redhat.com> Changelog in patch. Motivation being people seem to not be sure what serious means here. Worth dropping. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: not-serious.patch Type: text/x-patch Size: 1543 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/6ffb6bd2/not-serious.patch From jvanek at redhat.com Wed May 29 07:40:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 29 May 2013 16:40:15 +0200 Subject: [rfc][icedtea-web] Remove 'serious' from 'A serious exception has occurred' In-Reply-To: <51A611D0.5010708@redhat.com> References: <51A611D0.5010708@redhat.com> Message-ID: <51A6134F.3050005@redhat.com> On 05/29/2013 04:33 PM, Adam Domurad wrote: > Changelog in patch. Motivation being people seem to not be sure what serious means here. Worth > dropping. > I'm ok with it as you proposed. ok head + 1.4 Thanx, J. From sgehwolf at redhat.com Wed May 29 07:53:14 2013 From: sgehwolf at redhat.com (Severin Gehwolf) Date: Wed, 29 May 2013 16:53:14 +0200 Subject: [rfc][icedtea-web] Remove 'serious' from 'A serious exception has occurred' In-Reply-To: <51A611D0.5010708@redhat.com> References: <51A611D0.5010708@redhat.com> Message-ID: <1369839194.2280.34.camel@localhost> On Wed, 2013-05-29 at 10:33 -0400, Adam Domurad wrote: > Changelog in patch. Motivation being people seem to not be sure what > serious means here. Worth dropping. +1 Cheers, Severin From adomurad at icedtea.classpath.org Wed May 29 07:53:22 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Wed, 29 May 2013 14:53:22 +0000 Subject: /hg/icedtea-web: Remove 'serious' from error message in splash s... Message-ID: changeset acc70a489a2d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=acc70a489a2d author: Adam Domurad date: Wed May 29 10:54:44 2013 -0400 Remove 'serious' from error message in splash screen. diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (33 lines): diff -r 9e1f7dc48c20 -r acc70a489a2d ChangeLog --- a/ChangeLog Mon May 20 16:22:44 2013 +0200 +++ b/ChangeLog Wed May 29 10:54:44 2013 -0400 @@ -1,3 +1,8 @@ +2013-05-29 Adam Domurad + + * netx/net/sourceforge/jnlp/resources/Messages.properties: + "A serious exception occurred" -> "An exception occurred" + 2013-05-20 Jiri Vanek Synchronized launchers to be from one source diff -r 9e1f7dc48c20 -r acc70a489a2d netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon May 20 16:22:44 2013 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed May 29 10:54:44 2013 -0400 @@ -484,7 +484,7 @@ CLHelpDescription=The itweb-settings tool allows a user to modify, view and check configuration.\nTo use the GUI, do not pass any arguments. To use the CLI mode, pass in the approrpiate command and parameters. For help with a particular command, try: {0} command help # splash screen related -SPLASHerror = Click here for details. Serious exception occurred. +SPLASHerror = Click here for details. An exception has occurred. SPLASH_ERROR = ERROR SPLASHtitle = Title SPLASHvendor = Vendor @@ -492,7 +492,7 @@ SPLASHdescription = Description SPLASHClose= Close SPLASHclosewAndCopyException = Close and copy the stack trace to clipboard -SPLASHexOccured = A serious exception has occurred... +SPLASHexOccured = An exception has occurred... SPLASHHome = Home SPLASHcantCopyEx = Can not copy exception SPLASHnoExRecorded = No exception recorded From adomurad at icedtea.classpath.org Wed May 29 07:55:19 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Wed, 29 May 2013 14:55:19 +0000 Subject: /hg/release/icedtea-web-1.4: Remove 'serious' from error message... Message-ID: changeset e281ea56466e in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=e281ea56466e author: Adam Domurad date: Wed May 29 10:56:57 2013 -0400 Remove 'serious' from error message in splash screen. diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (33 lines): diff -r b5b5f59833e2 -r e281ea56466e ChangeLog --- a/ChangeLog Tue May 21 09:31:57 2013 -0400 +++ b/ChangeLog Wed May 29 10:56:57 2013 -0400 @@ -1,3 +1,8 @@ +2013-05-29 Adam Domurad + + * netx/net/sourceforge/jnlp/resources/Messages.properties: + "A serious exception occurred" -> "An exception occurred" + 2013-05-21 Adam Domurad Reproducer for PR854. diff -r b5b5f59833e2 -r e281ea56466e netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue May 21 09:31:57 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed May 29 10:56:57 2013 -0400 @@ -484,7 +484,7 @@ CLHelpDescription=The itweb-settings tool allows a user to modify, view and check configuration.\nTo use the GUI, do not pass any arguments. To use the CLI mode, pass in the approrpiate command and parameters. For help with a particular command, try: {0} command help # splash screen related -SPLASHerror = Click here for details. Serious exception occurred. +SPLASHerror = Click here for details. An exception has occurred. SPLASH_ERROR = ERROR SPLASHtitle = Title SPLASHvendor = Vendor @@ -492,7 +492,7 @@ SPLASHdescription = Description SPLASHClose= Close SPLASHclosewAndCopyException = Close and copy the stack trace to clipboard -SPLASHexOccured = A serious exception has occurred... +SPLASHexOccured = An exception has occurred... SPLASHHome = Home SPLASHcantCopyEx = Can not copy exception SPLASHnoExRecorded = No exception recorded From andy.johnson at linaro.org Wed May 29 11:30:15 2013 From: andy.johnson at linaro.org (Andy Johnson) Date: Wed, 29 May 2013 14:30:15 -0400 Subject: Zero build requests not being honored Message-ID: If I configure icedtea3 (for OpenJDK8) with "--enable-zero", I end up with a "Server VM" in the resulting build. Since OpenJDK8 uses "--with-jdk-variant=zero" instead of "--enable-zero", it appears that IcedTea has not made the transition to the new OpenJDK configure options. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/a31f7ccd/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 29 11:59:10 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 29 May 2013 18:59:10 +0000 Subject: [Bug 1463] New: Fatal error by Java Runtime Environment when running MOPEX Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 Bug ID: 1463 Summary: Fatal error by Java Runtime Environment when running MOPEX Classification: Unclassified Product: IcedTea Version: 6-1.9.1 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: jrbent at g.cofc.edu CC: unassigned at icedtea.classpath.org Created attachment 877 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=877&action=edit Error report file I am trying to run MOPEX, which is a program written to calibrate images from NASA's Spitzer Space telescope. When I run the start script (./mopex) I encounter the following error: Installer: (uplink_util.jar) rootDir: /astro/software/MOPEX # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007ffd997bd671, pid=29475, tid=140726732973824 # # JRE version: 6.0_20-b20 # Java VM: OpenJDK 64-Bit Server VM (19.0-b06 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.9.1 # Distribution: Custom build (Wed Oct 13 22:53:58 UTC 2010) # Problematic frame: # C [ld-linux-x86-64.so.2+0x15671] # # An error report file with more information is saved as: # /tmp/hs_err_pid29475.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # Aborted (core dumped) I am using Ubuntu 13.04. I know this is probably not a very common problem because of the obscurity of MOPEX, but any help would be much appreciated. Thanks. John. *I am attaching the error report file named above. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/50f1d46b/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 29 12:38:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 29 May 2013 19:38:51 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com --- Comment #1 from Andrew Haley --- This one is very tricky because the fault happened outside Java, in the operating system's shared library loader. You are using a very old version of OpenJDK, which isn't going to help. I'd encourage you to upgrade to a supported release. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/525ba0a9/attachment.html From adomurad at icedtea.classpath.org Wed May 29 12:41:42 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Wed, 29 May 2013 19:41:42 +0000 Subject: /hg/icedtea-web: Move inner test class MockedOneJarJNLPFile to t... Message-ID: changeset 2566a700bd86 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2566a700bd86 author: Adam Domurad date: Wed May 29 15:43:21 2013 -0400 Move inner test class MockedOneJarJNLPFile to top-level DummyJNLPFileWithJar diffstat: ChangeLog | 8 + tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java | 58 +-------- tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java | 54 +++++++++ 3 files changed, 69 insertions(+), 51 deletions(-) diffs (200 lines): diff -r acc70a489a2d -r 2566a700bd86 ChangeLog --- a/ChangeLog Wed May 29 10:54:44 2013 -0400 +++ b/ChangeLog Wed May 29 15:43:21 2013 -0400 @@ -1,3 +1,11 @@ +2013-05-29 Adam Domurad + + * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: + Moved & renamed inner MockedOneJarJNLPFile to top-level + DummyJNLPFileWithJar class. + * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java: + Moved & renamed from JNLPClassLoaderTest.MockedOneJarJNLPFile. + 2013-05-29 Adam Domurad * netx/net/sourceforge/jnlp/resources/Messages.properties: diff -r acc70a489a2d -r 2566a700bd86 tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Wed May 29 10:54:44 2013 -0400 +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Wed May 29 15:43:21 2013 -0400 @@ -42,25 +42,20 @@ import java.io.File; import java.lang.management.ManagementFactory; -import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Locale; import javax.management.MBeanServer; import javax.management.ObjectName; -import net.sourceforge.jnlp.InformationDesc; import net.sourceforge.jnlp.JARDesc; -import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.LaunchException; -import net.sourceforge.jnlp.ResourcesDesc; -import net.sourceforge.jnlp.SecurityDesc; import net.sourceforge.jnlp.ServerAccess; import net.sourceforge.jnlp.Version; import net.sourceforge.jnlp.cache.UpdatePolicy; +import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar; import net.sourceforge.jnlp.util.StreamUtils; import org.junit.Test; @@ -123,49 +118,10 @@ return createTempJar(jarName, ""); } - /* Create a JARDesc for the given URL location */ - static private JARDesc makeJarDesc(URL jarLocation) { - return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false); - } - - /* A mocked dummy JNLP file with a single JAR. */ - private class MockedOneJarJNLPFile extends JNLPFile { - URL codeBase, jarLocation; - JARDesc jarDesc; - - MockedOneJarJNLPFile(File jarFile) throws MalformedURLException { - codeBase = jarFile.getParentFile().toURI().toURL(); - jarLocation = jarFile.toURI().toURL(); - jarDesc = makeJarDesc(jarLocation); - info = new ArrayList(); - } - - @Override - public ResourcesDesc getResources() { - ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); - resources.addResource(jarDesc); - return resources; - } - @Override - public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) { - return new ResourcesDesc[] { getResources() }; - } - - @Override - public URL getCodeBase() { - return codeBase; - } - - @Override - public SecurityDesc getSecurity() { - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); - } - }; - /* Note: Only does file leak testing for now. */ @Test public void constructorFileLeakTest() throws Exception { - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar")); assertNoFileLeak( new Runnable () { @Override @@ -183,7 +139,7 @@ * However, it is tricky without it erroring-out. */ @Test public void isInvalidJarTest() throws Exception { - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar")); final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); assertNoFileLeak( new Runnable () { @@ -198,7 +154,7 @@ /* Note: Only does file leak testing for now, but more testing could be added. */ @Test public void activateNativeFileLeakTest() throws Exception { - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar")); final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); assertNoFileLeak( new Runnable () { @@ -212,7 +168,7 @@ @Test public void getMainClassNameTest() throws Exception { /* Test with main-class */{ - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "Main-Class: DummyClass\n")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "Main-Class: DummyClass\n")); final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); assertNoFileLeak(new Runnable() { @@ -223,7 +179,7 @@ }); } /* Test with-out main-class */{ - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "")); final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); assertNoFileLeak(new Runnable() { @@ -246,7 +202,7 @@ /* Note: Although it does a basic check, this mainly checks for file-descriptor leak */ @Test public void checkForMainFileLeakTest() throws Exception { - final MockedOneJarJNLPFile jnlpFile = new MockedOneJarJNLPFile(createTempJar("test.jar", "")); + final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(createTempJar("test.jar", "")); final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS); assertNoFileLeak(new Runnable() { @Override diff -r acc70a489a2d -r 2566a700bd86 tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java Wed May 29 15:43:21 2013 -0400 @@ -0,0 +1,54 @@ +package net.sourceforge.jnlp.mock; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Locale; + +import net.sourceforge.jnlp.InformationDesc; +import net.sourceforge.jnlp.JARDesc; +import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.ResourcesDesc; +import net.sourceforge.jnlp.SecurityDesc; +import net.sourceforge.jnlp.Version; + +/* A mocked dummy JNLP file with a single JAR. */ +public class DummyJNLPFileWithJar extends JNLPFile { + + /* Create a JARDesc for the given URL location */ + static JARDesc makeJarDesc(URL jarLocation) { + return new JARDesc(jarLocation, new Version("1"), null, false,false, false,false); + } + + public URL codeBase, jarLocation; + public JARDesc jarDesc; + + public DummyJNLPFileWithJar(File jarFile) throws MalformedURLException { + codeBase = jarFile.getParentFile().toURI().toURL(); + jarLocation = jarFile.toURI().toURL(); + jarDesc = makeJarDesc(jarLocation); + info = new ArrayList(); + } + + @Override + public ResourcesDesc getResources() { + ResourcesDesc resources = new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); + resources.addResource(jarDesc); + return resources; + } + @Override + public ResourcesDesc[] getResourcesDescs(final Locale locale, final String os, final String arch) { + return new ResourcesDesc[] { getResources() }; + } + + @Override + public URL getCodeBase() { + return codeBase; + } + + @Override + public SecurityDesc getSecurity() { + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); + } +} \ No newline at end of file From gnu.andrew at redhat.com Wed May 29 13:19:08 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 29 May 2013 16:19:08 -0400 (EDT) Subject: Zero build requests not being honored In-Reply-To: References: Message-ID: <1456080685.237634.1369858748989.JavaMail.root@redhat.com> ----- Original Message ----- > If I configure icedtea3 (for OpenJDK8) with "--enable-zero", I end up with > a "Server VM" in the resulting build. Since OpenJDK8 uses > "--with-jdk-variant=zero" instead of "--enable-zero", it appears that > IcedTea has not made the transition to the new OpenJDK configure options. > No, Zero hasn't been looked at yet. IcedTea for OpenJDK 8 is still very much a work in progress and there hasn't been a release yet. Patches welcome :) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Wed May 29 13:23:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 29 May 2013 20:23:44 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Andrew John Hughes --- This version is no longer supported. Please reopen the bug if you can reproduce the issue on 1.11.x or 1.12.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/6cd33f35/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 29 13:24:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 29 May 2013 20:24:17 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #877|text/x-log |text/plain mime type| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/e30eb306/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed May 29 13:29:42 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 29 May 2013 20:29:42 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 --- Comment #3 from johnrbent --- OK. I did a lilttle digging because I had just update OpenJDK. It turns out there is a java subdirectory in the MOPEX directory, in which there is a java script which is explicitly called in the startup script: asl at subaru:/astro/software/MOPEX/jre/bin$ ll total 492 drwxr-xr-x 2 root root 4096 Nov 5 2010 ./ drwxrwxr-x 4 root root 4096 Nov 5 2010 ../ -rwxr-xr-x 1 root root 35960 Nov 5 2010 java* -rwxr-xr-x 1 root root 35968 Nov 5 2010 javaws* -rwxr-xr-x 1 root root 35960 Nov 5 2010 keytool* -rwxr-xr-x 1 root root 36096 Nov 5 2010 orbd* -rwxr-xr-x 1 root root 36072 Nov 5 2010 pack200* -rwxr-xr-x 1 root root 35984 Nov 5 2010 pluginappletviewer* -rwxr-xr-x 1 root root 35976 Nov 5 2010 policytool* -rwxr-xr-x 1 root root 35952 Nov 5 2010 rmid* -rwxr-xr-x 1 root root 35960 Nov 5 2010 rmiregistry* -rwxr-xr-x 1 root root 35960 Nov 5 2010 servertool* -rwxr-xr-x 1 root root 36104 Nov 5 2010 tnameserv* -rwxr-xr-x 1 root root 86064 Nov 5 2010 unpack200* I checked out which version it was: asl at subaru:/astro/software/MOPEX/jre/bin$ ./java -version java version "1.6.0_20" OpenJDK Runtime Environment (IcedTea6 1.9.1) (fedora-44.1.9.1.fc14-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b06, mixed mode) and: asl at subaru:/astro/software/MOPEX/jre/bin$ java -version java version "1.7.0_21" OpenJDK Runtime Environment (IcedTea 2.3.9) (7u21-2.3.9-1ubuntu1) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) So I don't know all that much about Java or how it works. I'm not sure if this MOPEX java subdirectory is its own instance of java or if it is suppposed to be linked to the java version on my computer. Again any help is appreciated. John. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130529/d7cddb83/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 30 01:01:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 30 May 2013 08:01:23 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 --- Comment #4 from Andrew Haley --- It is indeed a complete (and obsolete) instance of Java. I've no idea why MOPEX did this. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/8b6c6b89/attachment.html From ptisnovs at icedtea.classpath.org Thu May 30 01:04:20 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 30 May 2013 08:04:20 +0000 Subject: /hg/gfx-test: Five new tests added into ClippingCircleByEllipseS... Message-ID: changeset 03f7433af553 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=03f7433af553 author: Pavel Tisnovsky date: Thu May 30 10:07:45 2013 +0200 Five new tests added into ClippingCircleByEllipseShape. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java | 115 +++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diffs (144 lines): diff -r b97c3acc4538 -r 03f7433af553 ChangeLog --- a/ChangeLog Wed May 29 12:59:02 2013 +0200 +++ b/ChangeLog Thu May 30 10:07:45 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-30 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: + Five new tests added into ClippingCircleByEllipseShape. + 2013-05-29 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r b97c3acc4538 -r 03f7433af553 src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Wed May 29 12:59:02 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Thu May 30 10:07:45 2013 +0200 @@ -219,6 +219,31 @@ } /** + * Draw circle clipped by an ellipse shape. Circle is drawn using alpha + * paint with white color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByEllipseShapeAlphaPaintWhite(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip ellipse + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillWhiteColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingEllipseShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** * Check if circle shape could be clipped by an ellipse shape. Circle is * rendered using stroke paint. * @@ -692,6 +717,96 @@ /** * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with white color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintWhite000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 0% transparency + drawCircleClippedByEllipseShapeAlphaPaintWhite(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with white color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintWhite025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 25% transparency + drawCircleClippedByEllipseShapeAlphaPaintWhite(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with white color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintWhite050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 50% transparency + drawCircleClippedByEllipseShapeAlphaPaintWhite(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with white color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintWhite075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 75% transparency + drawCircleClippedByEllipseShapeAlphaPaintWhite(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using alpha paint with white color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByEllipseShapeAlphaPaintWhite100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by ellipse shape using alpha paint with 100% transparency + drawCircleClippedByEllipseShapeAlphaPaintWhite(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is * rendered using horizontal gradient paint. * * @param image From ptisnovs at icedtea.classpath.org Thu May 30 01:14:30 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 30 May 2013 08:14:30 +0000 Subject: /hg/rhino-tests: Updated four tests in InvocableClassTest for (O... Message-ID: changeset 70224e9b40f2 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=70224e9b40f2 author: Pavel Tisnovsky date: Thu May 30 10:17:57 2013 +0200 Updated four tests in InvocableClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/InvocableClassTest.java | 82 ++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 4 deletions(-) diffs (140 lines): diff -r 08a0486c9c98 -r 70224e9b40f2 ChangeLog --- a/ChangeLog Wed May 29 13:22:26 2013 +0200 +++ b/ChangeLog Thu May 30 10:17:57 2013 +0200 @@ -1,3 +1,9 @@ +2013-05-30 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Updated four tests in InvocableClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-05-29 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r 08a0486c9c98 -r 70224e9b40f2 src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Wed May 29 13:22:26 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Thu May 30 10:17:57 2013 +0200 @@ -613,6 +613,13 @@ "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)", + "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)", + "public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", + "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", + }; + // get all inherited methods Method[] methods = this.invocableClass.getMethods(); // and transform the array into a list of method names @@ -620,7 +627,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -647,6 +667,13 @@ "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)", + "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)", + "public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", + "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException", + }; + // get all declared methods Method[] declaredMethods = this.invocableClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -654,7 +681,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -679,7 +719,24 @@ methodsThatShouldExist_jdk7.put("getInterface", new Class[] {java.lang.Class.class}); methodsThatShouldExist_jdk7.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); + methodsThatShouldExist_jdk8.put("invokeFunction", new Class[] {java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); + methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Object.class, java.lang.Class.class}); + methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Class.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -717,7 +774,24 @@ methodsThatShouldExist_jdk7.put("getInterface", new Class[] {java.lang.Class.class}); methodsThatShouldExist_jdk7.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); + methodsThatShouldExist_jdk8.put("invokeFunction", new Class[] {java.lang.String.class, Class.forName("[Ljava.lang.Object;")}); + methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Object.class, java.lang.Class.class}); + methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Class.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From adomurad at redhat.com Thu May 30 08:10:57 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 30 May 2013 11:10:57 -0400 Subject: [icedtea-web][rfc] Extract native code caching from JNLPClassLoader into a small class In-Reply-To: <51A5D6AD.7040100@redhat.com> References: <5136618B.70505@redhat.com> <513F3AFC.2040109@redhat.com> <519E6BC6.7070007@redhat.com> <51A5D6AD.7040100@redhat.com> Message-ID: <51A76C01.1080805@redhat.com> On 05/29/2013 06:21 AM, Jiri Vanek wrote: > On 05/23/2013 09:19 PM, Adam Domurad wrote: >> On 03/12/2013 10:26 AM, Jiri Vanek wrote: >>> On 03/05/2013 10:20 PM, Adam Domurad wrote: >>>> This is an incremental part of the effort to reduce the >>>> responsibilities of JNLPClassLoader. >>>> >>>> 2013-03-05 Adam Domurad >>>> >>>> * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New, >>>> stores and searches for native library files that are loaded from >>>> jars. >>>> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code >>>> that handled native jar caching to NativeLibraryStorage. >>>> >>>> Happy hacking, >>>> -Adam >>> >>> Is there any more reason for this refactoring then much nicer, more >>> readable, and testable >>> jnlpclasslaoder? >>> Anyway I'm fan of this kind of refactoring. And I'm for this to be >>> done. >>> >>> - there must be unittests for this chnage >>> - i would like to see even reproducer for this >>> - it should go to 1.3 to after some time in head. >> >> Probably a little late now, but 1.4 sure, unless you think 1.3 is >> still a good idea. > > I'm hesitating with 1.4 now. But probably yes. But you owe me your > head:) >> >>> >>> I have not check if there is something more then pure refactoring, >>> but if there isn't and tsts >>> will be added, then this will be approved. >> >> It is a refactoring only. >> >>> >>> J. >> >> I have created some unit tests, hopefully it is enough to push with ? > > nope. Some moreover important changes needed. > > Especially ExecUtils.execAndLog have no reason to live. Please use > processWrapper. It is designed for this and have logging correctly > adapted. > > Also I'm against such a huge usage of ecxec. Java is not Python. > > Especiallythe touch and mkdir is nothing but pure laziness :) Please > use java calls. Agreed > > For jar -cf ... well.. Java have api to work with its own jars.. > please follow this api. Do not fork processes if possible. But ..well. > this api can be trap :) So choose wisely. > > I would recommend to do the refactoring of DummyJNLPFileWithJar into > separate changset which you can proceed immediately, but I do not > insists. I have spliced this and pushed. > > In all cases, thanx for check and refactoring! It is deeply appreciated. > > J. See new version, I have removed all execs from both the new test, and JNLPClassLoaderTest. New changelog: 2013-XX-XX Adam Domurad * netx/net/sourceforge/jnlp/util/StreamUtils.java (copyStream): New, copies input stream to output stream * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java: New, tests lookup of native libraries from folders and jars. * tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java: New, contains utilities for testing open file descriptors, creating temporary directories, and creating jars. * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: Replace jar creation methods with ones from FileTestUtils. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: native-lib-test-try2-no-execs.patch Type: text/x-patch Size: 23845 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/fda175f2/native-lib-test-try2-no-execs.patch From bugzilla-daemon at icedtea.classpath.org Thu May 30 09:10:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 30 May 2013 16:10:32 +0000 Subject: [Bug 1464] New: NPE on JNLPClassLoader.getPermissions Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1464 Bug ID: 1464 Summary: NPE on JNLPClassLoader.getPermissions Classification: Unclassified Product: IcedTea-Web Version: 1.3.2 Hardware: x86_64 OS: Linux Status: NEW Severity: blocker Priority: P3 Component: NetX (javaws) Assignee: omajid at redhat.com Reporter: wjbittle at gmail.com CC: unassigned at icedtea.classpath.org The JNLP deployment of my application: http://www.praisenter.org/release/production/v2/Praisenter.jnlp It fails on Ubuntu 13.04 64bit running Open JDK 7 and IcedTea 1.3.2 (both installed from the Ubuntu Software Center). java -version: java version "1.7.0_21" OpenJDK Runtime Environment (IcedTea 2.3.9) (7u21-2.3.9-1ubuntu1) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) update-alternatives verifies I'm running the appropriate versions of java and javaws It works on Ubuntu 12.04 LTS 64bit running Open JDK 7 and IcedTea 1.2.3 (again, both installed from the Ubuntu Software Center). java -version: java version "1.7.0_21" OpenJDK Runtime Environment (IcedTea 2.3.9) (7u21-2.3.9-1ubuntu1) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) The failure is similar to bug 1199 (derby is trying to execute a SQL statment). Is there any work around for this problem? The stacktrace: Caused by: java.lang.NullPointerException at net.sourceforge.jnlp.runtime.JNLPClassLoader.getPermissions(JNLPClassLoader.java:1143) at net.sourceforge.jnlp.runtime.JNLPPolicy.getPermissions(JNLPPolicy.java:86) at net.sourceforge.jnlp.runtime.JNLPPolicy.implies(JNLPPolicy.java:182) at java.security.ProtectionDomain.implies(ProtectionDomain.java:272) at java.security.AccessControlContext.checkPermission(AccessControlContext.java:344) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getAccessControlContextForClassLoading(JNLPClassLoader.java:2179) at net.sourceforge.jnlp.runtime.JNLPClassLoader.findLoadedClassAll(JNLPClassLoader.java:1522) at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1554) at org.apache.derby.impl.sql.execute.GenericExecutionFactory.getResultSetFactory(Unknown Source) at org.apache.derby.impl.sql.execute.BaseActivation.getResultSetFactory(Unknown Source) at org.apache.derby.exe.acf81e0010x013exf625x13dcx000016ea53d80.fillResultSet(Unknown Source) at org.apache.derby.exe.acf81e0010x013exf625x13dcx000016ea53d80.execute(Unknown Source) at org.apache.derby.impl.sql.GenericActivationHolder.execute(Unknown Source) at org.apache.derby.impl.sql.GenericPreparedStatement.executeStmt(Unknown Source) at org.apache.derby.impl.sql.GenericPreparedStatement.execute(Unknown Source) ... 10 more -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/76081d43/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 30 09:46:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 30 May 2013 16:46:26 +0000 Subject: [Bug 1464] NPE on JNLPClassLoader.getPermissions In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1464 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |adomurad at redhat.com Resolution|--- |FIXED --- Comment #1 from Adam Domurad --- A guard for this null was added to icedtea-web 1.4, the current release. Maybe I'll propose it for backporting, but for now I'm closing this as resolved. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/fc879a04/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 30 12:53:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 30 May 2013 19:53:05 +0000 Subject: [Bug 1463] Fatal error by Java Runtime Environment when running MOPEX In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1463 --- Comment #5 from Andrew John Hughes --- Look in /usr/lib/jvm to find out what the directory is called containing your system JDK and then replace the jre directory with a symlink to that. For example, $ ls /usr/lib/jvm/ cacao@ gcj-jdk@ icedtea-6@ icedtea-7@ icedtea-8@ $ rm -rf /astro/software/MOPEX/jre $ ln -s /usr/lib/jvm/icedtea-7 /astro/software/MOPEX/jre /astro/software/MOPEX/jre/bin/java -version should then exist again and give the same output as java -version. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/320ad3d1/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu May 30 12:59:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 30 May 2013 19:59:40 +0000 Subject: [Bug 1464] NPE on JNLPClassLoader.getPermissions In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1464 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com Target Milestone|--- |1.4.0 Severity|blocker |normal --- Comment #2 from Andrew John Hughes --- It seems no-one has been maintaining the milestones for IcedTea-Web. I've updated them and set this one to fixed in 1.4.0. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130530/58b1f43a/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 00:02:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 07:02:58 +0000 Subject: [Bug 1465] New: java.io.FileNotFoundException while trying to download a JAR file Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 Bug ID: 1465 Summary: java.io.FileNotFoundException while trying to download a JAR file Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: thomas at m3y3r.de CC: unassigned at icedtea.classpath.org Hello, the 1.4 version fails to execute the Citrix Java ICA client over a Juniper SSL connection, which is also a Java applet/process Version 1.3.x works correctly, will try to bisect this problem. Stack trace is: java.io.FileNotFoundException: https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java%20JICAComponents/JICA-sicaN.jar at sun.reflect.GeneratedConstructorAccessor18.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:525) at sun.net.www.protocol.http.HttpURLConnection$6.run(HttpURLConnection.java:1674) at sun.net.www.protocol.http.HttpURLConnection$6.run(HttpURLConnection.java:1672) at java.security.AccessController.doPrivileged(Native Method) at sun.net.www.protocol.http.HttpURLConnection.getChainedException(HttpURLConnection.java:1670) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1243) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getInputStream(HttpsURLConnectionImpl.java:254) at net.sourceforge.jnlp.util.HttpUtils.consumeAndCloseConnection(HttpUtils.java:65) at net.sourceforge.jnlp.util.HttpUtils.consumeAndCloseConnectionSilently(HttpUtils.java:51) at net.sourceforge.jnlp.cache.ResourceTracker.getUrlResponseCode(ResourceTracker.java:876) at net.sourceforge.jnlp.cache.ResourceTracker.findBestUrl(ResourceTracker.java:911) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:789) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:624) at net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:76) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1172) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1170) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1170) at java.lang.Thread.run(Thread.java:722) Caused by: java.io.FileNotFoundException: https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java%20JICAComponents/JICA-sicaN.jar at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1623) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:338) at net.sourceforge.jnlp.cache.ResourceTracker.getUrlResponseCode(ResourceTracker.java:872) ... 9 more The inability to download the JAR results in this user visible stack trace, which is presented in a popup: IcedTea-Web Plugin version: 1.4 (fedora-0.fc18-x86_64) Fri May 31 08:52:38 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialisierungsfehler: Konnte Applet nicht initialisieren. Um weitere Information zu erhalten, bitte den Knopf ?Weitere Informationen? klicken. at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Anwendungsfehler: Unbekannte Hauptklasse. Konnte die Hauptklasse f?r diese Anwendung nicht bestimmen. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more Chain: 1) at Fri May 31 08:52:33 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Anwendungsfehler: Unbekannte Hauptklasse. Konnte die Hauptklasse f?r diese Anwendung nicht bestimmen. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) 2) at Fri May 31 08:52:33 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialisierungsfehler: Konnte Applet nicht initialisieren. Um weitere Information zu erhalten, bitte den Knopf ?Weitere Informationen? klicken. at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Anwendungsfehler: Unbekannte Hauptklasse. Konnte die Hauptklasse f?r diese Anwendung nicht bestimmen. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/207b2358/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 01:45:31 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 08:45:31 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #1 from thomas at m3y3r.de --- Mhh. Strange. Once the ResourceTracker is in the "failed" state, there is no way it tries to download the resources again. i end up with: Thread [DownloaderThread1] (Suspended) owns: Resource (id=3903) owns: Object (id=3882) Resource.isSet(int) line: 171 ResourceTracker.selectByFlag(List, int, int) line: 1047 ResourceTracker.selectNextResource() line: 953 ResourceTracker.access$300() line: 76 ResourceTracker$Downloader.run() line: 1152 Thread.run() line: 722 ResourceTracker.selectByFlag: variable "source": (5 entries/JARs): all with status: CONNECTING DOWNLOAD ERROR STARTED The net.sourceforge.jnlp.cache.ResourceTracker.getPrefetch() ends up with null and doesn't switch to download again. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/fe24ae0d/attachment.html From jvanek at redhat.com Fri May 31 03:54:42 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 31 May 2013 12:54:42 +0200 Subject: Fwd: [voting] move or not move icedtea-web to XDG specification in icedtea-web [0] In-Reply-To: <51A5C147.3090709@redhat.com> References: <51A5C147.3090709@redhat.com> Message-ID: <51A88172.2010805@redhat.com> ping? No opinions? -------- Original Message -------- Subject: [voting] move or not move icedtea-web to XDG specification in icedtea-web [0] Date: Wed, 29 May 2013 10:50:15 +0200 From: Jiri Vanek To: Java Project , IcedTea Distro List I have proposed patch to move IcedTea-Web [2] to XDG specification and Omair took the review (the backward compatibility is kept) But we get into deadlock - Although personally I do not care if we will keep ~/.icedtea/{.config .cache} or move to ~/{.config .cache}/.icedtea and afaik Omair is more inclined for XDG specification there are several issues which made this decision 50/50 for us. points to *do not* move to XDG * Initially the file structure was designed to be as similar as proprietary plugin as possible * also not XDG systems are using netx (we know about at least two windows users :) points *to move* to XDG * we have already some differences in file structure (from proprietary plugin) * All modern distributions are following XDG as much as possible and the trend is to convert all Linux applications to it. * there is no known specification for windows which I'm aware of. I would like to avoid to support both... If somebody can give as golden ration or just vote for one of them then we will be very happy :) Best regards, J. [0] See https://bugzilla.redhat.com/show_bug.cgi?id=947647 for more details - but not necessary :) [1] I have tried to "fix this bug" and moved the icedtea-web to this specifikati - https://bugzilla.redhat.com/show_bug.cgi?id=947647 - but agian not neccesary. From aph at redhat.com Fri May 31 04:08:54 2013 From: aph at redhat.com (Andrew Haley) Date: Fri, 31 May 2013 12:08:54 +0100 Subject: Fwd: [voting] move or not move icedtea-web to XDG specification in icedtea-web [0] In-Reply-To: <51A88172.2010805@redhat.com> References: <51A5C147.3090709@redhat.com> <51A88172.2010805@redhat.com> Message-ID: <51A884C6.50609@redhat.com> On 05/31/2013 11:54 AM, Jiri Vanek wrote: > ping? > > No opinions? OK, I'll bite. Why do we care about the XDG specification? Why is it more important than being similar to the proprietary plugin? What will this bring to our users? Have you got nothing more important to do? Andrew. From gnu.andrew at redhat.com Fri May 31 04:44:34 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 31 May 2013 07:44:34 -0400 (EDT) Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <519AD027.4050105@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> Message-ID: <1483145908.1896130.1370000674475.JavaMail.root@redhat.com> ----- Original Message ----- > Hi Jiri, > > On 05/20/2013 03:11 PM, Jiri Vanek wrote: > > This fix is migrating us to ~/.config/icedtea and ~/.cache/icedtea > > instead of ~/.icedtea. > > We decided on the current paths (and files and formats) to stay as close > to the proprietary JREs as possible. We have deviated from this in the > past (the contents of the cache directory, for example), but it's either > because of something not (yet) implemented in icedtea-web, or something > the user should never have to care about (like cache directory layout). > > I am not sure if that decision was perfect, but if we are going to > change this now, I would like us to weigh all the pros and cons. > > As far as the patch itself goes, two things jump out to me: > > 1. We need to stay backwards compatible, if possible. For things like > configuration files, we should check the old locations too. For the > persistence cache, not reading the old data is like throwing away user's > data. > This was the main point I was about to make. It seems to have already been changed once; I have $HOME/.icedtea and $HOME/.icedteaplugin it seems. First run should probably migrate the settings and offer to remove the old set. I seem to remember a bug from the previous change so don't create bugs just for the sake of naming. I don't see what this has to do with the proprietary plugin; surely it doesn't look for $HOME/.icedtea? If it's going to be changed, it should be $HOME/.config/icedtea-web anyway, as that's the name of the product. > 2. The patch seems to be missing support for using the environment > variables (such as $XDG_CONFIG_DIRS) to specify the locations of the > directories. > > Thanks, > Omair > > -- > PGP Key: 66484681 (http://pgp.mit.edu/) > Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From jvanek at redhat.com Fri May 31 04:54:56 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 31 May 2013 13:54:56 +0200 Subject: [icedtea-web][rfc] Extract native code caching from JNLPClassLoader into a small class In-Reply-To: <51A76C01.1080805@redhat.com> References: <5136618B.70505@redhat.com> <513F3AFC.2040109@redhat.com> <519E6BC6.7070007@redhat.com> <51A5D6AD.7040100@redhat.com> <51A76C01.1080805@redhat.com> Message-ID: <51A88F90.7040004@redhat.com> On 05/30/2013 05:10 PM, Adam Domurad wrote: > On 05/29/2013 06:21 AM, Jiri Vanek wrote: >> On 05/23/2013 09:19 PM, Adam Domurad wrote: >>> On 03/12/2013 10:26 AM, Jiri Vanek wrote: >>>> On 03/05/2013 10:20 PM, Adam Domurad wrote: >>>>> This is an incremental part of the effort to reduce the responsibilities of JNLPClassLoader. >>>>> >>>>> 2013-03-05 Adam Domurad >>>>> >>>>> * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New, >>>>> stores and searches for native library files that are loaded from jars. >>>>> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code >>>>> that handled native jar caching to NativeLibraryStorage. >>>>> >>>>> Happy hacking, >>>>> -Adam >>>> >>>> Is there any more reason for this refactoring then much nicer, more readable, and testable >>>> jnlpclasslaoder? >>>> Anyway I'm fan of this kind of refactoring. And I'm for this to be done. >>>> >>>> - there must be unittests for this chnage >>>> - i would like to see even reproducer for this >>>> - it should go to 1.3 to after some time in head. >>> >>> Probably a little late now, but 1.4 sure, unless you think 1.3 is still a good idea. >> >> I'm hesitating with 1.4 now. But probably yes. But you owe me your head:) >>> >>>> >>>> I have not check if there is something more then pure refactoring, but if there isn't and tsts >>>> will be added, then this will be approved. >>> >>> It is a refactoring only. >>> >>>> >>>> J. >>> >>> I have created some unit tests, hopefully it is enough to push with ? >> >> nope. Some moreover important changes needed. >> >> Especially ExecUtils.execAndLog have no reason to live. Please use processWrapper. It is designed >> for this and have logging correctly adapted. >> >> Also I'm against such a huge usage of ecxec. Java is not Python. >> >> Especiallythe touch and mkdir is nothing but pure laziness :) Please use java calls. > > Agreed > >> >> For jar -cf ... well.. Java have api to work with its own jars.. please follow this api. Do not >> fork processes if possible. But ..well. this api can be trap :) So choose wisely. >> >> I would recommend to do the refactoring of DummyJNLPFileWithJar into separate changset which you >> can proceed immediately, but I do not insists. > > I have spliced this and pushed. > >> >> In all cases, thanx for check and refactoring! It is deeply appreciated. >> >> J. > > See new version, I have removed all execs from both the new test, and JNLPClassLoaderTest. > > New changelog: > 2013-XX-XX Adam Domurad > > * netx/net/sourceforge/jnlp/util/StreamUtils.java > (copyStream): New, copies input stream to output stream > * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java: > New, tests lookup of native libraries from folders and jars. > * tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java: > New, contains utilities for testing open file descriptors, creating temporary > directories, and creating jars. > * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: > Replace jar creation methods with ones from FileTestUtils. > > Happy hacking, > -Adam > Still nits: + /* All the native library types we support, as well as one negative test */ + static final FileExtension[] extensionsToTest = { + fileExt(".foobar", false), /* Dummy non-native test extension */ + fileExt(".so", true), + fileExt(".dylib", true), + fileExt(".jnilib", true), + fileExt(".framework", true), + fileExt(".dll", true) + }; is also in deffined in + String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" }; please reuse Otherwise ok to go both patch and tests.. well thsi take time :) J. From bugzilla-daemon at icedtea.classpath.org Fri May 31 05:01:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 12:01:04 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #2 from thomas at m3y3r.de --- The problem is this method: "UrlUtils.normalizeUrl(URL)", called via this stacktrace: Thread [javaclient applet] (Suspended) owns: ReentrantLock (id=110) UrlUtils.normalizeUrl(URL, boolean) line: 106 UrlUtils.normalizeUrl(URL) line: 116 ResourceTracker.addResource(URL, Version, DownloadOptions, UpdatePolicy) line: 184 JNLPClassLoader.initializeResources() line: 640 JNLPClassLoader.(JNLPFile, UpdatePolicy, String) line: 249 JNLPClassLoader.createInstance(JNLPFile, UpdatePolicy, String) line: 382 JNLPClassLoader.getInstance(JNLPFile, UpdatePolicy, String) line: 444 JNLPClassLoader.getInstance(JNLPFile, UpdatePolicy) line: 420 Launcher.createApplet(JNLPFile, boolean, Container) line: 751 Launcher.getApplet(JNLPFile, boolean, Container) line: 713 Launcher$TgThread.run() line: 942 The URL: "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java+JICAComponents/JICA-sicaN.jar" get converted into "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java%20JICAComponents/JICA-sicaN.jar" which is, I think, not correct. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/48a28454/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 05:04:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 12:04:18 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #3 from thomas at m3y3r.de --- Or to state the JavaDoc of the URL class: "The URLEncoder and URLDecoder classes can also be used, but only for HTML form encoding, which is not the same as the encoding scheme defined in RFC2396." -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/568063ae/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 05:14:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 12:14:30 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #4 from thomas at m3y3r.de --- Yes, below changeset introduced this misassumption: # HG changeset patch # User Saad Mohammad # Date 1356036386 18000 # Node ID 95fc28e972adeed146a1b65f255669ad2e88f200 # Parent 2b2073cc9a19933e0b4aa17da17cf1748f3f1366 PR909: URL is invalid after normalization Before that change the ResourceTracker.normalizeChunk() looks more like RFC 2396. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/df2c15ad/attachment.html From ptisnovs at icedtea.classpath.org Fri May 31 05:20:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 31 May 2013 12:20:42 +0000 Subject: /hg/gfx-test: Five new tests added into ClippingCircleByEllipseS... Message-ID: changeset c43d115f3780 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=c43d115f3780 author: Pavel Tisnovsky date: Fri May 31 14:24:09 2013 +0200 Five new tests added into ClippingCircleByEllipseShape. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java | 95 ++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diffs (117 lines): diff -r 03f7433af553 -r c43d115f3780 ChangeLog --- a/ChangeLog Thu May 30 10:07:45 2013 +0200 +++ b/ChangeLog Fri May 31 14:24:09 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-31 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: + Five new tests added into ClippingCircleByEllipseShape. + 2013-05-30 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: diff -r 03f7433af553 -r c43d115f3780 src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Thu May 30 10:07:45 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Fri May 31 14:24:09 2013 +0200 @@ -432,6 +432,101 @@ /** * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with black color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlack000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% + // transparency + drawCircleClippedByRectangleAlphaPaintBlack(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with black color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlack025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% + // transparency + drawCircleClippedByRectangleAlphaPaintBlack(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with black color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlack050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% + // transparency + drawCircleClippedByRectangleAlphaPaintBlack(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with black color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlack075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% + // transparency + drawCircleClippedByRectangleAlphaPaintBlack(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with black color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlack100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% + // transparency + drawCircleClippedByRectangleAlphaPaintBlack(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is * rendered using alpha paint with red color at 0% transparency. * * @param image From ptisnovs at icedtea.classpath.org Fri May 31 05:23:30 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 31 May 2013 12:23:30 +0000 Subject: /hg/rhino-tests: Fixed minor issues in the test suite InvocableC... Message-ID: changeset 89917103dafe in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=89917103dafe author: Pavel Tisnovsky date: Fri May 31 14:26:53 2013 +0200 Fixed minor issues in the test suite InvocableClassTest. diffstat: ChangeLog | 5 ++++ src/org/RhinoTests/InvocableClassTest.java | 36 ++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 70224e9b40f2 -r 89917103dafe ChangeLog --- a/ChangeLog Thu May 30 10:17:57 2013 +0200 +++ b/ChangeLog Fri May 31 14:26:53 2013 +0200 @@ -1,3 +1,8 @@ +2013-05-31 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Fixed minor issues in the test suite InvocableClassTest. + 2013-05-30 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r 70224e9b40f2 -r 89917103dafe src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Thu May 30 10:17:57 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Fri May 31 14:26:53 2013 +0200 @@ -823,6 +823,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.invocableClass.getAnnotations(); // and transform the array into a list of annotation names @@ -830,7 +833,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -849,6 +865,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.invocableClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -856,7 +875,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From bugzilla-daemon at icedtea.classpath.org Fri May 31 05:23:38 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 12:23:38 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #5 from thomas at m3y3r.de --- Created attachment 878 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=878&action=edit Proposed fix for invalid URL encoding -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/13a653ee/attachment.html From thomas at m3y3r.de Fri May 31 05:32:22 2013 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 31 May 2013 14:32:22 +0200 Subject: [icedtea-web] PluginAppletViewer.java:1625 - Can "cl" be null? Message-ID: <1370003542.17521.6.camel@localhost.localdomain> Hi, two questions/remarks: 1.) while debugging bug 1465 I hit a constellation where "cl" was null? Is this something that could happen in reality or did I fumble to much with the debugger? --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jul 09 16:22:05 2012 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 31 12:49:17 2013 +0200 @@ -1625,9 +1625,10 @@ appletShutdown(p); appletPanels.removeElement(p); - + // Mark classloader unusable - ((JNLPClassLoader) cl).decrementLoaderUseCount(); + if(cl != null) + ((JNLPClassLoader) cl).decrementLoaderUseCount(); try { SwingUtilities.invokeAndWait(new Runnable() { 2.) While debugging bug 1465 I hit a funny constellation where the underlying "juniper SSL connection" timed out and so in net.sourceforge.jnlp.cache.ResourceTracker.downloadResource(Resource) I did just receive an HTML file with the message, that my current session timed out. This HTML file was written to the cache directory, as "JICA-foo.jar". Is the missing check for "Content-Type" in this method intentional? From andrew at icedtea.classpath.org Fri May 31 07:05:49 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 31 May 2013 14:05:49 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset a371c1860804 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a371c1860804 author: Pavel Tisnovsky date: Mon May 20 13:25:41 2013 +0200 Fixed wrong JTreg test name in @run annotation. changeset 632c42c569f8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=632c42c569f8 author: Andrew John Hughes date: Mon May 27 11:00:32 2013 +0100 PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional 2013-05-15 Andrew John Hughes PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional * INSTALL: Document --disable-bootstrap-tools. * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException if any of the constructors are missing. (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, no-sun-classes, bootstrap-tools and xbootclasspath patches from icedtea.patch. Make the latter two conditional. * NEWS: Updated. * acinclude.m4: (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools to decide whether to use the boot javac/javah or the one built as part of langtools. Defaults to on. (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java can be passed -Xbootclasspath/p to prepend a path to the bootclasspath or not. * configure.ac: Invoke the new macros and test for the java.sql.SQLException constructors. * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath and -Xbootclasspath/a by prepending, setting or appending its value to the bootclasspath option used to ecj, respectively. * patches/ecj/bootstrap-tools.patch: Split from icedtea.patch. Uses the bootstrap javac and javah rather than the langtools one for CORBA and JDK. * patches/ecj/corba-dependencies.patch: Include the langtools source directory on the sourcepath. * patches/ecj/fphexconstants.patch: Split replacements of floating point hex constants out from icedtea.patch. * patches/ecj/icedtea.patch: Remove split-out segements. Drop addition of ICEDTEA_RT in BuildToolJar.gmk and common/Rules.gmk in JDK altogether, along with setting of bootclasspath in langtools. * patches/ecj/needs-6.patch: Add java.awt Makefile. * patches/ecj/no-sun-classes.patch: Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the bootclasspath in java.text, sun.text and sun.javazic Makefiles for VMs without internal Sun classes. * patches/ecj/xbootclasspath.patch: Replaces the use of -Xbootclasspath in java.text, sun.text and sun.javazic for those VMs that don't support it (gcj). changeset 776606a4878e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=776606a4878e author: Andrew John Hughes date: Mon May 27 12:48:12 2013 +0100 Merge changeset aa0c5db9e503 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aa0c5db9e503 author: Andrew John Hughes date: Fri May 31 15:05:33 2013 +0100 Sync with upstream. 2013-05-31 Andrew John Hughes * patches/copy_memory.patch, * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: Drop upstreamed patches. * Makefile.am: (DROP_PATCHES): Remove JAXP patch. (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. diffstat: ChangeLog | 143 + INSTALL | 13 +- Makefile.am | 83 +- NEWS | 1 + acinclude.m4 | 61 + configure.ac | 9 + javac.in | 24 +- patches/copy_memory.patch | 36 - patches/ecj/bootstrap-tools.patch | 87 + patches/ecj/corba-dependencies.patch | 14 +- patches/ecj/fphexconstants.patch | 60 + patches/ecj/icedtea.patch | 233 - patches/ecj/needs-6.patch | 12 + patches/ecj/no-sun-classes.patch | 35 + patches/ecj/override.patch | 51 + patches/ecj/xbootclasspath.patch | 45 + patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/jtreg-TextLayoutBoundsChecks.patch | 2 +- patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673.patch | 400 +- patches/security/20130416/8005432.patch | 48 +- 62 files changed, 811 insertions(+), 1069246 deletions(-) diffs (truncated from 1071369 to 500 lines): diff -r ce006f6558f1 -r aa0c5db9e503 ChangeLog --- a/ChangeLog Fri May 17 17:58:51 2013 +0200 +++ b/ChangeLog Fri May 31 15:05:33 2013 +0100 @@ -1,3 +1,79 @@ +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + +2013-05-15 Andrew John Hughes + + PR1458: Make use of bootstrap tools & -Xbootclasspath + patches optional + * INSTALL: Document --disable-bootstrap-tools. + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException + if any of the constructors are missing. + (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, + no-sun-classes, bootstrap-tools and xbootclasspath + patches from icedtea.patch. Make the latter two + conditional. + * NEWS: Updated. + * acinclude.m4: + (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools + to decide whether to use the boot javac/javah or the + one built as part of langtools. Defaults to on. + (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java + can be passed -Xbootclasspath/p to prepend a path + to the bootclasspath or not. + * configure.ac: Invoke the new macros and test + for the java.sql.SQLException constructors. + * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath + and -Xbootclasspath/a by prepending, setting or appending + its value to the bootclasspath option used to ecj, + respectively. + * patches/ecj/bootstrap-tools.patch: + Split from icedtea.patch. Uses the bootstrap + javac and javah rather than the langtools one for + CORBA and JDK. + * patches/ecj/corba-dependencies.patch: + Include the langtools source directory on the sourcepath. + * patches/ecj/fphexconstants.patch: + Split replacements of floating point hex constants out + from icedtea.patch. + * patches/ecj/icedtea.patch: + Remove split-out segements. Drop addition of ICEDTEA_RT + in BuildToolJar.gmk and common/Rules.gmk in JDK altogether, + along with setting of bootclasspath in langtools. + * patches/ecj/needs-6.patch: + Add java.awt Makefile. + * patches/ecj/no-sun-classes.patch: + Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the + bootclasspath in java.text, sun.text and sun.javazic + Makefiles for VMs without internal Sun classes. + * patches/ecj/xbootclasspath.patch: + Replaces the use of -Xbootclasspath in java.text, + sun.text and sun.javazic for those VMs that don't + support it (gcj). + +2013-05-20 Pavel Tisnovsky + + * patches/jtreg-TextLayoutBoundsChecks.patch: + Fixed wrong JTreg test name in @run annotation. + +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -15,6 +91,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -391,6 +473,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -992,6 +1130,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r ce006f6558f1 -r aa0c5db9e503 INSTALL --- a/INSTALL Fri May 17 17:58:51 2013 +0200 +++ b/INSTALL Fri May 31 15:05:33 2013 +0100 @@ -154,6 +154,7 @@ * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset. * --with-llvm-config: Specify the location of the llvm-config binary. +* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below. @@ -191,7 +192,7 @@ PulseAudio which can be enabled using --enable-pulse-java. The resulting provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider. -Xrender Support +XRender Support =============== IcedTea6 includes support for an Xrender-based rendering pipeline @@ -329,7 +330,7 @@ other than x86/x86_64/sparc). As 'hs23' is known not to work with Zero or Shark, 'original' is still the default for these builds. -Javascript Support +JavaScript Support ================== IcedTea6 adds Javascript support via the javax.script API by using @@ -348,6 +349,14 @@ avoids conflicts between the JDK's copy of Rhino and any used by other applications. +Bootstrap Tools +=============== + +For bootstrap builds, the option --disable-bootstrap-tools can be used +to make use of the javac and javah built as part of the langtools build, +rather than the bootstrap tools. The default setting of this option is +to use the bootstrap tools. + Building Additional Virtual Machines ==================================== diff -r ce006f6558f1 -r aa0c5db9e503 Makefile.am --- a/Makefile.am Fri May 17 17:58:51 2013 +0200 +++ b/Makefile.am Fri May 31 15:05:33 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -140,6 +140,27 @@ $(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java endif +#PR57420 - java.sql.SQLException +if LACKS_JAVA_SQL_EXCEPTION_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +else +if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/sql/SQLException.java +endif +endif +endif +endif + # Flags MEMORY_LIMIT = -J-Xmx1024m IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -257,48 +278,12 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ patches/openjdk/7036559-concurrenthashmap_improvements.patch \ patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ patches/security/20130416/6657673.patch \ patches/security/20130416/6657673-fixup.patch \ patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ @@ -337,7 +322,6 @@ if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ - patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch @@ -530,12 +514,7 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ - patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ - patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ patches/openjdk/7046929-fix_t6397104_test_failure.patch \ @@ -596,8 +575,6 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ - patches/hotspot/original/fix_get_stack_bounds_leak.patch \ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ @@ -678,7 +655,9 @@ patches/ecj/corba-dependencies.patch \ patches/ecj/jaxws-langtools-dependency.patch \ patches/ecj/jaxws-jdk-dependency.patch \ - patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch + patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch \ + patches/ecj/fphexconstants.patch \ + patches/ecj/no-sun-classes.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ @@ -692,6 +671,16 @@ endif endif +if !DISABLE_BOOTSTRAP_TOOLS +ICEDTEA_ECJ_PATCHES += \ + patches/ecj/bootstrap-tools.patch +endif + +if !VM_SUPPORTS_XBOOTCLASSPATH +ICEDTEA_ECJ_PATCHES += \ + patches/ecj/xbootclasspath.patch +endif + if !WITH_PAX ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif diff -r ce006f6558f1 -r aa0c5db9e503 NEWS --- a/NEWS Fri May 17 17:58:51 2013 +0200 +++ b/NEWS Fri May 31 15:05:33 2013 +0100 @@ -15,6 +15,7 @@ * New features - PR1317: Provide an option to build with a more up-to-date HotSpot + - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional * Backports - S8009641: OpenJDK 6 build broken via 8007675 fix - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build diff -r ce006f6558f1 -r aa0c5db9e503 acinclude.m4 --- a/acinclude.m4 Fri May 17 17:58:51 2013 +0200 +++ b/acinclude.m4 Fri May 31 15:05:33 2013 +0100 @@ -1933,6 +1933,67 @@ AC_PROVIDE([$0])dnl ]) +AC_DEFUN_ONCE([IT_USE_BOOTSTRAP_TOOLS], +[ + AC_MSG_CHECKING([whether to disable the use of bootstrap tools for bootstrapping]) + AC_ARG_ENABLE([bootstrap-tools], + [AS_HELP_STRING(--disable-bootstrap-tools, + disable the use of bootstrap tools for bootstrapping [[default=no]])], + [ + case "${enableval}" in + no) + disable_bootstrap_tools=yes + ;; + *) + disable_bootstrap_tools=no + ;; + esac + ], + [ + disable_bootstrap_tools=no; + ]) + AC_MSG_RESULT([$disable_bootstrap_tools]) + AM_CONDITIONAL([DISABLE_BOOTSTRAP_TOOLS], test x"${disable_bootstrap_tools}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_XBOOTCLASSPATH], +[ + AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) + AC_CACHE_CHECK([if the VM supports -Xbootclasspath], it_cv_xbootclasspath_works, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ + +public class Test +{ + public static void main(String[] args) + { + System.out.println("Hello World!"); + } +}] +EOF + mkdir build + if $JAVAC -d build -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -Xbootclasspath/p:build $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_xbootclasspath_works=yes; + else + it_cv_xbootclasspath_works=no; + fi + else + it_cv_xbootclasspath_works=no; + fi + rm -f $CLASS build/*.class + rmdir build + cd .. + rmdir tmp.$$ + ]) + AC_PROVIDE([$0])dnl + AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes") +]) + AC_DEFUN_ONCE([IT_WITH_PAX], [ AC_MSG_CHECKING([for pax utility to use]) diff -r ce006f6558f1 -r aa0c5db9e503 configure.ac --- a/configure.ac Fri May 17 17:58:51 2013 +0200 +++ b/configure.ac Fri May 31 15:05:33 2013 +0100 @@ -154,6 +154,12 @@ [new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList()).getParameters()] ) +dnl PR57420 - java.sql.SQLException +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()]) +IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()]) + # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) @@ -254,6 +260,9 @@ AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) +IT_USE_BOOTSTRAP_TOOLS +IT_CHECK_FOR_XBOOTCLASSPATH + IT_FIND_RHINO_JAR IT_WITH_OPENJDK_SRC_ZIP IT_WITH_HOTSPOT_SRC_ZIP diff -r ce006f6558f1 -r aa0c5db9e503 javac.in --- a/javac.in Fri May 17 17:58:51 2013 +0200 +++ b/javac.in Fri May 31 15:05:33 2013 +0100 @@ -7,7 +7,29 @@ my $JAVAC_WARNINGS="-nowarn"; my @bcoption; -push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' +my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV; +my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV; +my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV; +my $bcp = $bcoptionsp[0]; +my $bc = $bcoptions[0]; +my $bca = $bcoptionsa[0]; +my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'; +if ($bcp) +{ + $bcp =~ s/^[^:]*://; + $systembc = join ":", $bcp, $systembc; +} +if ($bc) +{ + $bc =~ s/^[^:]*://; + $systembc = $bc; +} +if ($bca) +{ + $bca =~ s/^[^:]*://; + $systembc = join ":", $systembc, $bca; From aazores at redhat.com Fri May 31 07:54:52 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 31 May 2013 10:54:52 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51A33BDC.4090002@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> Message-ID: <51A8B9BC.3040603@redhat.com> On 05/27/2013 06:56 AM, Jiri Vanek wrote: > On 05/24/2013 09:45 PM, Andrew Azores wrote: >> On 05/22/2013 10:22 AM, Jiri Vanek wrote: >>> On 05/22/2013 03:25 PM, Andrew Azores wrote: >>>> Removed applications.html and references to it in "jawas -about" >>>> >>>> Changelog: >>>> >>>> extra/net/sourceforge/javaws/about/Main.java: Removed applications tab >>>> extra/net/sourceforge/javaws/about/resources/applications.html: >>>> Removed unneeded file >>> >>> >>> Hi! To be honest - I'm for complete removal of this "about". Or at >>> least of much more havy >>> refactoring >>> >>> Also to be honest(2) this is so deeply needed that it deserves an >>> line in >>> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 table. >>> >>> It should work at least somehow in headless mode, and should be >>> generated from already existing >>> resources (eg authors, news...) >>> >>> So in short - get rid of "extras" jar (and it logic in makefile) and >>> write specialised about >>> dialogue inisde netx itself:) Feel free to be inspired by existing >>> one, but avoid duplicated >>> resources. >>> >>> if you want to bother with it (+1!) then please assign yourself on >>> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5, and >>> go on! >>> >>> >>> >>> Best regards from CZ! >>> J. >> >> Hi Jiri, >> >> I'll take a look into creating that dialogue, it should be a good >> opportunity for me to keep >> learning more about the code base before delving into more difficult >> tasks. >> > > here you are > http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 :)) > > Please try to move in as small steps as possible or split the patch to > as many logically-complete parts as possible, otherwise they will be > very difficult to review. > This change should be simple code, but there will be probably huger > amount of it. > You can start with moving the window into embedded one out of extreas. > Also it would be nice to have as much of it generated from NEWS, > AUTHORS, maybe Changelog, COPYING? Reuse the rest? > just nits... I do not wont to put boundaries to your imagination which > must be much more fresh then my is :) > > Best regards > J. > > > Changelog: Makefile.am: removed logic for extras.jar netx/net/sourceforge/jnlp/runtime/Boot.java: Added -headless -about mode netx/net/sourceforge/jnlp/resources/Messages.properties: Added messages used in -headless -about netx/net/sourceforge/jnlp/about/About.java: Changed name from Main, moved out of extras, added logic to generate content from AUTHORS, COPYING, NEWS, ChangeLog netx/net/sourceforge/jnlp/resources/about.jnlp: References changed About class netx/net/sourceforge/jnlp/about/Constants.java: String constants pulled out of About.java netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras.jar netx/net/sourceforge/jnlp/resources/about.html: Relocated netx/net/sourceforge/jnlp/resources/applications.html: Relocated netx/net/sourceforge/jnlp/resources/jamIcon.jpg: Relocated netx/net/sourceforge/jnlp/resources/notes.html: Relocated and commented out authors lines since there is a new Authors tab Lots of changed files but most of them have small changes made to them eg relocation, hopefully this is not too hard to review overall. I'm also not sure what else should be done for -about -headless, I'd definitely like some feedback on what else to put in there. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: about.html.patch Type: text/x-patch Size: 239 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/about.html.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: about.jnlp.patch Type: text/x-patch Size: 546 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/about.jnlp.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: About.java.patch Type: text/x-patch Size: 4696 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/About.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: applications.html.patch Type: text/x-patch Size: 267 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/applications.html.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Boot.java.patch Type: text/x-patch Size: 1288 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/Boot.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Constants.java.patch Type: text/x-patch Size: 1165 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/Constants.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: HTMLPanel.java.patch Type: text/x-patch Size: 579 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/HTMLPanel.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: jamIcon.jpg.patch Type: text/x-patch Size: 243 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/jamIcon.jpg.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Makefile.am.patch Type: text/x-patch Size: 6164 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/Makefile.am.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Messages.properties.patch Type: text/x-patch Size: 977 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/Messages.properties.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: notes.html.patch Type: text/x-patch Size: 639 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/b4147c34/notes.html.patch From jvanek at redhat.com Fri May 31 08:19:01 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 31 May 2013 17:19:01 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <1483145908.1896130.1370000674475.JavaMail.root@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <1483145908.1896130.1370000674475.JavaMail.root@redhat.com> Message-ID: <51A8BF65.8010705@redhat.com> On 05/31/2013 01:44 PM, Andrew Hughes wrote: > ----- Original Message ----- >> Hi Jiri, >> >> On 05/20/2013 03:11 PM, Jiri Vanek wrote: >>> This fix is migrating us to ~/.config/icedtea and ~/.cache/icedtea >>> instead of ~/.icedtea. >> >> We decided on the current paths (and files and formats) to stay as close >> to the proprietary JREs as possible. We have deviated from this in the >> past (the contents of the cache directory, for example), but it's either >> because of something not (yet) implemented in icedtea-web, or something >> the user should never have to care about (like cache directory layout). >> >> I am not sure if that decision was perfect, but if we are going to >> change this now, I would like us to weigh all the pros and cons. >> >> As far as the patch itself goes, two things jump out to me: >> >> 1. We need to stay backwards compatible, if possible. For things like >> configuration files, we should check the old locations too. For the >> persistence cache, not reading the old data is like throwing away user's >> data. >> > > This was the main point I was about to make. It seems to have already been > changed once; I have $HOME/.icedtea and $HOME/.icedteaplugin it seems. > First run should probably migrate the settings and offer to remove the old it is exctly what this patch do:) See http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-May/023362.html, omair missed it too:) (especially http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-May/023356.html line 220-290) > set. I seem to remember a bug from the previous change so don't create bugs > just for the sake of naming. > > I don't see what this has to do with the proprietary plugin; surely it doesn't > look for $HOME/.icedtea? If it's going to be changed, it should be > $HOME/.config/icedtea-web anyway, as that's the name of the product. This is great idea. i'm 100% for this > >> 2. The patch seems to be missing support for using the environment >> variables (such as $XDG_CONFIG_DIRS) to specify the locations of the >> directories. >> >> Thanks, >> Omair >> >> -- >> PGP Key: 66484681 (http://pgp.mit.edu/) >> Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 >> > From adomurad at redhat.com Fri May 31 12:16:26 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 31 May 2013 15:16:26 -0400 Subject: [rfc][icedtea-web] Make applet resize message handling asynchronous Message-ID: <51A8F70A.8050907@redhat.com> Hi, this is a defensive patch to remove deadlock possibility entirely from the applet resizing message. I think as much as it can be avoided, blocking operations should not occur on the worker threads. We never make more than 2 worker threads for normal messages, so they should spawn a thread for any task that will potentially take a substantial time. ChangeLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Handle resizing more robustly by not blocking worker thread I am also writing this little page: http://icedtea.classpath.org/wiki/Fixing_IcedTea-Web_Browser_Hanging Comments welcome. It is linked from the icedtea-web wiki page under 'Common problems'. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: async-resize.patch Type: text/x-patch Size: 4471 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/8dac0003/async-resize.patch From bugzilla-daemon at icedtea.classpath.org Fri May 31 14:31:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 21:31:21 +0000 Subject: [Bug 1409] IcedTea 2.3.9 fails to build Zero due to -Werror In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1409 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Version|unspecified |2.3.9 Resolution|--- |FIXED Target Milestone|2.3.9 |2.3.10 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/9b6b5ba3/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 15:02:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 22:02:05 +0000 Subject: [Bug 1435] OpenJDK 6/7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1274 Target Milestone|--- |2.4.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/4d114304/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 15:02:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 22:02:05 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1435 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/4abe16cd/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 15:05:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 22:05:21 +0000 Subject: [Bug 1466] New: [IcedTea6] OpenJDK 6 returns incorrect TrueType font metrics Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1466 Bug ID: 1466 Summary: [IcedTea6] OpenJDK 6 returns incorrect TrueType font metrics Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 for IcedTea 1.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/8a4735de/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 31 15:05:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 31 May 2013 22:05:48 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|OpenJDK 6/7 returns |[IcedTea7] OpenJDK 7 |incorrect TrueType font |returns incorrect TrueType |metrics |font metrics --- Comment #2 from Andrew John Hughes --- Version created for 6: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1466 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130531/83b835e1/attachment.html From metherid at gmail.com Tue May 21 10:24:05 2013 From: metherid at gmail.com (Rahul Sundaram) Date: Tue, 21 May 2013 13:24:05 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <519B5241.7010407@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <519B5241.7010407@redhat.com> Message-ID: Hi On Tue, May 21, 2013 at 6:53 AM, Jiri Vanek wrote: > > Some more thoughts about this: > - eg I have non XDG variable set, but many applications have already > started to use theirs default values. > I am not sure what you mean by this but distributions aren't supposed to set any of XDG environment variables by default. It is solely a deployment customization for the odd cases out there. Running cache in tmpfs or config from nfs or whatever > - If we decide to move to ./config and ./cache: > if used XDG* variables are set, then use them. otherwise use ./config > and ./cache > if they change, user is on his own? > Yes. If users customize it, they will have to deal with the fallout. > - how about xdg not following systems (windows) ? Keep .icedtea or move to > ./config and ./cache ? > Hidden directories is not how Windows programs stores its profiles. You might consider following what glib helper functions do Refer to https://developer.gnome.org/glib/2.34/glib-Miscellaneous-Utility-Functions.html g_get_user_cache_dir() and so on Rahul -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130521/77b76151/attachment.html