From bugzilla-daemon at icedtea.classpath.org Sat Aug 1 18:39:46 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 01 Aug 2015 18:39:46 +0000 Subject: [Bug 2569] [IcedTea7] Add support for the 'trees' extension to the IcedTea forest In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2569 Mark Wielaard changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mark at klomp.org --- Comment #2 from Mark Wielaard --- (In reply to Andrew John Hughes from comment #1) > No need for this after all; the .hg/trees file is non-versioned and users > can use tclone with the repo without any server-side support true, but that is somewhat inconvenient. I did install the trees extension on the server and created all needed .hg/trees files for the forests. This should make it possible to just hg tclone any forest on icedtea.classpath.org -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Mon Aug 3 09:35:55 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 03 Aug 2015 09:35:55 +0000 Subject: /hg/gfx-test: Updated several tests. Message-ID: changeset 7181f90a163b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=7181f90a163b author: Pavel Tisnovsky date: Mon Aug 03 11:38:35 2015 +0200 Updated several tests. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 252 ++++++++++---------- 2 files changed, 131 insertions(+), 126 deletions(-) diffs (295 lines): diff -r 1e053216bad2 -r 7181f90a163b ChangeLog --- a/ChangeLog Thu Jul 16 11:02:42 2015 +0200 +++ b/ChangeLog Mon Aug 03 11:38:35 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated several tests. + 2015-07-16 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 1e053216bad2 -r 7181f90a163b src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jul 16 11:02:42 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Aug 03 11:38:35 2015 +0200 @@ -10921,126 +10921,6 @@ } /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. - * Background color is set to Color.magenta. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. - * Background color is set to Color.yellow. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. - * Background color is set to Color.white. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. - * Background color is set to Color.black. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. - * Background color is set to Color.blue. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. - * Background color is set to Color.green. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. - * Background color is set to Color.cyan. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. - * Background color is set to Color.red. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.red); - } - - /** * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.magenta. * @@ -11050,9 +10930,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.magenta); } /** @@ -11065,9 +10945,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.yellow); } /** @@ -11080,6 +10960,126 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) { return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.white); From stefan at complang.tuwien.ac.at Mon Aug 3 19:52:13 2015 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Mon, 3 Aug 2015 21:52:13 +0200 Subject: [rfc][icedtea-web] Update de localized messages to 1.6 In-Reply-To: References: <55AFCAD1.1030609@gmx.de> <55B0A150.5010102@redhat.com> <55B0D9F6.3090508@gmx.de> <55B0E667.40900@redhat.com> <55B0EF56.4080900@redhat.com> <55B11842.3000605@gmx.de> Message-ID: 2015-07-31 18:40 GMT+02:00 Stefan Ring : > On top of your patch (both as attachment and inline, so I can quote > myself later): > > diff --git a/netx/net/sourceforge/jnlp/resources/Messages_de.properties > b/netx/net/sourceforge/jnlp/resources/Messages_de.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties > +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties > @@ -69,7 +69,7 @@ > > # version check minidialogue > #JREversionDontMatch=Warning - your JRE - {0} - does not match > requested JRE - {1} > -JREversionDontMatch=Warnung: Die angeforderte JRE \u201e{1}\u201c > stimmt nicht mit der JRE \u201e{1}\u201c \u00fcberein > +JREversionDontMatch=Warnung: Die angeforderte JRE \u201e{1}\u201c > stimmt nicht mit der vorhandenen JRE \u201e{0}\u201c \u00fcberein > #JREContinueDialogSentence2=Do you wont to continue in running? > JREContinueDialogSentence2=Soll Ausf\u00fchrung fortgesetzt werden? > #JREContinueDialogSentenceTitle=Incompatible JRE > @@ -158,7 +158,7 @@ > LNotLaunchableInfo=Datei muss ein JNLP Anwendungs-, Applet- oder > Installertyp sein. > LCantDetermineMainClass=Unbekannte Hauptklasse. > LCantDetermineMainClassInfo=Konnte die Hauptklasse f\u00fcr diese > Anwendung nicht bestimmen. > -LUnsignedJarWithSecurity=Kann keine Berechtigungen nicht signierten > JARs gew\u00e4hren. > +LUnsignedJarWithSecurity=Kann nicht signierten JARs keine > Berechtigungen gew\u00e4hren. > 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. > @@ -168,7 +168,7 @@ > LPartiallySignedApplet=Das Applet wurde teilweise signiert. > LPartiallySignedAppletUserDenied=Das Applet wurde teilweise signiert > und ihm wurde nicht vertraut. > LSignedAppJarUsingUnsignedJar=Signierte Anwendung nutzt nicht signierte JARs. > -LSignedAppJarUsingUnsignedJarInfo=Das Haupt-JAR der Anwendung ist > signiert, aber manche JARs, die sie nutzt sind nicht. > +LSignedAppJarUsingUnsignedJarInfo=Das Haupt-JAR der Anwendung ist > signiert, aber manche JARs, die sie nutzt, nicht. > LRunInSandboxError=Ausf\u00fchren im Sandkasten-Aufruf wurde zu > sp\u00e4t ausgef\u00fchrt. > LRunInSandboxErrorInfo=Der Klassenlader wurde benachrichtigt das > Applet im Sandkasten auszuf\u00fchren, aber die > Sicherheitseinstellungen waren bereits initialisiert. > LSignedJNLPFileDidNotMatch=Die signierte JNLP-Datei stimmt nicht mit > der startenden JNLP-Datei \u00fcberein. > @@ -184,7 +184,7 @@ > > LNotVerified=JARs nicht verifiziert. > LCancelOnUserRequest=Abgebrochen auf Anfrage des Benutzers. > -LFatalVerification=W\u00e4hrend des Versuchs JARs zu verifizieren, > ist ein fataler Fehler aufgetreten. > +LFatalVerification=W\u00e4hrend des Versuchs, JARs zu verifizieren, > ist ein fataler Fehler aufgetreten. > LFatalVerificationInfo=Eine Ausnahme in der Klasse JarCertVerifier > wurde abgefangen. Die Unlesbarkeit der Dateien cacerts oder > trusted.certs k\u00f6nnte eine Ursache dieser Ausnahmen sein. > > > @@ -272,9 +272,9 @@ > > # icedtea-web man (note, spaces are important due to man pages markup > #ITWintroL1={0} provides a free software web browser plugin running > applets written in the Java programming language and an implementation > of Java Web Start, originally based on the NetX project. > -ITWintroL1=Mit {0} wird ein Browser Plug-in als freie Software > angeboten, mit dem in Java geschriebene Applets ausgef\u00fchrt werden > k\u00f6nnen sowie eine Implementierung von \u201eJava Web Start\u201c, > urspr\u00fcnglich basiert auf dem NetX Projekt. > +ITWintroL1=Mit {0} wird ein Browser Plug-in als freie Software > angeboten, mit dem in Java geschriebene Applets ausgef\u00fchrt werden > k\u00f6nnen, sowie eine Implementierung von \u201eJava Web > Start\u201c, urspr\u00fcnglich auf dem NetX-Projekt basierend. > #ITWintroL2=NetX enables Java applets and applications to be > downloaded over the network, cached, and (by default) run in a secure > sandbox environment. Subsequent executions of the applet download the > latest version automatically. Update and security settings, among > others, can be set using the itw-settings command. > -ITWintroL2=NetX erm\u00f6glicht das Herunterladen, die > Zwischenspeicherung und die Ausf\u00fchrung von Java-Applets und > Anwendungen in einer sicheren Sandkastenumgebung > (Standardeinstellung). Bei nachfolgenden Starts eines Applets werden > immer die neuesten Versionen automatisch heruntergeladen. Mit dem > Befehl \u201eitw-settings\u201c k\u00f6nnen unter anderem > Aktualisierungs- sowie Sicherheitseinstellungen gesetzt werden. > +ITWintroL2=NetX erm\u00f6glicht das Herunterladen, die > Zwischenspeicherung und die Ausf\u00fchrung von Java-Applets und > Anwendungen in einer sicheren Sandkastenumgebung > (Standardeinstellung). Bei nachfolgenden Starts eines Applets wird die > jeweils neueste Version automatisch heruntergeladen. Mit dem Befehl > \u201eitw-settings\u201c k\u00f6nnen unter anderem Aktualisierungs- > sowie Sicherheitseinstellungen gesetzt werden. > #ITWintroL3={0} also includes a plugin to {1} within web browsers. > ITWintroL3=\u201e{0}\u201c enth\u00e4lt ebenfalls ein Plug-in > f\u00fcr \u201e{1}\u201c in Webbrowsern. > #ITWintroUrlCaption = enable Java applets > @@ -341,7 +341,7 @@ > > # policyeditor man (note, spaces (especially the one around markup) > are important due to man pages markup). Only bold tag is now > recognized by ReplacingTextFormatter. > #PEintro=\ - view and edit security policy settings for javaws > and the browser plugin > -PEintro=\ \u2014 die Einstellungen der Sicherheitsrichtlinie > f\u00fcr javaws und das Browser Plug-in anzeigen und > bearbeiten > +PEintro=\ \u2014 Einstellungen der Sicherheitsrichtlinie f\u00fcr > javaws und das Browser Plug-in anzeigen und bearbeiten > #PEsynopseP1=policy_file > PEsynopseP1=Richtliniendatei > #PEsynopseP2=url > @@ -350,10 +350,10 @@ > #of javaws and the browser plugin. It is intended as a > simpler, easier to use, and more accessible alternative \ > #to the standard JDK Policy Tool. Administrators and power > users who need fine grained control over policy files should probably > use \ > #Policy Tool instead of PolicyEditor. > -PEdescL1=ist eine Anwendung mit grafischer Benutzeroberfl\u00e4che > sowie ein wenig Befehlszeilenunterst\u00fctzung. Die Anwendung > erm\u00f6glicht die Anzeige und Bearbeitung von > Sicherheitsrichtlinieneinstellungen f\u00fcr Applets, die durch die > Implementierungen von javaws und des Browser Plug-ins > in IcedTea-Web verwendet werden. Sie ist als eine vereinfachte und > leichter zu nutzende Alternative zum JDK Policy Tool gedacht. > Administratoren und fortgeschrittene Benutzer, die eine fein granulare > Kontrolle \u00fcber Richtliniendateien brauchen, sollten das > policytool statt des PolicyEditor verwenden. > +PEdescL1=ist eine Anwendung mit grafischer Benutzeroberfl\u00e4che > sowie ein wenig Kommandozeilenunterst\u00fctzung. Die Anwendung > erm\u00f6glicht die Anzeige und Bearbeitung von > Sicherheitsrichtlinieneinstellungen f\u00fcr Applets, die durch die > Implementierungen von javaws und des Browser Plug-ins > in IcedTea-Web verwendet werden. Sie ist als eine vereinfachte und > leichter zu nutzende Alternative zum JDK Policy Tool gedacht. > Administratoren und fortgeschrittene Benutzer, die eine fein granulare > Kontrolle \u00fcber Richtliniendateien brauchen, sollten das > policytool statt des PolicyEditor verwenden. > #PEdescL2=If executed without any arguments, no file is opened, and > saving the file will result in a prompt on where to save it. > Otherwise, if a file path is given as \ > #a command line argument, then that file path will be opened and > parsed as policy file. > -PEdescL2=Werden keine Parameter bei der Ausf\u00fchrung angegeben, so > wird keine Datei ge\u00f6ffnet und eine Aufforderung zur Angabe des > Speicherortes erscheint. Wird ansonsten ein Dateipfad als Parameter an > der Kommandozeile angegeben, so wird der Dateipfand ge\u00f6ffnet und > als eine Richtliniendatei verarbeitet. > +PEdescL2=Werden keine Parameter bei der Ausf\u00fchrung angegeben, so > wird keine Datei ge\u00f6ffnet, und eine Aufforderung zur Angabe des > Speicherortes erscheint. Wird ansonsten ein Dateipfad als Parameter an > der Kommandozeile angegeben, so wird der Dateipfand ge\u00f6ffnet und > als eine Richtliniendatei verarbeitet. > #PEexampleL1=Show GUI and opens the default policy file. > PEexampleL1=Zeigt den GUI-Editor mit der ge\u00f6ffneten > Standardrichtliniendatei an. > #PEexampleL2=Show the GUI editor with no file opened. > @@ -367,8 +367,8 @@ > JWSdescL1=ist eine Implementierung eines JNLP-Klients. Sie verwendet > eine JNLP-Datei (Java Network Launch Protocol) um eine Java-Anwendung > oder ein Applet sicher auszuf\u00fchren. \ > Diese Implementierung von {0} basiert auf dem NetX Projekt und wird > durch das IcedTea Projekt vertrieben. > #JWSdescL2=A JNLP file is an xml file that describes how to securely > run a remote Java application or a Java applet. > -JWSdescL2=Eine JNLP-Datei ist eine XML-Datei in der beschrieben ist, > wie eine Java-Anwendung oder ein Applet sicher auszuf\u00fchren ist. > -#JWSoptionsL1=When specifying options, the name of the jnlp file must > be the last argument to javaws - all the options must preceede it. > +JWSdescL2=Eine JNLP-Datei ist eine XML-Datei mit einer Beschreibung > zur sicheren Ausf\u00fchrung einer Java-Anwendung oder eines Applets. > +#JWSoptionsL1=When specifying options, the name of the jnlp file must > be the last argument to javaws - all the options must precede it. > JWSoptionsL1=Bei der Angabe von Optionen muss der Name der JNLP-Datei > als letzter Parameter an javaws \u00fcbergeben werden. Alle Optionen > m\u00fcssen ihm vorausgehen. > #JWSoptionsL2=The jnlp-file can either be a url or a local path. > JWSoptionsL2=Die JNLP-Datei kann entweder eine URL oder ein lokaler Pfad sein. > @@ -413,7 +413,7 @@ > BXoffline=Deaktiviert den Netzwerkzugriff von IcedTea-Web. > Ausschlie\u00dflich der Zwischenspeicher wird verwendet. Anwendungen > k\u00f6nnen weiterhin auf das Netzwerk zugreifen. > #BOHelp1=Prints out information about supported command and basic usage. > BOHelp1=Gibt Informationen \u00fcber unterst\u00fctzte Befehle und > grundlegende Verwendung aus. > -#BOHelp2=Prints out information about supported command and basic > usage. Can also take an parameter, and then it prints detailed help > for this command. > +#BOHelp2=Prints out information about supported command and basic > usage. Can also take a parameter, and then it prints detailed help for > this command. > BOHelp2=Gibt Informationen \u00fcber unterst\u00fctzte Befehle und > grundlegende Verwendung aus. Wird ein Befehl als Parameter angegeben, > dann wird eine detaillierte Beschreibung des Befehls ausgegeben. > #BOTrustnone=Instead of asking user, will foretold all answers as no. > BOTrustnone=Alle Benutzeraufforderungen werden mit \u201eNein\u201c > beantwortet. > @@ -424,7 +424,7 @@ > #IBOGet=Shows the value of the specified settings. > IBOGet=Zeigt den Wert der angegebenen Einstellungen an. > #IBOInfo=Shows additional information about the named settings. > Includes a description, the current value, the possible values, and > the source of the setting. > -IBOInfo=Zeigt zus\u00e4tzliche Informationen \u00fcber die > angegebenen Einstellungen an, inklusive einer Beschreibung, des > aktuellen Werts, der zul\u00e4ssige Werte sowie des Ursprungs der > Einstellung. > +IBOInfo=Zeigt zus\u00e4tzliche Informationen \u00fcber die > angegebenen Einstellungen an, inklusive einer Beschreibung des > aktuellen Werts, der zul\u00e4ssigen Werte sowie des Ursprungs der > Einstellung. > #IBOSet=Sets the settings to the new value specified, if it is an > appropriate value. > IBOSet=Setzt die Einstellungen auf den neuen angegebenen Wert, > vorausgesetzt der Wert ist zul\u00e4ssig. > #IBOResetAll=Resets all settings to their original values. > @@ -507,13 +507,13 @@ > #EXAWdesktopWants=Desktop icon shortcut (applications want to). > EXAWdesktopWants=Symbolverkn\u00fcpfung auf dem Desktop (durch die > Anwendung vorgesehen). > #EXAWdesktopDontWants=Desktop icon shortcut (applications don''t > wants to, but you still can). > -EXAWdesktopDontWants=Symbolverkn\u00fcpfung auf dem Desktop (durch > die Anwendung nicht vorgesehen, aber auf Benutzeranforderung). > +EXAWdesktopDontWants=Symbolverkn\u00fcpfung auf dem Desktop (durch > die Anwendung nicht vorgesehen, aber auf Benutzeranforderung > m\u00f6glich). > #EXAWsubmenu=Menu icon shortcut (applications will try to include to > submenu - {0}). > EXAWsubmenu=Symbolverkn\u00fcpfung im Men\u00fc (Anwendung wird > versuchen im Untermen\u00fc \u201e{0}\u201c anzulegen). > -#EXAWmenuWants=Menu icon shortcut (applications wont to). > +#EXAWmenuWants=Menu icon shortcut (applications want to). > EXAWmenuWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die > Anwendung vorgesehen). > -#EXAWmenuDontWants=Menu icon shortcut (applications don''t wants to, > but you still can). > -EXAWmenuDontWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die > Anwendung nicht vorgesehen, aber auf Benutzeranforderung). > +#EXAWmenuDontWants=Menu icon shortcut (applications don''t want to, > but you still can). > +EXAWmenuDontWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die > Anwendung nicht vorgesehen, aber auf Benutzeranforderung > m\u00f6glich). > #EXAWsettingsInfo=Your curernt setting is: {0}. You can change it in > itweb-settings in {1} panel. > EXAWsettingsInfo=\u201e{0}\u201c ist eingestellt. Es kann \u00fcber > das Panel \u201e{1}\u201c in itweb-settings ge\u00e4ndert werden. > #EXAWsettingsManage=You can manage existing menu entries in > itweb-settings in {0} panel. > @@ -527,7 +527,7 @@ > #EXAWrememberByAppTooltip=This application will never ask for > more permissions questions > EXAWrememberByAppTooltip=Diese Anwendung wird nie nach weiteren > Berechtigungen fragen > #EXAWrememberByPageTooltip=All applications from this domain > will stop asking, and will follow your current decision on all > permissions > -EXAWrememberByPageTooltip=Alle Anwendungen in dieser > Dom\u00e4ne werden nicht nach Berechtigungen fragen und alle > Entscheidungen \u00fcber Berechtigungen werden angewendet > +EXAWrememberByPageTooltip=Alle Anwendungen in dieser > Dom\u00e4ne werden nicht mehr nach Berechtigungen fragen, sondern die > bestehenden Berechtigungen verwenden > #EXAWdontRememberTooltip=Your decision will be used only for > this single permission for this single run > EXAWdontRememberTooltip=Die Entscheidung wird > ausschlie\u00dflich f\u00fcr diese Berechtigung und die Dauer dieser > Ausf\u00fchrung verwendet > #EXAWbrowser=browser desktop item > @@ -544,31 +544,31 @@ > #
  • This option will create shortcut to open your browser with > current page loaded
  • \ > #
  • If your browser support offline run, this is the safest option
  • > EXAWbrowserToolTip=Browser-Verkn\u00fcpfung
    \ > -
    • Diese Option erstellt eine Verkn\u00fcpfung, die den Browser > mit der aktuell geladenen Seite \u00f6ffnet
    • \ > -
    • Falls der Browser den Offlinebetrieb unterst\u00fctzt, ist dies > die sicherste Option
    > -#EXAWbrowsersToolTip=browser used for lunching this applet > (will lunch icedtea-web later)
    \ > +
  • Diese Option erstellt eine Verkn\u00fcpfung, die den Browser mit > der aktuell geladenen Seite \u00f6ffnet
  • \ > +
  • Falls der Browser den Offlinebetrieb unterst\u00fctzt, ist dies > die sicherste Option
  • > +#EXAWbrowsersToolTip=browser used for launching this applet > (will launch icedtea-web later)
    \ I've removed several
      /
    here that are not part of the original string. > #
  • The default browser was preset
  • \ > #
  • Feel free to include browser of your choice
  • > EXAWbrowsersToolTip=Ein Browser, der zum Start dieses Applets > (im IcedTea-Web Plug-in ausgef\u00fchrt) verwendet wird
    \ > -
    • Der Standardbrowser war voreingestellt
    • \ > -
    • Das Einf\u00fcgen eines beliebigen bevorzugten Browsers steht > frei
    > +
  • Der Standardbrowser war voreingestellt
  • \ > +
  • Das Einf\u00fcgen eines beliebigen bevorzugten Browsers steht > frei
  • > #EXAWgeneratedToolTip=
  • The jnlp file will be generated from > your current html page
  • \ > -#
  • Once you lunch jor shortcut, javaws will lunch this jnlp file
  • \ > +#
  • Once you launch jor shortcut, javaws will launch this jnlp file
  • \ "lunch" -> "launch" several times > #
  • This applet will then run without the browser
  • \ > #
  • However experimental, this is working surprisingly well.
  • > -EXAWgeneratedToolTip=
    • Eine JNLP-Datei wird aus der > aktuellen HTML-Seite erzeugt
    • \ > +EXAWgeneratedToolTip=
    • Eine JNLP-Datei wird aus der aktuellen > HTML-Seite erzeugt
    • \ >
    • Die Symbolverkn\u00fcpfung startet javaws mit dieser > JNLP-Datei
    • \ > -
    • Das Applet wird au\u00dferhalb des Browsers > ausgef\u00fchrt

    \ > -Diese Funktion ist in der Erprobung. > +
  • Das Applet wird au\u00dferhalb des Browsers > ausgef\u00fchrt

  • \ > +Diese Funktion ist in der Erprobung, funktioniert aber erstaunlich > gut. > #EXAWhrefToolTip=Some applets are just pointing to jnlp file, > which is containing actual informations about the resources of this > app.
    \ > -#
  • By selecting this option, this jnlp file will be saved and used > for later lunches.
  • \ > -#
  • Javaws will be the luncher, and this applet will run out > of browser
  • \ > -#
  • However good htis sounds, this si surprisingly not working
  • > +#
  • By selecting this option, this jnlp file will be saved and used > for later launches.
  • \ > +#
  • Javaws will be the launcher, and this applet will run out > of browser
  • \ > +#
  • However good this sounds, this is surprisingly not working
  • > EXAWhrefToolTip=Manche Applets verweisen lediglich auf eine > JNLP-Datei, welche die eigentlichen Informationen \u00fcber die > Ressourcen dieser Anwendung enth\u00e4lt.
    \ > -
    • Diese Option speichert diese JNLP-Datei f\u00fcr sp\u00e4tere > Starts
    • \ > -
    • Die JNLP-Datei wird mit javaws gestartet und das > Applet au\u00dferhalb des Browsers > ausgef\u00fchrt

    \ > -Diese Funktion ist in der Erprobung. > -#EXAWhtmlToolTip=BY using -html switch, javaws can try to parse > html and try to extract applet, and to lunch it out of browser
    \ > +
  • Diese Option speichert diese JNLP-Datei f\u00fcr sp\u00e4tere Starts
  • \ > +
  • Die JNLP-Datei wird mit javaws gestartet und das > Applet au\u00dferhalb des Browsers ausgef\u00fchrt

  • \ > +Diese Funktion ist in der Erprobung und funktioniert nicht > richtig. > +#EXAWhtmlToolTip=BY using -html switch, javaws can try to parse > html and try to extract applet, and to launch it out of browser
    \ > #
  • highly experimental
  • \ > #
  • really cool
  • > EXAWhtmlToolTip=Unter Verwendung des Schalters > \u201e-html\u201c kann versucht werden die HTML-Seite zu > analysieren, das Applet zu extrahieren und es au\u00dferhalb des > Browsers zu starten.
    \ > @@ -576,7 +576,7 @@ > #EXAWfixToolTip=Some jnlp files pointed from applet are not > designed to be used as jnlp apps
    \ > #
  • This will add the known often missing elements to this file (if > missing)
  • > EXAWfixToolTip=Manche von einem Applet verwiesene JNLP-Dateien > wurden nicht als JNLP-Anwendungen erstellt oder vorgesehen
    \ > -
    • Dies f\u00fcgt allgemein bekannt, oft fehlende Elemente > dieser JNLP-Datei hinzu
    > +
  • Dies f\u00fcgt dieser JNLP-Datei bekannte, oft fehlende Elemente > hinzu (wenn sie fehlen)
  • > > # Security > SFileReadAccess=Die Anwendung hat Lesezugriff auf {0} angefordert. > Soll diese Aktion zugelassen werden? > @@ -601,7 +601,7 @@ > SRememberCodebase=F\u00fcr Website {0} > SUnsignedSummary=Eine nicht signierte Java Anwendung m\u00f6chte zur > Ausf\u00fchrung gebracht werden. > #SUnsignedDetail=An unsigned application from the following location > wants to run:
      {0}
    The > page which made the request was:
      >{1}

    It is recommended you only run applications > from sites you trust. > -SUnsignedDetail=Eine nicht signierte Anwendung am folgenden Ort > m\u00f6chte zur Ausf\u00fchrung gebracht werden:
       href="{0}">{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. > +SUnsignedDetail=Eine nicht signierte Anwendung am folgenden Ort > m\u00f6chte zur Ausf\u00fchrung gebracht werden:
       href="{0}">{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=You have accepted this > applet previously - ({0}). > SUnsignedAllowedBefore=Dieses Applet wurde > bereits akzeptiert ({0}). > #SUnsignedRejectedBefore=You have rejected this > applet previously - ({0}). > @@ -921,9 +921,9 @@ > #PEClipboardError=Clipboard does not appear to contain properly > formatted policy entries > PEClipboardError=Die Zwischenablage scheint keine g\u00fcltig > formatierten Richtlinieneintr\u00e4ge zu enthalten > #PEInvalidPolicy=Paste Failed: Could not read policy entry for > codebase {0} from system clipboard > -PEInvalidPolicy=Einf\u00fcgen gescheitert: Ein Richtlinieneintrag > f\u00fcr die Codebasis \u201e{0}\u201c konnte aus der Zwischenablage > nicht gelesen werden. > +PEInvalidPolicy=Einf\u00fcgen gescheitert: Ein Richtlinieneintrag > f\u00fcr die Codebasis \u201e{0}\u201c konnte nicht aus der > Zwischenablage gelesen werden. > #PEClipboardAccessError=Could not read from clipboard > -PEClipboardAccessError=Konnte aus der Zwischenablage nicht lesen > +PEClipboardAccessError=Konnte nicht aus der Zwischenablage lesen > > #PEHelpMenu=Help > PEHelpMenu=Hilfe > @@ -1180,7 +1180,7 @@ > #TIFPLimitCacheSize=Limit cache size > TIFPLimitCacheSize=Zwischenspeichergr\u00f6\u00dfe begrenzen > #TIFPCacheSizeSpinnerValueTooLargeWarning=WARNING: Uses > more space than {0} MB available > -TIFPCacheSizeSpinnerValueTooLargeWarning=WARNUNG: > Verwendet mehr Speicher als {0} MB verf\u00fcgbar > +TIFPCacheSizeSpinnerValueTooLargeWarning=WARNUNG: > Verwendet mehr Speicher als die verf\u00fcgbaren {0} MB > #TIFPCacheSizeSpinnerLargeValueWarning=Available: {0} MB > TIFPCacheSizeSpinnerLargeValueWarning={0} MB verf\u00fcgbar > #TIFPCacheSizeSetToNoCaching=Cached files will be deleted when > IcedTea-Web terminates. From ptisnovs at icedtea.classpath.org Tue Aug 4 10:54:59 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 04 Aug 2015 10:54:59 +0000 Subject: /hg/gfx-test: Updated. Message-ID: changeset 5e107fd36f67 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5e107fd36f67 author: Pavel Tisnovsky date: Tue Aug 04 12:57:38 2015 +0200 Updated. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 250 +++++++++----------- 2 files changed, 115 insertions(+), 140 deletions(-) diffs (391 lines): diff -r 7181f90a163b -r 5e107fd36f67 ChangeLog --- a/ChangeLog Mon Aug 03 11:38:35 2015 +0200 +++ b/ChangeLog Tue Aug 04 12:57:38 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-04 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated. + 2015-08-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 7181f90a163b -r 5e107fd36f67 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Aug 03 11:38:35 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Aug 04 12:57:38 2015 +0200 @@ -8926,37 +8926,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. - * Background color is set to Color.black. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltEmptyBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. - * Background color is set to Color.blue. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltEmptyBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.green. * * @param image @@ -9121,7 +9091,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. * Background color is set to Color.magenta. * * @param image @@ -9130,13 +9100,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. * Background color is set to Color.yellow. * * @param image @@ -9145,13 +9115,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. * Background color is set to Color.white. * * @param image @@ -9160,13 +9130,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.black. * * @param image @@ -9175,13 +9145,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.blue. * * @param image @@ -9190,13 +9160,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.green. * * @param image @@ -9205,13 +9175,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.cyan. * * @param image @@ -9220,13 +9190,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.red. * * @param image @@ -9235,13 +9205,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.magenta. * * @param image @@ -9250,13 +9220,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.yellow. * * @param image @@ -9265,13 +9235,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. * Background color is set to Color.white. * * @param image @@ -9280,13 +9250,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntRGBbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.black. * * @param image @@ -9295,13 +9265,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.blue. * * @param image @@ -9310,13 +9280,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.green. * * @param image @@ -9325,13 +9295,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.cyan. * * @param image @@ -9340,13 +9310,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.red. * * @param image @@ -9355,9 +9325,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.red); + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.red); } /** From jvanek at redhat.com Tue Aug 4 14:28:16 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 4 Aug 2015 16:28:16 +0200 Subject: /hg/release/icedtea-web-1.6: Add -defaultfile switch to PolicyEd... In-Reply-To: <55BB8D07.10009@redhat.com> References: <55BB102A.9000706@redhat.com> <55BB8D07.10009@redhat.com> Message-ID: <55C0CC00.4060707@redhat.com> On 07/31/2015 04:58 PM, Andrew Azores wrote: > On 31/07/15 02:05 AM, Jiri Vanek wrote: >> On 07/30/2015 07:26 PM, aazores at icedtea.classpath.org wrote: >>> changeset 9e24c2ff6b46 in /hg/release/icedtea-web-1.6 >>> details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=9e24c2ff6b46 >>> author: Andrew Azores >>> date: Thu Jul 30 13:11:53 2015 -0400 >>> >>> Add -defaultfile switch to PolicyEditor >> >> hi Andrew! >> >> The commit message strongly disagree with rest of changeset. May you fix it? >> >> Or have I missed somethin? >> >> J. >> > > Ugh, sorry. You can see I updated the ChangeLog and even copied that change into the body of the > commit message, but I neglected to update the first summary line of the message. Since this is > already pushed though, how would you suggest I fix it? I suppose I can try to modify it locally and > then do a force push, but I'd rather not... > You should be able to -amend to last push. So you can before somebody els epush:) But I have never tried, so maybe I'm wrong. Dont force, and dnt remove/reapply. J. From jvanek at redhat.com Tue Aug 4 14:32:20 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 4 Aug 2015 16:32:20 +0200 Subject: [rfc][icedtea-web] PolicyEditor Parser patch In-Reply-To: <55BB8E95.3020401@redhat.com> References: <55B10E8B.40704@redhat.com> <55B629AF.4000804@redhat.com> <55B68819.40005@redhat.com> <55B8F0F2.3080709@redhat.com> <55B9020A.2000704@redhat.com> <55BA0D72.4000905@redhat.com> <55BA1030.3020808@redhat.com> <55BB12CD.1090404@redhat.com> <55BB8D7F.8060901@redhat.com> <55BB8E95.3020401@redhat.com> Message-ID: <55C0CCF4.8050607@redhat.com> On 07/31/2015 05:04 PM, Andrew Azores wrote: > On 31/07/15 11:00 AM, Andrew Azores wrote: >> On 31/07/15 02:16 AM, Jiri Vanek wrote: >>> On 07/30/2015 01:53 PM, Jiri Vanek wrote: >>>> >>>>> >>>>>> synchronously. Synchronously after the async job was kicked off, at least, but then almost >>>>>> guaranteed in real-time to actually happen first. I've fixed that now by making it so that >>>>>> PolicyEditor instances don't automatically start opening and parsing policy files as soon as >>>>>> they're >>>>>> instantiated, and instead the caller has to invoke this step when ready. >>>>> >>>>> When selector is set, and it do not exists in target file - new item is crerated. Is it expected >>>>> bahvior? >>>>> (-me guess yes) >>>>>> >>>> >>> >>> One more idea. >>> >>> Currently when some unknown rules, both of eg: >>> permission java.lang.RuntimePermission "blablba"; >>> permission java.my.HyperPermission "*"; >>> >>> are loaded, and when keeping policy is modified they are not lost, and are saved again. >>> >>> Anayway they are iniviible in PolicyEditor. What about adding jlist to show policies unknown to >>> our checkboxes? (and wit possibility to add/remove...maybe?) >>> >>> Just talking a lot.... >>> j:) >> >> Is this not View > Custom Policies ? >> > > "Custom Permissions", rather. > Cool! i Missed that :)) and it seems to be working! Maye just nit - it is complelty invisisble :) Idea - when selected itme contains unknown rules, then maybe show something? like normally invisible text "this contains special rules" with tooltip how to show/edit them? J. From gitne at gmx.de Tue Aug 4 15:45:54 2015 From: gitne at gmx.de (Jacob Wisor) Date: Tue, 4 Aug 2015 17:45:54 +0200 Subject: /hg/release/icedtea-web-1.6: Add -defaultfile switch to PolicyEd... In-Reply-To: <55C0CC00.4060707@redhat.com> References: <55BB102A.9000706@redhat.com> <55BB8D07.10009@redhat.com> <55C0CC00.4060707@redhat.com> Message-ID: <55C0DE32.1090904@gmx.de> On 08/04/2015 04:28 PM, Jiri Vanek wrote: > On 07/31/2015 04:58 PM, Andrew Azores wrote: >> On 31/07/15 02:05 AM, Jiri Vanek wrote: >>> On 07/30/2015 07:26 PM, aazores at icedtea.classpath.org wrote: >>>> changeset 9e24c2ff6b46 in /hg/release/icedtea-web-1.6 >>>> details: >>>> http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=9e24c2ff6b46 >>>> >>>> author: Andrew Azores >>>> date: Thu Jul 30 13:11:53 2015 -0400 >>>> >>>> Add -defaultfile switch to PolicyEditor >>> >>> hi Andrew! >>> >>> The commit message strongly disagree with rest of changeset. May you fix it? >>> >>> Or have I missed somethin? >>> >>> J. >>> >> >> Ugh, sorry. You can see I updated the ChangeLog and even copied that change >> into the body of the >> commit message, but I neglected to update the first summary line of the >> message. Since this is >> already pushed though, how would you suggest I fix it? I suppose I can try to >> modify it locally and >> then do a force push, but I'd rather not... >> > You should be able to -amend to last push. So you can before somebody els epush:) > > But I have never tried, so maybe I'm wrong. > > Dont force, and dnt remove/reapply. No, you cannot amend remote repos. The hg documentation clearly states: It is not possible to amend public changesets (see "hg help phases") or changesets that have children. Regards, Jacob From ptisnovs at icedtea.classpath.org Wed Aug 5 10:29:45 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 05 Aug 2015 10:29:45 +0000 Subject: /hg/gfx-test: Updated several tests. Message-ID: changeset 717cdb23cc52 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=717cdb23cc52 author: Pavel Tisnovsky date: Wed Aug 05 12:32:27 2015 +0200 Updated several tests. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 134 ++++++++++---------- 2 files changed, 72 insertions(+), 67 deletions(-) diffs (226 lines): diff -r 5e107fd36f67 -r 717cdb23cc52 ChangeLog --- a/ChangeLog Tue Aug 04 12:57:38 2015 +0200 +++ b/ChangeLog Wed Aug 05 12:32:27 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-05 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated several tests. + 2015-08-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 5e107fd36f67 -r 717cdb23cc52 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Aug 04 12:57:38 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 05 12:32:27 2015 +0200 @@ -9331,7 +9331,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.magenta. * * @param image @@ -9340,13 +9340,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.yellow. * * @param image @@ -9355,13 +9355,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. * Background color is set to Color.white. * * @param image @@ -9370,13 +9370,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGBbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. * Background color is set to Color.black. * * @param image @@ -9385,13 +9385,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.blue. * * @param image @@ -9400,13 +9400,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.green. * * @param image @@ -9415,13 +9415,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.cyan. * * @param image @@ -9430,13 +9430,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.red. * * @param image @@ -9445,13 +9445,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.magenta. * * @param image @@ -9460,13 +9460,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.yellow. * * @param image @@ -9475,9 +9475,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.yellow); + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.yellow); } /** From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 10:33:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 10:33:26 +0000 Subject: [Bug 2570] New: JVM fatal error: SIGSEGV (0xb) in frame NodeHash::hash_delete(Node const*)+0xd Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2570 Bug ID: 2570 Summary: JVM fatal error: SIGSEGV (0xb) in frame NodeHash::hash_delete(Node const*)+0xd Product: IcedTea Version: 2.5.6 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: christian.metzner at compador.de CC: unassigned at icedtea.classpath.org Created attachment 1397 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1397&action=edit Java Fatal Error Log JVM crashes frequently, always performing the same operation. (log is attached) The crash occurs in standalone Java applications as well as in Web applications using Apache Tomcat. The crash could not be provoked or reproduced in an development environment. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 15:21:49 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 15:21:49 +0000 Subject: [Bug 2571] New: xrender pipeline creates graphics corruption Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2571 Bug ID: 2571 Summary: xrender pipeline creates graphics corruption Product: IcedTea Version: 7-hg Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: tdaitx at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1398 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1398&action=edit fix openjdk-7 xrender graphics corruption As reported in https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1101348 https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1032936 Original issue report and fix for OpenJDK 8 at https://bugs.openjdk.java.net/browse/JDK-7105461 Ubuntu has been using this patch since 10 Jul 2014. Please advise on whether this patch is acceptable for IcedTea 2.5/2.6 or not. >From LP: #1101348 ================= Activating the XRender-Pipeline in openjdk-7 for usage with netbeans creates graphics corruption when scrolling. For details please see the post on the xrender-dev mailinglist: http://mail.openjdk.java.net/pipermail/xrender-dev/2013-January/000049.html The corruption can be seen in this screenshot: http://mail.openjdk.java.net/pipermail/xrender-dev/attachments/20130108/3d37aeb9/Screenshot-0001.png Clemens Eisserer created a patch for openjdk-8, which he kindly pointed me to. I took that patch and applied it to the openjdk-7 package and it works in openjdk-7. Currently I rebuild the openjdk Package on each new release and replace the rt.jar - it would be nice if the patch could be integrated into the build process. I'll attach the patch I created (this is just a minor change from the original version of Clemens Eisserer). Ubuntu version: Description: Ubuntu 12.10 Release: 12.10 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 15:22:27 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 15:22:27 +0000 Subject: [Bug 2571] xrender pipeline creates graphics corruption In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2571 Tiago St?rmer Daitx changed: What |Removed |Added ---------------------------------------------------------------------------- Hardware|x86_64 |all Severity|enhancement |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 15:23:23 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 15:23:23 +0000 Subject: [Bug 2571] xrender pipeline creates graphics corruption In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2571 Tiago St?rmer Daitx changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugs.launchpad.net/ | |ubuntu/+source/openjdk-7/+b | |ug/1101348 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 19:06:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 19:06:15 +0000 Subject: [Bug 2571] xrender pipeline creates graphics corruption In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2571 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.2 --- Comment #1 from Andrew John Hughes --- We'll include the backport in the next minor release in October, all being well. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 5 22:03:56 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Aug 2015 22:03:56 +0000 Subject: [Bug 2289] Internal Error (safepoint.cpp:321) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2289 Daniel Moran changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID |--- --- Comment #20 from Daniel Moran --- Andrew, I'm reopening this because at this point I've replaced every single part (including a loaner CPU) and I'm still encountering this. And this is the only issue I'm having with both old and new parts, which is now getting rather expensive to address this. Core dump and PID log: http://rwilco12.com/garwynn/13818/ I do notice that whether 2 or 16 jobs running it will quickly turn into many jobs in htop that I see, and it's usually when I see several pages of java related jobs that a CPU finally hangs at 100%. Also not isolated to openjdk-7-jdk, I got Oracle Java 6 to crash as well, though it throws a separate error. Even after removing Java 6 and reinstalling openjdk-7-jdk it gave the Java 6 error until reboot. That error log and core dump is here: http://rwilco12.com/garwynn/16970/ The other thing? If I change CPU settings significantly in BIOS, it will usually behave properly the first boot after the changes were saved. Subsequent boots will provide the same error. If it would be easier to troubleshoot by e-mail or chat I'd be happy to do so. Greatly appreciate any support you can offer. My apologies for this continuing issue and thank you for your continued time and support. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Thu Aug 6 07:59:53 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 06 Aug 2015 07:59:53 +0000 Subject: /hg/gfx-test: Updates. Message-ID: changeset bfdcbd1179ce in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=bfdcbd1179ce author: Pavel Tisnovsky date: Thu Aug 06 10:02:33 2015 +0200 Updates. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 106 ++++++++++---------- 2 files changed, 58 insertions(+), 53 deletions(-) diffs (184 lines): diff -r 717cdb23cc52 -r bfdcbd1179ce ChangeLog --- a/ChangeLog Wed Aug 05 12:32:27 2015 +0200 +++ b/ChangeLog Thu Aug 06 10:02:33 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-06 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updates. + 2015-08-05 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 717cdb23cc52 -r bfdcbd1179ce src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 05 12:32:27 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 06 10:02:33 2015 +0200 @@ -9481,7 +9481,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.white. * * @param image @@ -9490,13 +9490,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.black. * * @param image @@ -9505,13 +9505,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.blue. * * @param image @@ -9520,13 +9520,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.green. * * @param image @@ -9535,13 +9535,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.cyan. * * @param image @@ -9550,13 +9550,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.red. * * @param image @@ -9565,13 +9565,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.magenta. * * @param image @@ -9580,13 +9580,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.yellow. * * @param image @@ -9595,9 +9595,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.yellow); + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.yellow); } /** From bugzilla-daemon at icedtea.classpath.org Fri Aug 7 04:37:17 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Aug 2015 04:37:17 +0000 Subject: [Bug 2572] New: fatal crash outside JVM in native code Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2572 Bug ID: 2572 Summary: fatal crash outside JVM in native code Product: IcedTea Version: 2.5.5 Hardware: x86_64 OS: Linux Status: NEW Severity: minor Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: mujtabaar at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1399 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1399&action=edit crash dump described Hi, I'm not sure if this is the proper way to file this bug, but I recently noticed that in my home directory there was a crash dump (stating that I should file a bug with steps to reproduce). I don't know the steps to reproduce it but in case someone can make some sense of the crash dump, hopefully, the problem could be fixed in the future. I'm really sorry I can't be more helpful, however, I'm not really sure what I was doing at the time the crash dump was created. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Aug 7 13:00:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Aug 2015 13:00:26 +0000 Subject: [Bug 2573] jvm out of memory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2573 Yasumasa Suenaga changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org, yasuenag at gmail.com Component|Analyzer |IcedTea Assignee|heapstats at icedtea.classpath |unassigned at icedtea.classpat |.org |h.org Product|HeapStats |IcedTea Severity|enhancement |trivial --- Comment #1 from Yasumasa Suenaga --- I forwarded this issue to IcedTea. This hs_err reports memory bus error. It is not a issue of HeapStats. I guess the problem is caused by physical memory or HotSpot VM. -- 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: From bugzilla-daemon at icedtea.classpath.org Mon Aug 10 10:11:06 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Aug 2015 10:11:06 +0000 Subject: [Bug 2572] fatal crash outside JVM in native code In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2572 Stanislav Baiduzhyi changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |baiduzhyi.devel at gmail.com Resolution|--- |WONTFIX --- Comment #1 from Stanislav Baiduzhyi --- That is yet another eclipse+gtk3 crash in native code, not caused by openjdk. It is visible by those lines: Stack: [0x00007fe0d1a5c000,0x00007fe0d1b5d000], sp=0x00007fe0d1b59868, free space=1014k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libgobject-2.0.so.0+0x31d6c] g_type_check_instance_is_a+0x3c Looks like it was already reported: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420550 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Mon Aug 10 10:58:25 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 10 Aug 2015 10:58:25 +0000 Subject: /hg/gfx-test: New tests added into BitBltUsingBgColor. Message-ID: changeset b01e5b5f851a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b01e5b5f851a author: Pavel Tisnovsky date: Mon Aug 10 13:01:10 2015 +0200 New tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 1018 ++++++++++---------- 2 files changed, 514 insertions(+), 509 deletions(-) diffs (truncated from 1103 to 500 lines): diff -r bfdcbd1179ce -r b01e5b5f851a ChangeLog --- a/ChangeLog Thu Aug 06 10:02:33 2015 +0200 +++ b/ChangeLog Mon Aug 10 13:01:10 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-10 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + New tests added into BitBltUsingBgColor. + 2015-08-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r bfdcbd1179ce -r b01e5b5f851a src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 06 10:02:33 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Aug 10 13:01:10 2015 +0200 @@ -9601,7 +9601,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.white. * * @param image @@ -9610,13 +9610,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteBinaryBackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteBGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. * Background color is set to Color.black. * * @param image @@ -9625,9 +9625,489 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteGrayBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, Color.black); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas From martinrb at google.com Mon Aug 10 15:36:09 2015 From: martinrb at google.com (Martin Buchholz) Date: Mon, 10 Aug 2015 08:36:09 -0700 Subject: Test failures in jdk7u85-b01 Message-ID: Hi folks working on "jdk7u85", I'm doing a bit of QA on jdk7u85-b01 (hg tclone icedtea7-forest-2.6; hg tupdate -r jdk7u85-b01) and observed these failures, which seem due to backports of jtreg tests that either don't apply to jdk7 or need more backporting work: sun/security/jgss/spnego/MSOID.java javax/xml/ws/8046817/GenerateEnumSchema.java javax/crypto/Cipher/CipherInputStreamExceptions.java java.security.NoSuchAlgorithmException: No such algorithm: AES/GCM/PKCS5Padding /usr/local/google/home/martinrb/ws/jdk7u85-b01/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java:37: error: package java.util.stream does not exist import java.util.stream.Collectors; import java.util.Base64; ^ symbol: class Base64 location: package java.util /usr/local/google/home/martinrb/ws/jdk7u85-b01/jdk/test/sun/security/jgss/spnego/MSOID.java:48: error: cannot find symbol -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Tue Aug 11 08:24:33 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 11 Aug 2015 08:24:33 +0000 Subject: /hg/gfx-test: Updated. Message-ID: changeset ee70173c9080 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ee70173c9080 author: Pavel Tisnovsky date: Tue Aug 11 10:27:15 2015 +0200 Updated. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 ++++++++++---------- 2 files changed, 65 insertions(+), 60 deletions(-) diffs (205 lines): diff -r b01e5b5f851a -r ee70173c9080 ChangeLog --- a/ChangeLog Mon Aug 10 13:01:10 2015 +0200 +++ b/ChangeLog Tue Aug 11 10:27:15 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-11 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated. + 2015-08-10 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r b01e5b5f851a -r ee70173c9080 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Aug 10 13:01:10 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Aug 11 10:27:15 2015 +0200 @@ -9736,7 +9736,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.black. * * @param image @@ -9745,13 +9745,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.blue. * * @param image @@ -9760,13 +9760,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.green. * * @param image @@ -9775,13 +9775,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.cyan. * * @param image @@ -9790,13 +9790,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.red. * * @param image @@ -9805,13 +9805,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.magenta. * * @param image @@ -9820,13 +9820,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.yellow. * * @param image @@ -9835,13 +9835,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_INDEXED. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. * Background color is set to Color.white. * * @param image @@ -9850,13 +9850,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeByteIndexedBackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.black. * * @param image @@ -9865,9 +9865,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.black); + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.black); } /** From ptisnovs at icedtea.classpath.org Wed Aug 12 08:59:10 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 12 Aug 2015 08:59:10 +0000 Subject: /hg/gfx-test: New tests added into BitBltUsingBgColor. Message-ID: changeset d75f7a3cfe3e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d75f7a3cfe3e author: Pavel Tisnovsky date: Wed Aug 12 11:01:53 2015 +0200 New tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 ++++++++++---------- 2 files changed, 65 insertions(+), 60 deletions(-) diffs (205 lines): diff -r ee70173c9080 -r d75f7a3cfe3e ChangeLog --- a/ChangeLog Tue Aug 11 10:27:15 2015 +0200 +++ b/ChangeLog Wed Aug 12 11:01:53 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-11 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + New tests added into BitBltUsingBgColor. + 2015-08-11 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r ee70173c9080 -r d75f7a3cfe3e src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Aug 11 10:27:15 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 12 11:01:53 2015 +0200 @@ -9871,7 +9871,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.blue. * * @param image @@ -9880,13 +9880,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.green. * * @param image @@ -9895,13 +9895,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.cyan. * * @param image @@ -9910,13 +9910,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.red. * * @param image @@ -9925,13 +9925,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.magenta. * * @param image @@ -9940,13 +9940,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.yellow. * * @param image @@ -9955,13 +9955,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. * Background color is set to Color.white. * * @param image @@ -9970,13 +9970,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBBackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.black. * * @param image @@ -9985,13 +9985,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.blue. * * @param image @@ -10000,9 +10000,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.blue); + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.blue); } /** From bugzilla-daemon at icedtea.classpath.org Wed Aug 12 15:55:21 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 12 Aug 2015 15:55:21 +0000 Subject: [Bug 2574] A fatal error has been detected by the Java Runtime Environment - JDownloader v.2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2574 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|Fields & Values |IcedTea Version|unspecified |6-1.13.7 Product|Bug Database |IcedTea Severity|critical |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 12 15:55:50 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 12 Aug 2015 15:55:50 +0000 Subject: [Bug 2574] A fatal error has been detected by the Java Runtime Environment - JDownloader v.2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2574 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea |Thumb2 JIT Assignee|gnu.andrew at redhat.com |aph 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: From bugzilla-daemon at icedtea.classpath.org Wed Aug 12 15:57:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 12 Aug 2015 15:57:53 +0000 Subject: [Bug 2572] fatal crash outside JVM in native code In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2572 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|WONTFIX |INVALID -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 12 16:04:14 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 12 Aug 2015 16:04:14 +0000 Subject: [Bug 2573] jvm out of memory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2573 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Hardware|64-bit |x86_64 Version|unspecified |6-hg Resolution|--- |WONTFIX Severity|trivial |normal --- Comment #2 from Andrew John Hughes --- This looks like a very old version of OpenJDK 6. Please re-open with details of how to reproduce this crash, if it persists on a current version (IcedTea 1.13.x) -- 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: From ptisnovs at icedtea.classpath.org Thu Aug 13 08:20:46 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Aug 2015 08:20:46 +0000 Subject: /hg/gfx-test: Updated several tests. Message-ID: changeset a55ded659895 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a55ded659895 author: Pavel Tisnovsky date: Thu Aug 13 10:23:30 2015 +0200 Updated several tests. diffstat: ChangeLog | 7 +- src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 128 ++++++++++---------- 2 files changed, 70 insertions(+), 65 deletions(-) diffs (215 lines): diff -r d75f7a3cfe3e -r a55ded659895 ChangeLog --- a/ChangeLog Wed Aug 12 11:01:53 2015 +0200 +++ b/ChangeLog Thu Aug 13 10:23:30 2015 +0200 @@ -1,4 +1,9 @@ -2015-08-11 Pavel Tisnovsky +2015-08-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated several tests. + +2015-08-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: New tests added into BitBltUsingBgColor. diff -r d75f7a3cfe3e -r a55ded659895 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 12 11:01:53 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 13 10:23:30 2015 +0200 @@ -10006,7 +10006,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.green. * * @param image @@ -10015,13 +10015,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.cyan. * * @param image @@ -10030,13 +10030,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.red. * * @param image @@ -10045,13 +10045,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.magenta. * * @param image @@ -10060,13 +10060,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.yellow. * * @param image @@ -10075,13 +10075,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. * Background color is set to Color.white. * * @param image @@ -10090,13 +10090,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBBackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.black. * * @param image @@ -10105,13 +10105,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.blue. * * @param image @@ -10120,13 +10120,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.green. * * @param image @@ -10135,13 +10135,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.cyan. * * @param image From bugzilla-daemon at icedtea.classpath.org Thu Aug 13 15:15:18 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 13 Aug 2015 15:15:18 +0000 Subject: [Bug 2579] New: Spelling errors in console Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2579 Bug ID: 2579 Summary: Spelling errors in console Product: IcedTea-Web Version: 1.5 Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: NetX (javaws) Assignee: jvanek at redhat.com Reporter: idontlook at gmail.com CC: unassigned at icedtea.classpath.org The following is a general error when I rejected an applet security check. The error is expected, but the English spelling is bad. Happens on multiple applets. Reproduction: Go to a site with an applet, click Cancel to the security check, after it errors, "Click here for errors" link in the applet area. Firefox 40.0 Mozilla Firefox for Mint mint - 1.0 1.5-1ubuntu1 Current error wording: "The folloing exception has occured. For more information, try to launch the browser from the command line and examine the output. For even more information you can visit http://icedtea.classpath.org/wiki/IcedTea-Web and follow the steps described there on how to obtain necessary information to file bug Additional information may be available in the console or logs. Even more information is available if debugging is enabled." Corrected: The following exception has occurred. For detailed information, try launching the browser from the command line and examine the output. For additional information you can visit http://icedtea.classpath.org/wiki/IcedTea-Web and follow the steps described on how to obtain the necessary information to search for and file a bug. Additional information may be available in the console or log files. Extended information is available if debugging is enabled. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Fri Aug 14 10:01:19 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Aug 2015 10:01:19 +0000 Subject: /hg/gfx-test: Updated several tests. Message-ID: changeset 21eedd1b9fa9 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=21eedd1b9fa9 author: Pavel Tisnovsky date: Fri Aug 14 12:04:03 2015 +0200 Updated several tests. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 344 ++++++++++---------- 2 files changed, 177 insertions(+), 172 deletions(-) diffs (450 lines): diff -r a55ded659895 -r 21eedd1b9fa9 ChangeLog --- a/ChangeLog Thu Aug 13 10:23:30 2015 +0200 +++ b/ChangeLog Fri Aug 14 12:04:03 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated several tests. + 2015-08-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r a55ded659895 -r 21eedd1b9fa9 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 13 10:23:30 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Aug 14 12:04:03 2015 +0200 @@ -10150,13 +10150,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.red. * * @param image @@ -10165,13 +10165,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.magenta. * * @param image @@ -10180,13 +10180,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.yellow. * * @param image @@ -10195,13 +10195,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. * Background color is set to Color.white. * * @param image @@ -10210,9 +10210,129 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltEmptyBufferedImageTypeUshortGrayBackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, Color.white); + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.white); } /** @@ -10225,9 +10345,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.black); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); } /** @@ -10240,9 +10360,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.blue); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); } /** @@ -10255,9 +10375,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.green); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); } /** @@ -10270,9 +10390,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.cyan); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); } /** @@ -10285,9 +10405,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.red); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); } /** @@ -10300,9 +10420,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.magenta); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); } /** @@ -10315,9 +10435,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.yellow); + public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); } /** @@ -10330,126 +10450,6 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.black. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.blue. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.green. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.cyan. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.red. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.magenta. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.yellow. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. - * Background color is set to Color.white. - * - * @param image - * image to be used as a destination for BitBlt-type operations - * @param graphics2d - * graphics canvas - * @return test result status - PASSED, FAILED or ERROR - */ public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) { return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.white); From aazores at redhat.com Fri Aug 14 16:01:48 2015 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Aug 2015 12:01:48 -0400 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55BA8C38.9090101@redhat.com> References: <55BA8C38.9090101@redhat.com> Message-ID: <55CE10EC.50301@redhat.com> On 30/07/15 04:42 PM, Andrew Azores wrote: > Hi, > > This patch makes it so that the list of entries/identifiers in > PolicyEditor is sorted, mainly so that entries will appear with a > consistent ordering. This also guarantees that the > ALL_APPLETS_IDENTIFIER is always the least element and thus always > appears consistently at the top of the list. > Ping, any other reviewers around and have some free time? -- Thanks, Andrew Azores From aazores at redhat.com Fri Aug 14 16:02:06 2015 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Aug 2015 12:02:06 -0400 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55BAA2E8.6010203@redhat.com> References: <55BAA2E8.6010203@redhat.com> Message-ID: <55CE10FE.2050304@redhat.com> On 30/07/15 06:19 PM, Andrew Azores wrote: > Hi, > > This patch makes it so that PolicyEditor dies immediately if given > invalid arguments via -codebase, -signedby, or -principals CLI switches. > Ping on this one too, any reviewers? -- Thanks, Andrew Azores From bugzilla-daemon at icedtea.classpath.org Fri Aug 14 18:53:33 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 14 Aug 2015 18:53:33 +0000 Subject: [Bug 1969] [IcedTea8] Add ARM32 JIT port In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1969 Rich DiCroce changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rd at lapis.com --- Comment #2 from Rich DiCroce --- Created attachment 1403 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1403&action=edit Non-working ARM32 patch I spent most of yesterday and today attempting to port the ARM32 JIT from IcedTea 2 to OpenJDK 8. It didn't go so well. Because of the removal of PermGen and various other refactorings, the code needs a lot of changes. Some are simple, but others require knowledge of Hotspot that I don't have. The result I ended up with compiles, but probably doesn't work. I don't know for sure because the Raspberry Pi I tried to build on doesn't have enough memory for the build to succeed. I could try cross-compiling, but at this point I have very little hope of getting an end result that functions properly. And as an FYI, the arm32-8u40 repository referenced by the above comment doesn't even compile. It had a bunch of errors in files that didn't appear to be related to ARM32 or Zero, so I'm guessing a merge went wrong somewhere. Hence the reason I decided to start from a known-good tree. So, for whoever eventually works on this, I've attached a patch containing what I did on top of OpenJDK 8u51-b16. Maybe it'll help you. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Aug 14 19:43:36 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 14 Aug 2015 19:43:36 +0000 Subject: [Bug 2570] JVM fatal error: SIGSEGV (0xb) in frame NodeHash::hash_delete(Node const*)+0xd In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2570 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|major |normal --- Comment #1 from Andrew John Hughes --- Please upgrade to the 2.6.x series and see if this resolves the issue. Without a reproducer, there's not much more that can be done. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Fri Aug 14 23:53:11 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 14 Aug 2015 23:53:11 +0000 Subject: /hg/release/icedtea6-1.13: Start 1.13.9 release cycle. Message-ID: changeset 53d2442cfbec in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=53d2442cfbec author: Andrew John Hughes date: Sat Aug 15 00:52:55 2015 +0100 Start 1.13.9 release cycle. 2015-08-15 Andrew John Hughes * NEWS: Add 1.13.9 section. Correct section formatting. * configure.ac: Bump to 1.13.9pre. diffstat: ChangeLog | 6 ++++++ NEWS | 4 +++- configure.ac | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diffs (43 lines): diff -r b342498c6365 -r 53d2442cfbec ChangeLog --- a/ChangeLog Thu Jul 30 19:27:05 2015 +0100 +++ b/ChangeLog Sat Aug 15 00:52:55 2015 +0100 @@ -1,3 +1,9 @@ +2015-08-15 Andrew John Hughes + + * NEWS: Add 1.13.9 section. Correct + section formatting. + * configure.ac: Bump to 1.13.9pre. + 2015-07-28 Andrew John Hughes PR2565: Replace ipv4-mapped-ipv6-addresses.patch diff -r b342498c6365 -r 53d2442cfbec NEWS --- a/NEWS Thu Jul 30 19:27:05 2015 +0100 +++ b/NEWS Sat Aug 15 00:52:55 2015 +0100 @@ -12,6 +12,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.13.8 (2015-10-XX): + New in release 1.13.8 (2015-07-29): * Security fixes @@ -111,7 +113,7 @@ - S8081315, PR2406: Avoid giflib interlacing workaround with giflib 5.0.0 on - S8081475, PR2495: SystemTap does not work when JDK is compiled with GCC 5 - S8087120, RH1206656, PR2554: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. - * Bug fixes +* Bug fixes - PR2319: Checksum of policy JAR files changes on every build - PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled - PR2342: Update README & INSTALL files diff -r b342498c6365 -r 53d2442cfbec configure.ac --- a/configure.ac Thu Jul 30 19:27:05 2015 +0100 +++ b/configure.ac Sat Aug 15 00:52:55 2015 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.13.8],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.13.9pre],[distro-pkg-dev at openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) From jvanek at redhat.com Mon Aug 17 05:46:04 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Aug 2015 07:46:04 +0200 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55BA8C38.9090101@redhat.com> References: <55BA8C38.9090101@redhat.com> Message-ID: <55D1751C.2050308@redhat.com> On 07/30/2015 10:42 PM, Andrew Azores wrote: > Hi, > > This patch makes it so that the list of entries/identifiers in PolicyEditor is sorted, mainly so > that entries will appear with a consistent ordering. This also guarantees that the > ALL_APPLETS_IDENTIFIER is always the least element and thus always appears consistently at the top Good nit ;) > of the list. > > -- > Thanks, > > Andrew Azores > > > sorted-policyeditor-list.patch > > > # HG changeset patch > # User Andrew Azores > # Date 1438288913 14400 > # Thu Jul 30 16:41:53 2015 -0400 > # Node ID bce05dbb84e73eff67dc8ac6af9509a5eaf36b8a > # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 > Sort identifiers list in PolicyEditor > > * NEWS: add note about sorting > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > (addNewEntry): clear listModel before adding new identifiers from > policyEditorController. Controller handles sorting results for us, so we > just clear and repopulate the UI. > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java > (getIdentifiers): return TreeSet rather than HashSet because of TreeSet > providing sorting > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java > (getIdentifiers): likewise > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java > (compareTo, compare): new methods for implementing Comparable > > diff --git a/ChangeLog b/ChangeLog > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,19 @@ > +2015-07-30 Andrew Azores > + > + Sort identifiers list in PolicyEditor > + * NEWS: add note about sorting > + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > + (addNewEntry): clear listModel before adding new identifiers from > + policyEditorController. Controller handles sorting results for us, so we > + just clear and repopulate the UI. > + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java > + (getIdentifiers): return TreeSet rather than HashSet because of TreeSet > + providing sorting > + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java > + (getIdentifiers): likewise > + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java > + (compareTo, compare): new methods for implementing Comparable > + > 2015-07-30 Andrew Azores > > Add tests for PolicyEditor.getFilePathArgument > diff --git a/NEWS b/NEWS > --- a/NEWS > +++ b/NEWS > @@ -29,6 +29,7 @@ > - fixed issues with -html shortcuts > - fixed issue with -html receiving garbage in width and height > * PolicyEditor > + - Entry list is sorted, entries will appear with consistent ordering I would probably not include this to NEWS as it is small implementation detail. But Its up to you, > - file flag made to work when used standalone > - file flag cannot be used in combination with main argument > - defaultfile flag added > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > @@ -840,6 +840,7 @@ > invokeRunnableOrEnqueueLater(new Runnable() { > @Override > public void run() { > + listModel.clear(); Why the clear was not necessary before? > for (final PolicyIdentifier identifier : policyEditorController.getIdentifiers()) { > if (!listModel.contains(identifier)) { > listModel.addElement(identifier); > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java > @@ -48,6 +48,8 @@ > import java.util.HashSet; > import java.util.Map; > import java.util.Set; > +import java.util.SortedSet; > +import java.util.TreeSet; > > import net.sourceforge.jnlp.util.logging.OutputController; > import sun.security.provider.PolicyParser; > @@ -102,8 +104,8 @@ > policyFile.removeIdentifier(identifier); > } > > - public Set getIdentifiers() { > - return new HashSet<>(policyFile.getIdentifiers()); > + public SortedSet getIdentifiers() { > + return new TreeSet<>(policyFile.getIdentifiers()); Good idea! > } > > public Map> getCopyOfPermissions() { > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java > @@ -48,6 +48,8 @@ > import java.util.Map; > import java.util.Objects; > import java.util.Set; > +import java.util.SortedSet; > +import java.util.TreeSet; > > import net.sourceforge.jnlp.util.FileUtils; > import net.sourceforge.jnlp.util.MD5SumWatcher; > @@ -201,8 +203,8 @@ > return fileWatcher != null && fileWatcher.update(); > } > > - synchronized Set getIdentifiers() { > - return new HashSet<>(permissionsMap.keySet()); > + synchronized SortedSet getIdentifiers() { > + return new TreeSet<>(permissionsMap.keySet()); > } > > synchronized KeystoreInfo getKeystoreInfo() { > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java > @@ -43,10 +43,12 @@ > import java.util.ArrayList; > import java.util.Collection; > import java.util.Collections; > +import java.util.LinkedHashSet; > import java.util.List; > +import java.util.Set; > > //http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html > -public class PolicyIdentifier implements Serializable { > +public class PolicyIdentifier implements Comparable, Serializable { > > public static final PolicyIdentifier ALL_APPLETS_IDENTIFIER = new PolicyIdentifier(null, Collections.emptySet(), null) { > @Override > @@ -56,7 +58,7 @@ > }; > > private final String signedBy; > - private final List principals = new ArrayList<>(); > + private final LinkedHashSet principals = new LinkedHashSet<>(); > private final String codebase; > > public PolicyIdentifier(final String signedBy, final Collection principals, final String codebase) { > @@ -77,7 +79,7 @@ > return signedBy; > } > > - public List getPrincipals() { > + public Set getPrincipals() { > return principals; > } > > @@ -144,4 +146,39 @@ > result = 31 * result + (codebase.hashCode()); > return result; > } > + > + @Override > + public int compareTo(PolicyIdentifier policyIdentifier) { > + if (this.equals(ALL_APPLETS_IDENTIFIER) && policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { > + return 0; > + } else if (this.equals(ALL_APPLETS_IDENTIFIER) && !policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { > + return -1; > + } else if (!this.equals(ALL_APPLETS_IDENTIFIER) && policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { > + return 1; > + } > + > + final int codebaseComparison = compare(this.getCodebase(), policyIdentifier.getCodebase()); > + if (codebaseComparison != 0) { > + return codebaseComparison; > + } > + > + final int signedByComparison = compare(this.getSignedBy(), policyIdentifier.getSignedBy()); > + if (signedByComparison != 0) { > + return signedByComparison; > + } > + > + return Integer.compare(this.getPrincipals().hashCode(), policyIdentifier.getPrincipals().hashCode()); > + } > + Well ths one looks scary :D I would change changelog a bit, as this method do not implement compare. Also I woudl rename it - like comapreComaprable() ?-) > + private static > int compare(T a, T b) { > + if (a == null && b != null) { > + return 1; > + } else if (a != null && b == null) { > + return -1; > + } else if (a == b) { > + return 0; > + } else { > + return a.compareTo(b); > + } > + } > } > Good to go after reconsidering above three nits. Thanx! J. From jvanek at redhat.com Mon Aug 17 08:35:53 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Aug 2015 10:35:53 +0200 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55BA8C38.9090101@redhat.com> References: <55BA8C38.9090101@redhat.com> Message-ID: <55D19CE9.6030204@redhat.com> On 07/30/2015 10:42 PM, Andrew Azores wrote: > Hi, > > This patch makes it so that the list of entries/identifiers in PolicyEditor is sorted, mainly so > that entries will appear with a consistent ordering. This also guarantees that the > ALL_APPLETS_IDENTIFIER is always the least element and thus always appears consistently at the top > of the list. > Also please add unittests so we can see what order is actually expected.... Thanx! J, From jvanek at redhat.com Mon Aug 17 08:41:34 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Aug 2015 10:41:34 +0200 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55BAA2E8.6010203@redhat.com> References: <55BAA2E8.6010203@redhat.com> Message-ID: <55D19E3E.4070806@redhat.com> On 07/31/2015 12:19 AM, Andrew Azores wrote: > Hi, > > This patch makes it so that PolicyEditor dies immediately if given invalid arguments via -codebase, > -signedby, or -principals CLI switches. > > -- > Thanks, > > Andrew Azores > > > exception-on-invalid-selector.patch > > > # HG changeset patch > # User Andrew Azores > # Date 1438294716 14400 > # Thu Jul 30 18:18:36 2015 -0400 > # Node ID 5f4260d54edaed95ece92ba7934f003275250919 > # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 > PolicyEditor dies when given invalid -codebase or -principals arguments > > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > (main): extracted helper method for getting codebase argument. Throw > IllegalArgumentException when given invalid arguments to selector switches > (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new > methods > (cleanFilePathArgument): make parameter final for consistent style > * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java > (testGetCodebaseArgument, testGetCodebaseArgument2, > testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, > testGetPrincipalsArgument, testGetPrincipalsArgument2, > testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, > testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): new tests > > diff --git a/ChangeLog b/ChangeLog > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,19 @@ > +2015-07-30 Andrew Azores > + > + PolicyEditor dies when given invalid -codebase or -principals arguments > + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > + (main): extracted helper method for getting codebase argument. Throw > + IllegalArgumentException when given invalid arguments to selector switches > + (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new > + methods > + (cleanFilePathArgument): make parameter final for consistent style > + * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java > + (testGetCodebaseArgument, testGetCodebaseArgument2, > + testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, > + testGetPrincipalsArgument, testGetPrincipalsArgument2, > + testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, > + testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): new tests > + > 2015-07-30 Andrew Azores > > Add tests for PolicyEditor.getFilePathArgument > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > @@ -1759,18 +1759,16 @@ > // not really important, so just ignore > } > > + > + final String filepath = getFilePathArgument(optionParser); > + final String codebase = getCodebaseArgument(optionParser); > + final String signedBy = getSignedByArgument(optionParser); > + final Set principals = getPrincipalsArgument(optionParser); > + > SwingUtilities.invokeLater(new Runnable() { > @Override > public void run() { > - final String filepath = getFilePathArgument(optionParser); > final PolicyEditorWindow frame = getPolicyEditorFrame(filepath); > - final String codebase = optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); > - final String signedBy = optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); > - final List rawPrincipals = optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); > - final Set principals = new HashSet<>(); > - for (int i = 0; i < rawPrincipals.size(); i+= 2) { > - principals.add(new PolicyParser.PrincipalEntry(rawPrincipals.get(i), rawPrincipals.get(i + 1))); > - } > frame.getPolicyEditor().openPolicyFileSynchronously(); > frame.getPolicyEditor().addNewEntry(new PolicyIdentifier(signedBy, principals, codebase)); > frame.asWindow().setVisible(true); > @@ -1778,7 +1776,50 @@ > }); > } > > - static String getFilePathArgument(OptionParser optionParser) { > + static String getCodebaseArgument(final OptionParser optionParser) { > + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.CODEBASE)) { > + final String codebase = optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); > + try { > + new URL(codebase); > + } catch (final MalformedURLException e) { > + throw new IllegalArgumentException("Invalid URL", e); > + } > + return codebase; > + } else { > + return null; > + } > + } > + > + static String getSignedByArgument(final OptionParser optionParser) { > + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.SIGNEDBY)) { > + final String signedBy = optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); > + if (signedBy.isEmpty()) { > + throw new IllegalArgumentException("SignedBy cannot be empty"); > + } else { > + return signedBy; > + } > + } else { > + return null; > + } > + } > + > + static Set getPrincipalsArgument(final OptionParser optionParser) { > + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.PRINCIPALS)) { > + final List rawPrincipals = optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); > + if (rawPrincipals.size() % 2 != 0) { > + throw new IllegalArgumentException("List of principals must have an even number of elements: " + rawPrincipals); This does not seems right.p ITs deffined as: PRINCIPALS("-principals", "class_name principal_name", "PBOPrincipals", NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); So even should be already thrown. Also the test for case like String[] args = new String[] { "-principals", "aa", "bb" }; is missing. Thanx! J. > + } > + final Set principals = new HashSet<>(); > + for (int i = 0; i < rawPrincipals.size(); i+= 2) { > + principals.add(new PolicyParser.PrincipalEntry(rawPrincipals.get(i), rawPrincipals.get(i + 1))); > + } > + return principals; > + } else { > + return Collections.emptySet(); > + } > + } > + > + static String getFilePathArgument(final OptionParser optionParser) { > final boolean openDefaultFile = optionParser.hasOption(OptionsDefinitions.OPTIONS.DEFAULTFILE); > final boolean hasFileArgument = optionParser.hasOption(OptionsDefinitions.OPTIONS.FILE); > final boolean hasMainArgument = optionParser.mainArgExists(); > @@ -1804,7 +1845,7 @@ > return filepath; > } > > - private static String cleanFilePathArgument(String filepath) { > + private static String cleanFilePathArgument(final String filepath) { > if (filepath == null) { > return null; > } else if (filepath.isEmpty() || filepath.trim().isEmpty()) { > diff --git a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java > --- a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java > +++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java > @@ -46,12 +46,14 @@ > import java.net.URISyntaxException; > import java.util.Collection; > import java.util.HashSet; > +import java.util.List; > import java.util.Map; > import java.util.Set; > > import net.sourceforge.jnlp.OptionsDefinitions; > import net.sourceforge.jnlp.config.PathsAndFiles; > import net.sourceforge.jnlp.util.optionparser.OptionParser; > +import net.sourceforge.jnlp.util.optionparser.UnevenParameterException; > import org.junit.Before; > import org.junit.Test; > import sun.security.provider.PolicyParser; > @@ -375,4 +377,72 @@ > PolicyEditor.getFilePathArgument(optionParser); > } > > + @Test > + public void testGetCodebaseArgument() { > + String[] args = new String[] { "-codebase","http://example.com" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + String result = PolicyEditor.getCodebaseArgument(optionParser); > + assertTrue(result.equals("http://example.com")); > + } > + > + @Test(expected = IllegalArgumentException.class) > + public void testGetCodebaseArgument2() { > + String[] args = new String[] { "-codebase", "" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + PolicyEditor.getCodebaseArgument(optionParser); > + } > + > + @Test(expected = IllegalArgumentException.class) > + public void testGetCodebaseArgument3() { > + String[] args = new String[] { "-codebase", "example.com" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + PolicyEditor.getCodebaseArgument(optionParser); > + } > + > + @Test(expected = IllegalArgumentException.class) > + public void testGetCodebaseArgumentWhenNotProvided() { > + String[] args = new String[] { "-codebase" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + String result = PolicyEditor.getCodebaseArgument(optionParser); > + } > + > + @Test > + public void testGetPrincipalsArgument() { > + String[] args = new String[] { "-principals", "aa=bb" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + Set result = PolicyEditor.getPrincipalsArgument(optionParser); > + assertTrue(result.size() == 1); > + assertTrue(result.contains(new PolicyParser.PrincipalEntry("aa", "bb"))); > + } > + > + @Test(expected = UnevenParameterException.class) > + public void testGetPrincipalsArgument2() { > + String[] args = new String[] { "-principals", "aa=bb", "cc" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + PolicyEditor.getPrincipalsArgument(optionParser); > + } > + > + @Test > + public void testGetPrincipalsArgumentWhenNotProvided() { > + String[] args = new String[] { "-principals" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + Set result = PolicyEditor.getPrincipalsArgument(optionParser); > + assertTrue(result.isEmpty()); > + } > + > + @Test > + public void testGetSignedByArgument() { > + String[] args = new String[] { "-signedby", "foo" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + String result = PolicyEditor.getSignedByArgument(optionParser); > + assertTrue(result.equals("foo")); > + } > + > + @Test > + public void testGetSignedByArgumentWhenNotProvided() { > + String[] args = new String[] { "-signedby" }; > + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); > + String result = PolicyEditor.getSignedByArgument(optionParser); > + assertTrue("expected null, got: " + result, result == null); > + } > } > From bugzilla-daemon at icedtea.classpath.org Mon Aug 17 15:01:02 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Aug 2015 15:01:02 +0000 Subject: [Bug 2289] Internal Error (safepoint.cpp:321) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2289 --- Comment #21 from Daniel Moran --- Update: TL;DR version - Cause is related to hardware interrupts. Unsure why or what is causing to narrow down further. Long version - Was tinkering with wifi while doing a build yesterday and I noticed a correlation with the hang. If I cycled the wi-fi module on/off, it would progress slightly and still hang. If did it enough times the hang would clear without the safepoint error. Also worked with unplugging and plugging back in a USB adapter. Tried 1-3 from here: https://help.ubuntu.com/community/DebuggingIRQProblems. Still hangs. Changing BIOS settings - now focusing on h/w interrupts and power states - still gets the one time good boot and then hangs on successive reboots. Hope this helps narrow down the issue. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aazores at redhat.com Mon Aug 17 18:29:21 2015 From: aazores at redhat.com (Andrew Azores) Date: Mon, 17 Aug 2015 14:29:21 -0400 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55D19E3E.4070806@redhat.com> References: <55BAA2E8.6010203@redhat.com> <55D19E3E.4070806@redhat.com> Message-ID: <55D22801.6020805@redhat.com> On 17/08/15 04:41 AM, Jiri Vanek wrote: > On 07/31/2015 12:19 AM, Andrew Azores wrote: >> Hi, >> >> This patch makes it so that PolicyEditor dies immediately if given >> invalid arguments via -codebase, >> -signedby, or -principals CLI switches. >> >> -- >> Thanks, >> >> Andrew Azores >> >> >> exception-on-invalid-selector.patch >> >> >> # HG changeset patch >> # User Andrew Azores >> # Date 1438294716 14400 >> # Thu Jul 30 18:18:36 2015 -0400 >> # Node ID 5f4260d54edaed95ece92ba7934f003275250919 >> # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 >> PolicyEditor dies when given invalid -codebase or -principals arguments >> >> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> (main): extracted helper method for getting codebase argument. Throw >> IllegalArgumentException when given invalid arguments to selector >> switches >> (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new >> methods >> (cleanFilePathArgument): make parameter final for consistent style >> * >> tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java >> (testGetCodebaseArgument, testGetCodebaseArgument2, >> testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, >> testGetPrincipalsArgument, testGetPrincipalsArgument2, >> testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, >> testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): new >> tests >> >> diff --git a/ChangeLog b/ChangeLog >> --- a/ChangeLog >> +++ b/ChangeLog >> @@ -1,3 +1,19 @@ >> +2015-07-30 Andrew Azores >> + >> + PolicyEditor dies when given invalid -codebase or -principals >> arguments >> + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> + (main): extracted helper method for getting codebase argument. >> Throw >> + IllegalArgumentException when given invalid arguments to >> selector switches >> + (getCodebaseArgument, getSignedByArgument, >> getPrincipalsArgument): new >> + methods >> + (cleanFilePathArgument): make parameter final for consistent style >> + * >> tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java >> + (testGetCodebaseArgument, testGetCodebaseArgument2, >> + testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, >> + testGetPrincipalsArgument, testGetPrincipalsArgument2, >> + testGetPrincipalsArgument3, >> testGetPrincipalsArgumentWhenNotProvided, >> + testGetSignedByArgument, >> testGetSignedByArgumentWhenNotProvided): new tests >> + >> 2015-07-30 Andrew Azores >> >> Add tests for PolicyEditor.getFilePathArgument >> diff --git >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> @@ -1759,18 +1759,16 @@ >> // not really important, so just ignore >> } >> >> + >> + final String filepath = getFilePathArgument(optionParser); >> + final String codebase = getCodebaseArgument(optionParser); >> + final String signedBy = getSignedByArgument(optionParser); >> + final Set principals = >> getPrincipalsArgument(optionParser); >> + >> SwingUtilities.invokeLater(new Runnable() { >> @Override >> public void run() { >> - final String filepath = >> getFilePathArgument(optionParser); >> final PolicyEditorWindow frame = >> getPolicyEditorFrame(filepath); >> - final String codebase = >> optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); >> - final String signedBy = >> optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); >> - final List rawPrincipals = >> optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); >> - final Set principals = >> new HashSet<>(); >> - for (int i = 0; i < rawPrincipals.size(); i+= 2) { >> - principals.add(new >> PolicyParser.PrincipalEntry(rawPrincipals.get(i), rawPrincipals.get(i >> + 1))); >> - } >> frame.getPolicyEditor().openPolicyFileSynchronously(); >> frame.getPolicyEditor().addNewEntry(new >> PolicyIdentifier(signedBy, principals, codebase)); >> frame.asWindow().setVisible(true); >> @@ -1778,7 +1776,50 @@ >> }); >> } >> >> - static String getFilePathArgument(OptionParser optionParser) { >> + static String getCodebaseArgument(final OptionParser >> optionParser) { >> + if >> (optionParser.hasOption(OptionsDefinitions.OPTIONS.CODEBASE)) { >> + final String codebase = >> optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); >> + try { >> + new URL(codebase); >> + } catch (final MalformedURLException e) { >> + throw new IllegalArgumentException("Invalid URL", e); >> + } >> + return codebase; >> + } else { >> + return null; >> + } >> + } >> + >> + static String getSignedByArgument(final OptionParser >> optionParser) { >> + if >> (optionParser.hasOption(OptionsDefinitions.OPTIONS.SIGNEDBY)) { >> + final String signedBy = >> optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); >> + if (signedBy.isEmpty()) { >> + throw new IllegalArgumentException("SignedBy cannot >> be empty"); >> + } else { >> + return signedBy; >> + } >> + } else { >> + return null; >> + } >> + } >> + >> + static Set >> getPrincipalsArgument(final OptionParser optionParser) { >> + if >> (optionParser.hasOption(OptionsDefinitions.OPTIONS.PRINCIPALS)) { >> + final List rawPrincipals = >> optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); >> + if (rawPrincipals.size() % 2 != 0) { >> + throw new IllegalArgumentException("List of >> principals must have an even number of elements: " + rawPrincipals); > > This does not seems right.p > ITs deffined as: > PRINCIPALS("-principals", "class_name principal_name", > "PBOPrincipals", NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); > > So even should be already thrown. Yes, the OptionParser does actually throw an UnevenParameterException in this case (which PolicyEditorTest.testGetPrincipalsArgumentWhenUnevenArgumentsProvided actually expects), but I added the check there as well just as a defensive measure. > Also the test for case like > String[] args = new String[] { "-principals", "aa", "bb" }; > is missing. > Ah good catch, thank you. Added. > Thanx! > J. >> > -- Thanks, Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: exception-on-invalid-selector-2.patch Type: text/x-patch Size: 11371 bytes Desc: not available URL: From aazores at redhat.com Mon Aug 17 18:31:03 2015 From: aazores at redhat.com (Andrew Azores) Date: Mon, 17 Aug 2015 14:31:03 -0400 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55D22801.6020805@redhat.com> References: <55BAA2E8.6010203@redhat.com> <55D19E3E.4070806@redhat.com> <55D22801.6020805@redhat.com> Message-ID: <55D22867.8060408@redhat.com> On 17/08/15 02:29 PM, Andrew Azores wrote: > On 17/08/15 04:41 AM, Jiri Vanek wrote: >> On 07/31/2015 12:19 AM, Andrew Azores wrote: >>> Hi, >>> >>> This patch makes it so that PolicyEditor dies immediately if given >>> invalid arguments via -codebase, >>> -signedby, or -principals CLI switches. >>> >>> -- >>> Thanks, >>> >>> Andrew Azores >>> >>> >>> exception-on-invalid-selector.patch >>> >>> >>> # HG changeset patch >>> # User Andrew Azores >>> # Date 1438294716 14400 >>> # Thu Jul 30 18:18:36 2015 -0400 >>> # Node ID 5f4260d54edaed95ece92ba7934f003275250919 >>> # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 >>> PolicyEditor dies when given invalid -codebase or -principals arguments >>> >>> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> (main): extracted helper method for getting codebase argument. Throw >>> IllegalArgumentException when given invalid arguments to selector >>> switches >>> (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new >>> methods >>> (cleanFilePathArgument): make parameter final for consistent style >>> * >>> tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java >>> (testGetCodebaseArgument, testGetCodebaseArgument2, >>> testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, >>> testGetPrincipalsArgument, testGetPrincipalsArgument2, >>> testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, >>> testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): >>> new tests >>> >>> diff --git a/ChangeLog b/ChangeLog >>> --- a/ChangeLog >>> +++ b/ChangeLog >>> @@ -1,3 +1,19 @@ >>> +2015-07-30 Andrew Azores >>> + >>> + PolicyEditor dies when given invalid -codebase or -principals >>> arguments >>> + * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> + (main): extracted helper method for getting codebase argument. >>> Throw >>> + IllegalArgumentException when given invalid arguments to >>> selector switches >>> + (getCodebaseArgument, getSignedByArgument, >>> getPrincipalsArgument): new >>> + methods >>> + (cleanFilePathArgument): make parameter final for consistent style >>> + * >>> tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java >>> + (testGetCodebaseArgument, testGetCodebaseArgument2, >>> + testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, >>> + testGetPrincipalsArgument, testGetPrincipalsArgument2, >>> + testGetPrincipalsArgument3, >>> testGetPrincipalsArgumentWhenNotProvided, >>> + testGetSignedByArgument, >>> testGetSignedByArgumentWhenNotProvided): new tests >>> + >>> 2015-07-30 Andrew Azores >>> >>> Add tests for PolicyEditor.getFilePathArgument >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> @@ -1759,18 +1759,16 @@ >>> // not really important, so just ignore >>> } >>> >>> + >>> + final String filepath = getFilePathArgument(optionParser); >>> + final String codebase = getCodebaseArgument(optionParser); >>> + final String signedBy = getSignedByArgument(optionParser); >>> + final Set principals = >>> getPrincipalsArgument(optionParser); >>> + >>> SwingUtilities.invokeLater(new Runnable() { >>> @Override >>> public void run() { >>> - final String filepath = >>> getFilePathArgument(optionParser); >>> final PolicyEditorWindow frame = >>> getPolicyEditorFrame(filepath); >>> - final String codebase = >>> optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); >>> - final String signedBy = >>> optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); >>> - final List rawPrincipals = >>> optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); >>> - final Set principals = >>> new HashSet<>(); >>> - for (int i = 0; i < rawPrincipals.size(); i+= 2) { >>> - principals.add(new >>> PolicyParser.PrincipalEntry(rawPrincipals.get(i), >>> rawPrincipals.get(i + 1))); >>> - } >>> frame.getPolicyEditor().openPolicyFileSynchronously(); >>> frame.getPolicyEditor().addNewEntry(new >>> PolicyIdentifier(signedBy, principals, codebase)); >>> frame.asWindow().setVisible(true); >>> @@ -1778,7 +1776,50 @@ >>> }); >>> } >>> >>> - static String getFilePathArgument(OptionParser optionParser) { >>> + static String getCodebaseArgument(final OptionParser >>> optionParser) { >>> + if >>> (optionParser.hasOption(OptionsDefinitions.OPTIONS.CODEBASE)) { >>> + final String codebase = >>> optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); >>> + try { >>> + new URL(codebase); >>> + } catch (final MalformedURLException e) { >>> + throw new IllegalArgumentException("Invalid URL", e); >>> + } >>> + return codebase; >>> + } else { >>> + return null; >>> + } >>> + } >>> + >>> + static String getSignedByArgument(final OptionParser >>> optionParser) { >>> + if >>> (optionParser.hasOption(OptionsDefinitions.OPTIONS.SIGNEDBY)) { >>> + final String signedBy = >>> optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); >>> + if (signedBy.isEmpty()) { >>> + throw new IllegalArgumentException("SignedBy cannot >>> be empty"); >>> + } else { >>> + return signedBy; >>> + } >>> + } else { >>> + return null; >>> + } >>> + } >>> + >>> + static Set >>> getPrincipalsArgument(final OptionParser optionParser) { >>> + if >>> (optionParser.hasOption(OptionsDefinitions.OPTIONS.PRINCIPALS)) { >>> + final List rawPrincipals = >>> optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); >>> + if (rawPrincipals.size() % 2 != 0) { >>> + throw new IllegalArgumentException("List of >>> principals must have an even number of elements: " + rawPrincipals); >> >> This does not seems right.p >> ITs deffined as: >> PRINCIPALS("-principals", "class_name principal_name", >> "PBOPrincipals", NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); >> >> So even should be already thrown. > > Yes, the OptionParser does actually throw an UnevenParameterException > in this case (which > PolicyEditorTest.testGetPrincipalsArgumentWhenUnevenArgumentsProvided > actually expects), but I added the check there as well just as a > defensive measure. > >> Also the test for case like >> String[] args = new String[] { "-principals", "aa", "bb" }; >> is missing. >> > Ah good catch, thank you. Added. > >> Thanx! >> J. >>> >> > > Sorry, this is the correct patch. -- Thanks, Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: exception-on-invalid-selector-2.patch Type: text/x-patch Size: 11397 bytes Desc: not available URL: From aazores at redhat.com Mon Aug 17 19:57:47 2015 From: aazores at redhat.com (Andrew Azores) Date: Mon, 17 Aug 2015 15:57:47 -0400 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55D1751C.2050308@redhat.com> References: <55BA8C38.9090101@redhat.com> <55D1751C.2050308@redhat.com> Message-ID: <55D23CBB.1030202@redhat.com> On 17/08/15 01:46 AM, Jiri Vanek wrote: > On 07/30/2015 10:42 PM, Andrew Azores wrote: >> Hi, >> >> This patch makes it so that the list of entries/identifiers in >> PolicyEditor is sorted, mainly so >> that entries will appear with a consistent ordering. This also >> guarantees that the >> ALL_APPLETS_IDENTIFIER is always the least element and thus always >> appears consistently at the top > > Good nit ;) > >> of the list. >> >> -- >> Thanks, >> >> Andrew Azores >> >> >> sorted-policyeditor-list.patch >> >> >> # HG changeset patch >> # User Andrew Azores >> # Date 1438288913 14400 >> # Thu Jul 30 16:41:53 2015 -0400 >> # Node ID bce05dbb84e73eff67dc8ac6af9509a5eaf36b8a >> # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 >> Sort identifiers list in PolicyEditor >> >> * NEWS: add note about sorting >> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> (addNewEntry): clear listModel before adding new identifiers from >> policyEditorController. Controller handles sorting results for us, so we >> just clear and repopulate the UI. >> * >> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> (getIdentifiers): return TreeSet rather than HashSet because of TreeSet >> providing sorting >> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >> (getIdentifiers): likewise >> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> (compareTo, compare): new methods for implementing Comparable >> >> diff --git a/ChangeLog b/ChangeLog >> --- a/ChangeLog >> +++ b/ChangeLog >> @@ -1,3 +1,19 @@ >> +2015-07-30 Andrew Azores >> + >> + Sort identifiers list in PolicyEditor >> + * NEWS: add note about sorting >> + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> + (addNewEntry): clear listModel before adding new identifiers from >> + policyEditorController. Controller handles sorting results for >> us, so we >> + just clear and repopulate the UI. >> + * >> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> + (getIdentifiers): return TreeSet rather than HashSet because of >> TreeSet >> + providing sorting >> + * >> netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >> + (getIdentifiers): likewise >> + * >> netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> + (compareTo, compare): new methods for implementing Comparable >> + >> 2015-07-30 Andrew Azores >> >> Add tests for PolicyEditor.getFilePathArgument >> diff --git a/NEWS b/NEWS >> --- a/NEWS >> +++ b/NEWS >> @@ -29,6 +29,7 @@ >> - fixed issues with -html shortcuts >> - fixed issue with -html receiving garbage in width and height >> * PolicyEditor >> + - Entry list is sorted, entries will appear with consistent ordering > > I would probably not include this to NEWS as it is small > implementation detail. But Its up to you, > >> - file flag made to work when used standalone >> - file flag cannot be used in combination with main argument >> - defaultfile flag added >> diff --git >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >> @@ -840,6 +840,7 @@ >> invokeRunnableOrEnqueueLater(new Runnable() { >> @Override >> public void run() { >> + listModel.clear(); > > Why the clear was not necessary before? Since this is being done on an addition operation (addNewEntry), the listModel is expected to already contain most of the PolicyIdentifiers which policyEditorController.getIdentifiers() returns to us. We iterate over that collection and add any missing elements into the list in the order we come across them. This no longer works, however, if we expect that policyEditorController.getIdentifiers() is returning to us a *sorted* collection, because listModel.addElement() will just append whichever new items we find to the end of the list, so the sorting is not preserved in the UI. Rather than performing a sort on the listModel (which there isn't even a very nice way to do), it made more sense to me to just clear the listModel and re-add everything that the PolicyEditorController gives back, since that's supposed to be the canonical source of information anyway. This also goes along with the old task of reducing the statefulness of the UI and doing more MVC refactoring work to PolicyEditor, which I never got around to way back when. I have been chipping away at that lately, though. Not sure when that patch might come out. > >> for (final PolicyIdentifier identifier : >> policyEditorController.getIdentifiers()) { >> if (!listModel.contains(identifier)) { >> listModel.addElement(identifier); >> diff --git >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> >> --- >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> +++ >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >> @@ -48,6 +48,8 @@ >> import java.util.HashSet; >> import java.util.Map; >> import java.util.Set; >> +import java.util.SortedSet; >> +import java.util.TreeSet; >> >> import net.sourceforge.jnlp.util.logging.OutputController; >> import sun.security.provider.PolicyParser; >> @@ -102,8 +104,8 @@ >> policyFile.removeIdentifier(identifier); >> } >> >> - public Set getIdentifiers() { >> - return new HashSet<>(policyFile.getIdentifiers()); >> + public SortedSet getIdentifiers() { >> + return new TreeSet<>(policyFile.getIdentifiers()); > > Good idea! > >> } >> >> public Map> Boolean>> getCopyOfPermissions() { >> diff --git >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >> >> --- >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >> +++ >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >> @@ -48,6 +48,8 @@ >> import java.util.Map; >> import java.util.Objects; >> import java.util.Set; >> +import java.util.SortedSet; >> +import java.util.TreeSet; >> >> import net.sourceforge.jnlp.util.FileUtils; >> import net.sourceforge.jnlp.util.MD5SumWatcher; >> @@ -201,8 +203,8 @@ >> return fileWatcher != null && fileWatcher.update(); >> } >> >> - synchronized Set getIdentifiers() { >> - return new HashSet<>(permissionsMap.keySet()); >> + synchronized SortedSet getIdentifiers() { >> + return new TreeSet<>(permissionsMap.keySet()); >> } >> >> synchronized KeystoreInfo getKeystoreInfo() { >> diff --git >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> --- >> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> +++ >> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >> @@ -43,10 +43,12 @@ >> import java.util.ArrayList; >> import java.util.Collection; >> import java.util.Collections; >> +import java.util.LinkedHashSet; >> import java.util.List; >> +import java.util.Set; >> >> //http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html >> -public class PolicyIdentifier implements Serializable { >> +public class PolicyIdentifier implements >> Comparable, Serializable { >> >> public static final PolicyIdentifier ALL_APPLETS_IDENTIFIER = >> new PolicyIdentifier(null, >> Collections.emptySet(), null) { >> @Override >> @@ -56,7 +58,7 @@ >> }; >> >> private final String signedBy; >> - private final List principals = new >> ArrayList<>(); >> + private final LinkedHashSet >> principals = new LinkedHashSet<>(); >> private final String codebase; >> >> public PolicyIdentifier(final String signedBy, final >> Collection principals, final String >> codebase) { >> @@ -77,7 +79,7 @@ >> return signedBy; >> } >> >> - public List getPrincipals() { >> + public Set getPrincipals() { >> return principals; >> } >> >> @@ -144,4 +146,39 @@ >> result = 31 * result + (codebase.hashCode()); >> return result; >> } >> + >> + @Override >> + public int compareTo(PolicyIdentifier policyIdentifier) { >> + if (this.equals(ALL_APPLETS_IDENTIFIER) && >> policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >> + return 0; >> + } else if (this.equals(ALL_APPLETS_IDENTIFIER) && >> !policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >> + return -1; >> + } else if (!this.equals(ALL_APPLETS_IDENTIFIER) && >> policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >> + return 1; >> + } >> + >> + final int codebaseComparison = compare(this.getCodebase(), >> policyIdentifier.getCodebase()); >> + if (codebaseComparison != 0) { >> + return codebaseComparison; >> + } >> + >> + final int signedByComparison = compare(this.getSignedBy(), >> policyIdentifier.getSignedBy()); >> + if (signedByComparison != 0) { >> + return signedByComparison; >> + } >> + >> + return Integer.compare(this.getPrincipals().hashCode(), >> policyIdentifier.getPrincipals().hashCode()); >> + } >> + > > Well ths one looks scary :D > I would change changelog a bit, as this method do not implement compare. > Also I woudl rename it - like comapreComaprable() ?-) What do you mean... ? This patch makes it so that PolicyIdentifier implements Comparable and this 'int compareTo(PolicyIdentifier policyIdentifier)' is there to fulfill that contract. The static helper method 'compare(T a, T b)' is just there to simplify null-checking and comparison of two Comparables, like codebases and signedBys. The first part of it is just guaranteeing that ALL_APPLETS_IDENTIFIER is always less than any other PolicyIdentifier, other than itself. The following parts just sort the identifiers normally with codebase being the primary sort attribute, then signedBy, and finally principals. > >> + private static > int compare(T a, T b) { >> + if (a == null && b != null) { >> + return 1; >> + } else if (a != null && b == null) { >> + return -1; >> + } else if (a == b) { >> + return 0; >> + } else { >> + return a.compareTo(b); >> + } >> + } >> } >> > > Good to go after reconsidering above three nits. > > Thanx! > J. > > >> Hi, >> >> This patch makes it so that the list of entries/identifiers in >> PolicyEditor is sorted, mainly so >> that entries will appear with a consistent ordering. This also >> guarantees that the >> ALL_APPLETS_IDENTIFIER is always the least element and thus always >> appears consistently at the top >> of the list. >> > Also please add unittests so we can see what order is actually > expected.... > > Thanx! > > > J, Tests added, new patch attached. -- Thanks, Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: sorted-policyeditor-list-2.patch Type: text/x-patch Size: 15744 bytes Desc: not available URL: From aazores at redhat.com Mon Aug 17 21:08:47 2015 From: aazores at redhat.com (Andrew Azores) Date: Mon, 17 Aug 2015 17:08:47 -0400 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55D23CBB.1030202@redhat.com> References: <55BA8C38.9090101@redhat.com> <55D1751C.2050308@redhat.com> <55D23CBB.1030202@redhat.com> Message-ID: <55D24D5F.6000105@redhat.com> On 17/08/15 03:57 PM, Andrew Azores wrote: > On 17/08/15 01:46 AM, Jiri Vanek wrote: >> On 07/30/2015 10:42 PM, Andrew Azores wrote: >>> Hi, >>> >>> This patch makes it so that the list of entries/identifiers in >>> PolicyEditor is sorted, mainly so >>> that entries will appear with a consistent ordering. This also >>> guarantees that the >>> ALL_APPLETS_IDENTIFIER is always the least element and thus always >>> appears consistently at the top >> >> Good nit ;) >> >>> of the list. >>> >>> -- >>> Thanks, >>> >>> Andrew Azores >>> >>> >>> sorted-policyeditor-list.patch >>> >>> >>> # HG changeset patch >>> # User Andrew Azores >>> # Date 1438288913 14400 >>> # Thu Jul 30 16:41:53 2015 -0400 >>> # Node ID bce05dbb84e73eff67dc8ac6af9509a5eaf36b8a >>> # Parent 09792ebffb27b328f47e5ab5f5e075f2c2fe0a18 >>> Sort identifiers list in PolicyEditor >>> >>> * NEWS: add note about sorting >>> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> (addNewEntry): clear listModel before adding new identifiers from >>> policyEditorController. Controller handles sorting results for us, >>> so we >>> just clear and repopulate the UI. >>> * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> (getIdentifiers): return TreeSet rather than HashSet because of TreeSet >>> providing sorting >>> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> (getIdentifiers): likewise >>> * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> (compareTo, compare): new methods for implementing Comparable >>> >>> diff --git a/ChangeLog b/ChangeLog >>> --- a/ChangeLog >>> +++ b/ChangeLog >>> @@ -1,3 +1,19 @@ >>> +2015-07-30 Andrew Azores >>> + >>> + Sort identifiers list in PolicyEditor >>> + * NEWS: add note about sorting >>> + * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> + (addNewEntry): clear listModel before adding new identifiers from >>> + policyEditorController. Controller handles sorting results for >>> us, so we >>> + just clear and repopulate the UI. >>> + * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> + (getIdentifiers): return TreeSet rather than HashSet because of >>> TreeSet >>> + providing sorting >>> + * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> + (getIdentifiers): likewise >>> + * >>> netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> + (compareTo, compare): new methods for implementing Comparable >>> + >>> 2015-07-30 Andrew Azores >>> >>> Add tests for PolicyEditor.getFilePathArgument >>> diff --git a/NEWS b/NEWS >>> --- a/NEWS >>> +++ b/NEWS >>> @@ -29,6 +29,7 @@ >>> - fixed issues with -html shortcuts >>> - fixed issue with -html receiving garbage in width and height >>> * PolicyEditor >>> + - Entry list is sorted, entries will appear with consistent ordering >> >> I would probably not include this to NEWS as it is small >> implementation detail. But Its up to you, >> >>> - file flag made to work when used standalone >>> - file flag cannot be used in combination with main argument >>> - defaultfile flag added >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> @@ -840,6 +840,7 @@ >>> invokeRunnableOrEnqueueLater(new Runnable() { >>> @Override >>> public void run() { >>> + listModel.clear(); >> >> Why the clear was not necessary before? > > Since this is being done on an addition operation (addNewEntry), the > listModel is expected to already contain most of the PolicyIdentifiers > which policyEditorController.getIdentifiers() returns to us. We > iterate over that collection and add any missing elements into the > list in the order we come across them. This no longer works, however, > if we expect that policyEditorController.getIdentifiers() is returning > to us a *sorted* collection, because listModel.addElement() will just > append whichever new items we find to the end of the list, so the > sorting is not preserved in the UI. Rather than performing a sort on > the listModel (which there isn't even a very nice way to do), it made > more sense to me to just clear the listModel and re-add everything > that the PolicyEditorController gives back, since that's supposed to > be the canonical source of information anyway. > > This also goes along with the old task of reducing the statefulness of > the UI and doing more MVC refactoring work to PolicyEditor, which I > never got around to way back when. I have been chipping away at that > lately, though. Not sure when that patch might come out. > >> >>> for (final PolicyIdentifier identifier : >>> policyEditorController.getIdentifiers()) { >>> if (!listModel.contains(identifier)) { >>> listModel.addElement(identifier); >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> >>> --- >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> +++ >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java >>> @@ -48,6 +48,8 @@ >>> import java.util.HashSet; >>> import java.util.Map; >>> import java.util.Set; >>> +import java.util.SortedSet; >>> +import java.util.TreeSet; >>> >>> import net.sourceforge.jnlp.util.logging.OutputController; >>> import sun.security.provider.PolicyParser; >>> @@ -102,8 +104,8 @@ >>> policyFile.removeIdentifier(identifier); >>> } >>> >>> - public Set getIdentifiers() { >>> - return new HashSet<>(policyFile.getIdentifiers()); >>> + public SortedSet getIdentifiers() { >>> + return new TreeSet<>(policyFile.getIdentifiers()); >> >> Good idea! >> >>> } >>> >>> public Map>> Boolean>> getCopyOfPermissions() { >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> --- >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> +++ >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java >>> @@ -48,6 +48,8 @@ >>> import java.util.Map; >>> import java.util.Objects; >>> import java.util.Set; >>> +import java.util.SortedSet; >>> +import java.util.TreeSet; >>> >>> import net.sourceforge.jnlp.util.FileUtils; >>> import net.sourceforge.jnlp.util.MD5SumWatcher; >>> @@ -201,8 +203,8 @@ >>> return fileWatcher != null && fileWatcher.update(); >>> } >>> >>> - synchronized Set getIdentifiers() { >>> - return new HashSet<>(permissionsMap.keySet()); >>> + synchronized SortedSet getIdentifiers() { >>> + return new TreeSet<>(permissionsMap.keySet()); >>> } >>> >>> synchronized KeystoreInfo getKeystoreInfo() { >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> --- >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> +++ >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java >>> @@ -43,10 +43,12 @@ >>> import java.util.ArrayList; >>> import java.util.Collection; >>> import java.util.Collections; >>> +import java.util.LinkedHashSet; >>> import java.util.List; >>> +import java.util.Set; >>> >>> //http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html >>> >>> -public class PolicyIdentifier implements Serializable { >>> +public class PolicyIdentifier implements >>> Comparable, Serializable { >>> >>> public static final PolicyIdentifier ALL_APPLETS_IDENTIFIER = >>> new PolicyIdentifier(null, >>> Collections.emptySet(), null) { >>> @Override >>> @@ -56,7 +58,7 @@ >>> }; >>> >>> private final String signedBy; >>> - private final List principals = >>> new ArrayList<>(); >>> + private final LinkedHashSet >>> principals = new LinkedHashSet<>(); >>> private final String codebase; >>> >>> public PolicyIdentifier(final String signedBy, final >>> Collection principals, final String >>> codebase) { >>> @@ -77,7 +79,7 @@ >>> return signedBy; >>> } >>> >>> - public List getPrincipals() { >>> + public Set getPrincipals() { >>> return principals; >>> } >>> >>> @@ -144,4 +146,39 @@ >>> result = 31 * result + (codebase.hashCode()); >>> return result; >>> } >>> + >>> + @Override >>> + public int compareTo(PolicyIdentifier policyIdentifier) { >>> + if (this.equals(ALL_APPLETS_IDENTIFIER) && >>> policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >>> + return 0; >>> + } else if (this.equals(ALL_APPLETS_IDENTIFIER) && >>> !policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >>> + return -1; >>> + } else if (!this.equals(ALL_APPLETS_IDENTIFIER) && >>> policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { >>> + return 1; >>> + } >>> + >>> + final int codebaseComparison = compare(this.getCodebase(), >>> policyIdentifier.getCodebase()); >>> + if (codebaseComparison != 0) { >>> + return codebaseComparison; >>> + } >>> + >>> + final int signedByComparison = compare(this.getSignedBy(), >>> policyIdentifier.getSignedBy()); >>> + if (signedByComparison != 0) { >>> + return signedByComparison; >>> + } >>> + >>> + return Integer.compare(this.getPrincipals().hashCode(), >>> policyIdentifier.getPrincipals().hashCode()); >>> + } >>> + >> >> Well ths one looks scary :D >> I would change changelog a bit, as this method do not implement compare. >> Also I woudl rename it - like comapreComaprable() ?-) > > What do you mean... ? This patch makes it so that PolicyIdentifier > implements Comparable and this 'int > compareTo(PolicyIdentifier policyIdentifier)' is there to fulfill that > contract. The static helper method 'compare(T a, T b)' is just there > to simplify null-checking and comparison of two Comparables, like > codebases and signedBys. > > The first part of it is just guaranteeing that ALL_APPLETS_IDENTIFIER > is always less than any other PolicyIdentifier, other than itself. The > following parts just sort the identifiers normally with codebase being > the primary sort attribute, then signedBy, and finally principals. > > >> >>> + private static > int compare(T a, T b) { >>> + if (a == null && b != null) { >>> + return 1; >>> + } else if (a != null && b == null) { >>> + return -1; >>> + } else if (a == b) { >>> + return 0; >>> + } else { >>> + return a.compareTo(b); >>> + } >>> + } >>> } >>> >> >> Good to go after reconsidering above three nits. >> >> Thanx! >> J. >> > >> >>> Hi, >>> >>> This patch makes it so that the list of entries/identifiers in >>> PolicyEditor is sorted, mainly so >>> that entries will appear with a consistent ordering. This also >>> guarantees that the >>> ALL_APPLETS_IDENTIFIER is always the least element and thus always >>> appears consistently at the top >>> of the list. >>> >> Also please add unittests so we can see what order is actually >> expected.... >> >> Thanx! >> >> >> J, > > Tests added, new patch attached. > Ha! Sorry, new patch attached. The license header in PolicyIdentifierTest was the wrong one :) no changes otherwise. -- Thanks, Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: sorted-policyeditor-list-2.patch Type: text/x-patch Size: 15705 bytes Desc: not available URL: From ptisnovs at icedtea.classpath.org Tue Aug 18 11:46:45 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 18 Aug 2015 11:46:45 +0000 Subject: /hg/gfx-test: New tests added into BitBltUsingBgColor. Message-ID: changeset 03a29500ef5b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=03a29500ef5b author: Pavel Tisnovsky date: Tue Aug 18 13:49:29 2015 +0200 New tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 176 ++++++++++---------- 2 files changed, 93 insertions(+), 88 deletions(-) diffs (289 lines): diff -r 21eedd1b9fa9 -r 03a29500ef5b ChangeLog --- a/ChangeLog Fri Aug 14 12:04:03 2015 +0200 +++ b/ChangeLog Tue Aug 18 13:49:29 2015 +0200 @@ -1,3 +1,8 @@ +2015-08-18 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + New tests added into BitBltUsingBgColor. + 2015-08-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 21eedd1b9fa9 -r 03a29500ef5b src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Aug 14 12:04:03 2015 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Aug 18 13:49:29 2015 +0200 @@ -10291,7 +10291,7 @@ } /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. * Background color is set to Color.magenta. * * @param image @@ -10300,13 +10300,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. * Background color is set to Color.yellow. * * @param image @@ -10315,13 +10315,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. * Background color is set to Color.white. * * @param image @@ -10330,13 +10330,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.black. * * @param image @@ -10345,13 +10345,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.blue. * * @param image @@ -10360,13 +10360,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.green. * * @param image @@ -10375,13 +10375,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.cyan. * * @param image @@ -10390,13 +10390,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.red. * * @param image @@ -10405,13 +10405,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.magenta. * * @param image @@ -10420,13 +10420,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.yellow. * * @param image @@ -10435,13 +10435,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. * Background color is set to Color.white. * * @param image @@ -10450,13 +10450,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.white); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.black. * * @param image @@ -10465,13 +10465,13 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.black); - } - - /** - * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_Pre. + public TestResult testBitBltCheckerBufferedImageTypeByteGrayBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. * Background color is set to Color.blue. * * @param image @@ -10480,9 +10480,9 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testBitBltCheckerBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) - { - return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, Color.blue); + public TestResult testBitBltCheckerBufferedImageTypeByteGrayBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, Color.blue); } /** From andrew at icedtea.classpath.org Tue Aug 18 19:53:55 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Aug 2015 19:53:55 +0000 Subject: /hg/icedtea6: Add 1.13.8 release notes. Message-ID: changeset acc83d51b013 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=acc83d51b013 author: Andrew John Hughes date: Tue Aug 18 20:53:28 2015 +0100 Add 1.13.8 release notes. 2015-08-18 Andrew John Hughes * NEWS: Add 1.13.8 release notes. diffstat: ChangeLog | 4 ++++ NEWS | 24 ++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diffs (77 lines): diff -r f84a2e0540fa -r acc83d51b013 ChangeLog --- a/ChangeLog Thu Jul 30 22:42:11 2015 +0100 +++ b/ChangeLog Tue Aug 18 20:53:28 2015 +0100 @@ -1,3 +1,7 @@ +2015-08-18 Andrew John Hughes + + * NEWS: Add 1.13.8 release notes. + 2015-07-28 Andrew John Hughes PR2565: Replace ipv4-mapped-ipv6-addresses.patch diff -r f84a2e0540fa -r acc83d51b013 NEWS --- a/NEWS Thu Jul 30 22:42:11 2015 +0100 +++ b/NEWS Tue Aug 18 20:53:28 2015 +0100 @@ -14,6 +14,20 @@ New in release 1.14.0 (201X-XX-XX): +* Backports + - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init + - S6727719: Performance of TextLayout.getBounds() + - S6745225: Memory leak while drawing Attributed String + - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. + - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages + - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() + - S8026887: Make issues due to failed large pages allocations easier to debug +* Bug fixes + - PR1886: IcedTea does not checksum supplied tarballs + - PR2083: Add support for building Zero on AArch64 + +New in release 1.13.8 (2015-07-29): + * Security fixes - S8043202, CVE-2015-2808: Prohibit RC4 cipher suites - S8067694, CVE-2015-2625: Improved certification checking @@ -31,7 +45,6 @@ - S8075374, CVE-2015-4748: Responding to OCSP responses - S8075378, CVE-2015-4749: JNDI DnsClient Exception Handling - S8075738: Better multi-JVM sharing - - S8075833, CVE-2015-2613: Straighter Elliptic Curves - S8075838: Method for typing MethodTypes - S8075853, CVE-2015-2621: Proxy for MBean proxies - S8076328, CVE-2015-4000: Enforce key exchange constraints @@ -87,10 +100,6 @@ * Backports - S4890063, PR2306, RH1214835: HPROF: default text truncated when using doe=n option - S6562614, PR2555: Compiler warnings for gettimeofday in Inet4/Inet6AddressImpl.c - - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init - - S6727719: Performance of TextLayout.getBounds() - - S6745225: Memory leak while drawing Attributed String - - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. - S6956398, PR2486: make ephemeral DH key match the length of the certificate key - S6989466, PR2555: Miscellaneous compiler warnings in java/lang, java/util, java/io, sun/misc native code - S6991580, PR2309: IPv6 Nameservers in resolv.conf throws NumberFormatException @@ -102,13 +111,10 @@ - S7090844, PR2298: Support a timezone whose offset is changed more than once in the future - S7094377, PR2479: Com.sun.jndi.ldap.read.timeout doesn't work with ldaps. - S7133138, PR2298: Improve io performance around timezone lookups - - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - S7170638, PR2495: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. - S8000487, PR2479: Java JNDI connection library on ldap conn is not honoring configured timeout - S8011709, PR2510: [parfait] False positive: memory leak in jdk/src/share/native/sun/font/layout/CanonShaping.cpp - - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() - S8023052, PR2510: JVM crash in native layout - - S8026887: Make issues due to failed large pages allocations easier to debug - S8039921, PR2468: SHA1WithDSA with key > 1024 bits not working - S8041451, PR2480: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request - S8042855, PR2510: [parfait] Potential null pointer dereference in IndicLayoutEngine.cpp @@ -120,8 +126,6 @@ - S8081475, PR2495: SystemTap does not work when JDK is compiled with GCC 5 - S8087120, RH1206656, PR2554: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. * Bug fixes - - PR1886: IcedTea does not checksum supplied tarballs - - PR2083: Add support for building Zero on AArch64 - PR2319: Checksum of policy JAR files changes on every build - PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled - PR2342: Update README & INSTALL files From andrew at icedtea.classpath.org Tue Aug 18 22:03:15 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Aug 2015 22:03:15 +0000 Subject: /hg/icedtea6-hg: 16 new changesets Message-ID: changeset 5b460919eeee in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5b460919eeee author: Andrew John Hughes date: Mon Jul 20 17:11:26 2015 +0100 Bump to next release, b36. 2015-07-20 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b36. changeset 15b5d31d43a3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=15b5d31d43a3 author: Andrew John Hughes date: Mon Jul 20 19:01:11 2015 +0100 Update to build against July 2015 security fixes. 2015-07-20 Andrew John Hughes * patches/openjdk/8074312-pr2255-support_linux_4.patch: Removed; upstreamed. * patches/pax-mark-rmic-java.patch: Likewise. * Makefile.am: (ICEDTEA_PATCHES): Drop above patches. Drop WITH_PAX block as no longer required. (ICEDTEA_ECJ_PATCHES): Drop !WITH_PAX block, merging into main unconditional definition. * patches/openjdk/4963723-implement_sha-224.patch: Regenerated due to copyright header change. changeset 4c54ff50c546 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4c54ff50c546 author: Andrew John Hughes date: Wed Jul 22 13:27:06 2015 +0100 Add backports from IcedTea 2.x & OpenJDK 8 Backports - PR2488, CVE-2015-4000: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize - S4890063, PR2306, RH1214835: HPROF: default text truncated when using doe=n option - S6562614, PR2555: Compiler warnings for gettimeofday in Inet4/Inet6AddressImpl.c - S6956398, PR2486: make ephemeral DH key match the length of the certificate key - S6989466, PR2555: Miscellaneous compiler warnings in java/lang, java/util, java/io, sun/misc native code - S6991580, PR2309: IPv6 Nameservers in resolv.conf throws NumberFormatException - S6997561, PR2479: A request for better error handling in JNDI - S7007905, PR2298: javazic produces wrong line numbers - S7017176, PR2479: Several JNDI tests are mssing GPL header - S7058708, PR2298: Eliminate JDK build tools build warnings - S7069870, PR2298: Parts of the JDK erroneously rely on generic array initializers with diamond - S7090844, PR2298: Support a timezone whose offset is changed more than once in the future - S7094377, PR2479: Com.sun.jndi.ldap.read.timeout doesn't work with ldaps. - S7133138, PR2298: Improve io performance around timezone lookups - S7170638, PR2495: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. - S8000487, PR2479: Java JNDI connection library on ldap conn is not honoring configured timeout - S8011709, PR2510: [parfait] False positive: memory leak in jdk/src/share/native/sun/font/layout/CanonShaping.cpp - S8023052, PR2510: JVM crash in native layout - S8039921, PR2468: SHA1WithDSA with key > 1024 bits not working - S8041451, PR2480: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request - S8042855, PR2510: [parfait] Potential null pointer dereference in IndicLayoutEngine.cpp - S8042857, PR2479: 14 stuck threads waiting for notification on LDAPRequest - S8065238, PR2479: javax.naming.NamingException after upgrade to JDK 8 - S8074761, PR2469: Empty optional parameters of LDAP query are not interpreted as empty - S8078654, PR2334: CloseTTFontFileFunc callback should be removed - S8078666, PR2327: JVM fastdebug build compiled with GCC 5 asserts with "widen increases" - S8081315, PR2406: Avoid giflib interlacing workaround with giflib 5.0.0 on - S8081475, PR2495: SystemTap does not work when JDK is compiled with GCC 5 - S8087120, RH1206656, PR2554: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. - PR2319: Checksum of policy JAR files changes on every build - PR2460: Policy JAR files should be timestamped with the date of the policy file they hold - PR2481, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock - PR2486: JSSE server is still limited to 768-bit DHE changeset f516b14f932d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f516b14f932d author: Andrew John Hughes date: Wed Jul 22 15:10:10 2015 +0100 PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled 2014-06-12 Andrew John Hughes PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled * acinclude.m4: (IT_ENABLE_ZERO_BUILD): Depend on IT_HAS_NATIVE_HOTSPOT_PORT. Split out arch-dependent code into that macro. Make ENABLE_CACAO test more readable. (IT_ENABLE_CACAO): Handle enableval same as other macros so possible values are only ever yes or no. (IT_ENABLE_JAMVM): Likewise. (IT_HAS_NATIVE_HOTSPOT_PORT): Architecture detection split out from IT_ENABLE_ZERO_BUILD. Now sets has_native_hotspot_port for later reference. * configure.ac: Error out if there is no native HotSpot port and Zero (which implies Shark & ARM32 JIT), CACAO and JamVM are all disabled. changeset cb449d796147 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cb449d796147 author: Andrew John Hughes date: Wed Jul 22 15:22:58 2015 +0100 PR2342: Update README & INSTALL files 2015-07-06 Andrew John Hughes PR2342: Update README & INSTALL files * INSTALL: Remove dead --with-xalan2-jar, --with-xalan2-serializer-jar, --with-xerces2-jar options. Document --with-jdk-home. Move --enable-system-kerberos to be listed with other system library options. Mention ARM32 JIT. * NEWS: Updated. * README: Mention ARM32 JIT and OpenJDK compatibility testing page. * acinclude.m4: (IT_CHECK_FOR_JDK): Add plain java-1.6.0-openjdk to ICEDTEA6_VMS. changeset c52b41d82358 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c52b41d82358 author: Andrew John Hughes date: Wed Jul 22 15:52:21 2015 +0100 PR2360: Ensure all stamp targets have aliases 2015-07-22 Andrew John Hughes PR2360: Ensure all stamp targets have aliases * Makefile.am: Add missing aliases for add-cacao, add-cacao-debug, add-jamvm, add-jamvm-debug, add-nss, add-nss-debug, add-nss-ecj, add-pulseaudio, add-pulseaudio-debug, add-pulseaudio-ecj, add-systemtap, add-systemtap-debug, add-systemtap-ecj, add-tzdata-support, add-tzdata-support-debug, add-tzdata-support-ecj, add-zero, add-zero-debug, extract-openjdk, fonts, generated, hgforest, ports, pulse-java, pulse-java-class, pulse-java-headers, pulse-java-jar, remove-intree-libraries, runnable-icedtea, runnable-icedtea-debug and runnable-icedtea-ecj. Remove dead nbplatform and rename rt-jar to rt. * NEWS: Updated. changeset 6b864e0af52a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6b864e0af52a author: Andrew John Hughes date: Wed Jul 22 16:24:14 2015 +0100 PR2391: Make elliptic curve removal optional 2015-07-15 Andrew John Hughes PR2391: Make elliptic curve removal optional * acinclude.m4: (IT_ENABLE_NON_NSS_CURVES): Check ${enableval} to catch values other than yes/no. 2015-07-13 Andrew John Hughes PR2391: Make elliptic curve removal optional * INSTALL: Document --enable-non-nss-curves. * Makefile.am: (ICEDTEA_PATCHES): Only apply the RH1022017 patch when non-NSS curves are not enabled. * NEWS: Updated. * acinclude.m4: (IT_ENABLE_NON_NSS_CURVES): New macro to allow non-NSS curves to be turned on. * configure.ac: Invoke IT_ENABLE_NON_NSS_CURVES. * fsg.sh.in: Don't alter the curve list when non-NSS curves are enabled. changeset ac50a5a2d297 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ac50a5a2d297 author: Andrew John Hughes date: Wed Jul 22 16:27:58 2015 +0100 PR2508, G541462: Only apply PaX markings by default on running PaX kernels 2015-07-13 Andrew John Hughes PR2508, G541462: Only apply PaX markings by default on running PaX kernels * NEWS: Updated. * acinclude.m4: (IT_HAS_PAX): Use grep directly rather than piping from cat. (IT_WITH_PAX): Use ${pax_active} as the default value. Handle --with-pax and --without-pax options (i.e. without arguments) better. changeset 920e498c9514 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=920e498c9514 author: Andrew John Hughes date: Wed Jul 22 16:36:15 2015 +0100 PR2522: Add executable stack markings to callNative.S on JamVM 2015-07-13 Andrew John Hughes PR2522: Add executable stack markings to callNative.S on JamVM * Makefile.am: (ICEDTEA_PATCHES): Add patch. (jamvm): Drop setting -noexecstack in LDFLAGS; replaced by code fix in JamVM. * NEWS: Updated. * patches/jamvm/noexecstack.patch: Add notes to assembly files in order to turn off executable stack. changeset 94d520e9c37c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=94d520e9c37c author: Andrew John Hughes date: Wed Jul 22 18:02:41 2015 +0100 PR2556, G390663: Update Gentoo font configuration and allow font directory to be specified 2015-07-22 Andrew John Hughes PR2556, G390663: Update Gentoo font configuration and allow font directory to be specified * INSTALL: Document --with-fonts-dir. * Makefile.am: (fonts): Copy the generated Gentoo font properties file into the OpenJDK tree. * NEWS: Updated. * acinclude.m4: (IT_WITH_FONTS_DIR): Allow the user to specify where the fonts are stored. * configure.ac: Invoke IT_WITH_FONTS_DIR and generate linux.fontconfig.Gentoo.properties * linux.fontconfig.Gentoo.properties.in: Template fontconfig file for Gentoo copied from the main Portage tree. * patches/fonts-gentoo.patch: Remove outdated copy of linux.fontconfig.Gentoo.properties from patch. changeset 4c1b53bb273a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4c1b53bb273a author: Andrew John Hughes date: Wed Jul 22 18:10:19 2015 +0100 PR829: Raise javadoc and JAVAC_FLAGS memory limits for CACAO 2015-07-13 Andrew John Hughes * AUTHORS: Add James. * NEWS: Updated. 2015-05-23 James Le Cuirot PR829: Raise javadoc and JAVAC_FLAGS memory limits for CACAO * patches/cacao/launcher.patch: Increase memory limits so a build with CACAO and doc generation succeeds. changeset 7f74162f5403 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7f74162f5403 author: Andrew John Hughes date: Wed Jul 22 20:38:48 2015 +0100 Merge with icedtea6-hg for b36 update changeset 7efdfbf5b4f3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7efdfbf5b4f3 author: Andrew John Hughes date: Wed Jul 22 22:12:32 2015 +0100 Update to b36 tarball. Changes in b36: - OPENJDK6-58: Allow OpenJDK to build on PaX-enabled kernels - OPENJDK6-59: Only apply PaX-marking when needed by a running PaX kernel - OPENJDK6-60, PR2484: Disable export ciphers by default - OPENJDK6-61: Remove translation strings for ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR which doesn't exist in OpenJDK 6 - OPENJDK6-62, PR2552: Restrict key size of RSA certificates to >= 1024 - OPENJDK6-63: Remove @Override annotation on interfaces added by 2015/07/14 security fixes. - S6787645: CRL validation code should permit some clock skew when checking validity of CRLs - S6996365: Evaluate the priorities of cipher suites - S7185471: Avoid key expansion when AES cipher is re-init w/ the same key - S8007142: Add utility classes for writing better multiprocess tests in jtreg - S8008089: Delete OS dependent check in JdkFinder.getExecutable() - S8024861: Incomplete token triggers GSS-API NullPointerException - S8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector - S8036786: Update jdk7 testlibrary to match jdk8 - S8042205: javax/management/monitor/*: some tests didn't get all the notifications - S8042982: Unexpected RuntimeExceptions being thrown by SSLEngine - S8043200, PR2485: Decrease the preference mode of RC4 in the enabled cipher suite list - S8043201: Deprecate RC4 in SunJSSE provider - S8043202: Prohibit RC4 cipher suites - S8046817: JDK 8 schemagen tool does not generate xsd files for enum types - S8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred - S8050158: Introduce system property to maintain RC4 preference order - S8062923: XSL: Run-time internal error in 'substring()' - S8062924: XSL: wrong answer from substring() function - S8064546: CipherInputStream throws BadPaddingException if stream is not fully read - S8065764: javax/management/monitor/CounterMonitorTest.java hangs - S8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs - S8067694: Improved certification checking - S8071715: Tune font layout engine - S8071731: Better scaling for C1 - S8072490: Better font morphing redux - S8072887: Better font handling improvements - S8073334: Improved font substitutions - S8073357: schema1.xsd has wrong content. Sequence of the enum values has been changed - S8073385: Bad error message on parsing illegal character in XML attribute - S8073773: Presume path preparedness - S8073894: Getting to the root of certificate chains - S8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc - S8074297: substring in XSLT returns wrong character if string contains supplementary chars - S8074312: Enable hotspot builds on 4.x Linux kernels - S8074330: Set font anchors more solidly - S8074335: Substitute for substitution formats - S8074865: General crypto resilience changes - S8074871: Adjust device table handling - S8075374: Responding to OCSP responses - S8075378: JNDI DnsClient Exception Handling - S8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env. - S8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env. - S8075667: (tz) Support tzdata2015b - S8075738: Better multi-JVM sharing - S8075838: Method for typing MethodTypes - S8075853: Proxy for MBean proxies - S8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297 - S8076328: Enforce key exchange constraints - S8076376: Enhance IIOP operations - S8076397: Better MBean connections - S8076401: Serialize OIS data - S8076405: Improve serial serialization - S8076409: Reinforce RMI framework - S8077520: Morph tables into improved form - S8077685: (tz) Support tzdata2015d - S8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException - S8078439: SPNEGO auth fails if client proposes MS krb5 OID - S8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases" - S8080318: jdk8u51 l10n resource file translation update - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12 2015-07-22 Andrew John Hughes * patches/openjdk/8078666-widen_increases.patch: Removed; upstream in b36. * Makefile.am: (OPENJDK_DATE): Bump to b36 creation date; 22nd of July, 2015. (OPENJDK_SHA256SUM): Update for b36 tarball. * NEWS: Updated with b36 changes. Remove duplicate issue in 1.13.6 release notes. * patches/openjdk/6956398-ephemeraldhkeysize.patch: Regenerated against b36. changeset 6457627bec31 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6457627bec31 author: Andrew John Hughes date: Wed Jul 22 22:29:27 2015 +0100 PR2559: generated directory gets confused with generated alias 2015-07-22 Andrew John Hughes PR2559: generated directory gets confused with generated alias * Makefile.am: (EXTRA_DIST): Change 'generated' to '$(top_srcdir)/generated'. * NEWS: Updated. changeset f84a2e0540fa in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f84a2e0540fa author: Andrew John Hughes date: Thu Jul 30 22:42:11 2015 +0100 PR2565: Replace ipv4-mapped-ipv6-addresses.patch with upstream fix 6882910 2015-07-28 Andrew John Hughes PR2565: Replace ipv4-mapped-ipv6-addresses.patch with upstream fix 6882910 * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * NEWS: Updated. Bump release date. * patches/ipv4-mapped-ipv6-addresses.patch: Remove code changes, leaving just the test case. * patches/openjdk/6882910-ipv6only.patch: New patch, backporting 6882910 as a replacement for the older ipv4-mapped-ipv6-addresses.patch changeset acc83d51b013 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=acc83d51b013 author: Andrew John Hughes date: Tue Aug 18 20:53:28 2015 +0100 Add 1.13.8 release notes. 2015-08-18 Andrew John Hughes * NEWS: Add 1.13.8 release notes. diffstat: AUTHORS | 1 + ChangeLog | 245 + INSTALL | 27 +- Makefile.am | 134 +- NEWS | 118 +- README | 12 +- acinclude.m4 | 170 +- configure.ac | 13 + fsg.sh.in | 6 +- linux.fontconfig.Gentoo.properties.in | 385 + patches/cacao/launcher.patch | 9 +- patches/fonts-gentoo.patch | 380 - patches/hotspot/hs23/systemtap.patch | 140 - patches/ipv4-mapped-ipv6-addresses.patch | 111 - patches/jamvm/noexecstack.patch | 48 + patches/openjdk/4890063-hprof_truncation.patch | 20 + patches/openjdk/4963723-implement_sha-224.patch | 189 +- patches/openjdk/6562615-compiler_warnings.patch | 33 + patches/openjdk/6882910-ipv6only.patch | 192 + patches/openjdk/6956398-ephemeraldhkeysize.patch | 761 ++ patches/openjdk/6989466-compiler_warnings.patch | 405 + patches/openjdk/6991580-ipv6_nameservers.patch | 137 + patches/openjdk/6997561-better_jndi_error_handling.patch | 143 + patches/openjdk/7007905-javazic_line_numbers.patch | 20 + patches/openjdk/7017176-missing_gpl_headers.patch | 129 + patches/openjdk/7058708-javazic_warnings.patch | 2586 ++++++++++ patches/openjdk/7069870-generic_array_initializers.patch | 24 + patches/openjdk/7090844-support_multi_offset_change_timezones.patch | 50 + patches/openjdk/7094377-ldaps_timeout.patch | 162 + patches/openjdk/7133138-timezone_io_improvement.patch | 205 + patches/openjdk/7170638-systemtap.patch | 292 + patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch | 720 ++ patches/openjdk/8011709-canonshaping_memory_leak.patch | 29 + patches/openjdk/8023052-jvm_crash_in_native_layout.patch | 23 + patches/openjdk/8039921-sha1_1024plus.patch | 87 + patches/openjdk/8041451-ldap_read_timeout_abandon.patch | 21 + patches/openjdk/8042855-indiclayoutengine_null_dereference.patch | 51 + patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch | 127 + patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch | 611 ++ patches/openjdk/8074312-pr2255-support_linux_4.patch | 19 - patches/openjdk/8074761-ldap_empty_optional_params.patch | 168 + patches/openjdk/8078654-closettfontfilefunc.patch | 42 + patches/openjdk/8081315-giflib_interlacing.patch | 72 + patches/openjdk/8081475-systemtap-gcc5.patch | 24 + patches/openjdk/8087120-zero_gcc5.patch | 24 + patches/pax-mark-rmic-java.patch | 10 - patches/pr2319-policy_jar_checksum.patch | 103 + patches/pr2460-policy_jar_timestamp.patch | 108 + patches/pr2481_sysconfig_clock_spaces.patch | 67 + patches/pr2486-768_dh.patch | 52 + patches/pr2488-1024_dh.patch | 53 + 51 files changed, 8699 insertions(+), 859 deletions(-) diffs (truncated from 10382 to 500 lines): diff -r 0a4af164d620 -r acc83d51b013 AUTHORS --- a/AUTHORS Thu Apr 16 03:37:09 2015 +0100 +++ b/AUTHORS Tue Aug 18 20:53:28 2015 +0100 @@ -9,6 +9,7 @@ Deepak Bhole Tom Callaway Pablo del Campo +James Le Cuirot Danesh Dadachanji Thomas Fitzsimmons Matthew Flaschen diff -r 0a4af164d620 -r acc83d51b013 ChangeLog --- a/ChangeLog Thu Apr 16 03:37:09 2015 +0100 +++ b/ChangeLog Tue Aug 18 20:53:28 2015 +0100 @@ -1,3 +1,248 @@ +2015-08-18 Andrew John Hughes + + * NEWS: Add 1.13.8 release notes. + +2015-07-28 Andrew John Hughes + + PR2565: Replace ipv4-mapped-ipv6-addresses.patch + with upstream fix 6882910 + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. Bump release date. + * patches/ipv4-mapped-ipv6-addresses.patch: + Remove code changes, leaving just the test case. + * patches/openjdk/6882910-ipv6only.patch: + New patch, backporting 6882910 as a replacement + for the older ipv4-mapped-ipv6-addresses.patch + +2015-07-22 Andrew John Hughes + + PR2559: generated directory gets confused with + generated alias + * Makefile.am: + (EXTRA_DIST): Change 'generated' to + '$(top_srcdir)/generated'. + * NEWS: Updated. + +2015-07-22 Andrew John Hughes + + * patches/openjdk/8078666-widen_increases.patch: + Removed; upstream in b36. + * Makefile.am: + (OPENJDK_DATE): Bump to b36 creation date; + 22nd of July, 2015. + (OPENJDK_SHA256SUM): Update for b36 tarball. + * NEWS: Updated with b36 changes. Remove duplicate + issue in 1.13.6 release notes. + * patches/openjdk/6956398-ephemeraldhkeysize.patch: + Regenerated against b36. + +2015-07-20 Andrew John Hughes + + * patches/openjdk/8074312-pr2255-support_linux_4.patch: + Removed; upstreamed. + * patches/pax-mark-rmic-java.patch: Likewise. + * Makefile.am: + (ICEDTEA_PATCHES): Drop above patches. Drop + WITH_PAX block as no longer required. + (ICEDTEA_ECJ_PATCHES): Drop !WITH_PAX block, + merging into main unconditional definition. + * patches/openjdk/4963723-implement_sha-224.patch: + Regenerated due to copyright header change. + +2015-07-20 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b36. + +2015-07-13 Andrew John Hughes + + * AUTHORS: Add James. + * NEWS: Updated. + +2015-05-23 James Le Cuirot + + PR829: Raise javadoc and JAVAC_FLAGS memory + limits for CACAO + * patches/cacao/launcher.patch: + Increase memory limits so a build with CACAO + and doc generation succeeds. + +2015-07-22 Andrew John Hughes + + PR2556, G390663: Update Gentoo font configuration + and allow font directory to be specified + * INSTALL: Document --with-fonts-dir. + * Makefile.am: + (fonts): Copy the generated Gentoo + font properties file into the OpenJDK + tree. + * NEWS: Updated. + * acinclude.m4: + (IT_WITH_FONTS_DIR): Allow the user + to specify where the fonts are stored. + * configure.ac: Invoke IT_WITH_FONTS_DIR + and generate linux.fontconfig.Gentoo.properties + * linux.fontconfig.Gentoo.properties.in: + Template fontconfig file for Gentoo copied from + the main Portage tree. + * patches/fonts-gentoo.patch: + Remove outdated copy of + linux.fontconfig.Gentoo.properties from patch. + +2015-07-13 Andrew John Hughes + + PR2500: Add executable stack markings + to callNative.S on JamVM + * Makefile.am: + (ICEDTEA_PATCHES): Add patch. + (jamvm): Drop setting -noexecstack in + LDFLAGS; replaced by code fix in JamVM. + * NEWS: Updated. + * patches/jamvm/noexecstack.patch: + Add notes to assembly files in order to + turn off executable stack. + +2015-07-13 Andrew John Hughes + + PR2507, G541462: Only apply PaX markings by default + on running PaX kernels + * NEWS: Updated. + * acinclude.m4: + (IT_HAS_PAX): Use grep directly rather + than piping from cat. + (IT_WITH_PAX): Use ${pax_active} as the + default value. Handle --with-pax and + --without-pax options (i.e. without arguments) + better. + +2015-07-15 Andrew John Hughes + + PR2391: Make elliptic curve removal + optional + * acinclude.m4: + (IT_ENABLE_NON_NSS_CURVES): Check ${enableval} + to catch values other than yes/no. + +2015-07-13 Andrew John Hughes + + PR2391: Make elliptic curve removal + optional + * INSTALL: + Document --enable-non-nss-curves. + * Makefile.am: + (ICEDTEA_PATCHES): Only apply + the RH1022017 patch when non-NSS + curves are not enabled. + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_NON_NSS_CURVES): New + macro to allow non-NSS curves to + be turned on. + * configure.ac: + Invoke IT_ENABLE_NON_NSS_CURVES. + * fsg.sh.in: + Don't alter the curve list when + non-NSS curves are enabled. + +2015-07-22 Andrew John Hughes + + PR2360: Ensure all stamp targets have aliases + * Makefile.am: + Add missing aliases for add-cacao, + add-cacao-debug, add-jamvm, add-jamvm-debug, + add-nss, add-nss-debug, add-nss-ecj, + add-pulseaudio, add-pulseaudio-debug, + add-pulseaudio-ecj, add-systemtap, + add-systemtap-debug, add-systemtap-ecj, + add-tzdata-support, add-tzdata-support-debug, + add-tzdata-support-ecj, add-zero, add-zero-debug, + extract-openjdk, fonts, generated, hgforest, + ports, pulse-java, pulse-java-class, + pulse-java-headers, pulse-java-jar, + remove-intree-libraries, runnable-icedtea, + runnable-icedtea-debug and runnable-icedtea-ecj. + Remove dead nbplatform and rename rt-jar to rt. + * NEWS: Updated. + +2015-07-06 Andrew John Hughes + + PR2342: Update README & INSTALL files + * INSTALL: Remove dead --with-xalan2-jar, + --with-xalan2-serializer-jar, + --with-xerces2-jar options. Document --with-jdk-home. + Move --enable-system-kerberos to be listed with other + system library options. Mention ARM32 JIT. + * NEWS: Updated. + * README: Mention ARM32 JIT and OpenJDK + compatibility testing page. + * acinclude.m4: + (IT_CHECK_FOR_JDK): Add plain java-1.6.0-openjdk to + ICEDTEA6_VMS. + +2014-06-12 Andrew John Hughes + + PR2340: Fail early if there is no native HotSpot JIT + & all other options are disabled + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_ZERO_BUILD): Depend on + IT_HAS_NATIVE_HOTSPOT_PORT. Split out arch-dependent + code into that macro. Make ENABLE_CACAO test more + readable. + (IT_ENABLE_CACAO): Handle enableval same as other macros + so possible values are only ever yes or no. + (IT_ENABLE_JAMVM): Likewise. + (IT_HAS_NATIVE_HOTSPOT_PORT): Architecture detection + split out from IT_ENABLE_ZERO_BUILD. Now sets + has_native_hotspot_port for later reference. + * configure.ac: + Error out if there is no native HotSpot port and + Zero (which implies Shark & ARM32 JIT), CACAO and + JamVM are all disabled. + +2015-07-22 Andrew John Hughes + + * patches/hotspot/hs23/systemtap.patch: + Removed; replaced by backport of upstream version. + * Makefile.am: + (ICEDTEA_PATCHES): Add patches below. Swap + old SystemTap patch for a backport of 7170638. + * NEWS: Updated. + * patches/openjdk/4890063-hprof_truncation.patch, + * patches/openjdk/6562615-compiler_warnings.patch, + * patches/openjdk/6956398-ephemeraldhkeysize.patch, + * patches/openjdk/6989466-compiler_warnings.patch, + * patches/openjdk/6991580-ipv6_nameservers.patch, + * patches/openjdk/6997561-better_jndi_error_handling.patch, + * patches/openjdk/7007905-javazic_line_numbers.patch, + * patches/openjdk/7017176-missing_gpl_headers.patch, + * patches/openjdk/7058708-javazic_warnings.patch, + * patches/openjdk/7069870-generic_array_initializers.patch, + * patches/openjdk/7090844-support_multi_offset_change_timezones.patch, + * patches/openjdk/7094377-ldaps_timeout.patch, + * patches/openjdk/7133138-timezone_io_improvement.patch, + * patches/openjdk/7170638-systemtap.patch, + * patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch, + * patches/openjdk/8011709-canonshaping_memory_leak.patch, + * patches/openjdk/8023052-jvm_crash_in_native_layout.patch, + * patches/openjdk/8039921-sha1_1024plus.patch, + * patches/openjdk/8041451-ldap_read_timeout_abandon.patch, + * patches/openjdk/8042855-indiclayoutengine_null_dereference.patch, + * patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch, + * patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch, + * patches/openjdk/8074761-ldap_empty_optional_params.patch, + * patches/openjdk/8078654-closettfontfilefunc.patch, + * patches/openjdk/8078666-widen_increases.patch, + * patches/openjdk/8081315-giflib_interlacing.patch, + * patches/openjdk/8081475-systemtap-gcc5.patch, + * patches/openjdk/8087120-zero_gcc5.patch, + * patches/pr2319-policy_jar_checksum.patch, + * patches/pr2460-policy_jar_timestamp.patch, + * patches/pr2481_sysconfig_clock_spaces.patch, + * patches/pr2486-768_dh.patch, + * patches/pr2488-1024_dh.patch: Added. + 2015-04-16 Andrew John Hughes * NEWS: Add 1.13.7 release notes. diff -r 0a4af164d620 -r acc83d51b013 INSTALL --- a/INSTALL Thu Apr 16 03:37:09 2015 +0100 +++ b/INSTALL Tue Aug 18 20:53:28 2015 +0100 @@ -91,6 +91,9 @@ downloading and extracting a tarball. * --enable-system-lcms: Build using the system installation of LCMS2, not the version in-tree. +* --enable-system-kerberos: Link against the system Kerberos library and + query it at runtime to obtain the cache location, rather than using a + hardcoded value. * --with-gcj: Compile ecj to native code with gcj prior to building. * --disable-bootstrap: Perform a quick build using an installed copy of IcedTea6. If a directory is not specified, a check against @@ -128,22 +131,6 @@ - /usr/share/java/eclipse-ecj.jar - /usr/share/java/ecj.jar - /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar -* --with-xalan2-jar: Specify the location of a xalan2 JAR file. By default, the - following paths are checked: - - /usr/share/java/xalan-j2.jar - - /usr/share/java/xalan2.jar - - /usr/share/xalan/lib/xalan.jar -* --with-xalan2-serializer-jar: Specify the location of a xalan2 serializer JAR file. - By default, the following paths are checked: - - /usr/share/java/xalan-j2-serializer.jar - - /usr/share/xalan-serializer/lib/serializer.jar - - /usr/share/java/serializer.jar -* --with-xerces2-jar: Specify the location of a xerces2 JAR file. By default, the - following paths are checked: - - /usr/share/java/xerces-j2.jar - - /usr/share/java/xerces2.jar - - /usr/share/xerces-2/lib/xercesImpl.jar - - /usr/share/java/xercesImpl.jar * --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. @@ -157,6 +144,7 @@ * --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. +* --with-fonts-dir: Specify the location of system fonts. This is currently only used on Gentoo systems. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below. @@ -174,9 +162,7 @@ * --with-additional-vms=vm-list: Additional VMs to build using the system described below. * --enable-lcms2: Use LCMS 2 backport from OpenJDK 7 rather than LCMS 1. -* --enable-system-kerberos: Link against the system Kerberos library and - query it at runtime to obtain the cache location, rather than using a - hardcoded value. +* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521}) Testing ======= @@ -289,6 +275,9 @@ --enable-shark to configure. Please note that Shark is still in development and builds are still likely to fail at present. +On ARM32, there is also a native JIT port built on top of Zero, which +is built on this platform by default. + Support for Different Versions of HotSpot ========================================= diff -r 0a4af164d620 -r acc83d51b013 Makefile.am --- a/Makefile.am Thu Apr 16 03:37:09 2015 +0100 +++ b/Makefile.am Tue Aug 18 20:53:28 2015 +0100 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 14_apr_2015 -OPENJDK_SHA256SUM = 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b -OPENJDK_VERSION = b35 +OPENJDK_DATE = 22_jul_2015 +OPENJDK_SHA256SUM = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 +OPENJDK_VERSION = b36 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -371,6 +371,7 @@ patches/openjdk/6967533-pre_epoch.patch \ patches/fonts-gentoo.patch \ patches/ipv4-mapped-ipv6-addresses.patch \ + patches/openjdk/6882910-ipv6only.patch \ patches/jtreg-OpenGLContextInit.patch \ patches/openjdk/6510892-httpserver_test.patch \ patches/jtreg-international-fonts.patch \ @@ -608,11 +609,40 @@ patches/pr2179-avoid_x86_workaround_on_zero.patch \ patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch \ patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch \ - patches/openjdk/8074312-pr2255-support_linux_4.patch \ patches/pr2197-jhat_man_page_url.patch \ patches/pr2201-support_giflib_5.1.patch \ patches/pr2211-check_dgifclosefile_return.patch \ - patches/pr2226-support_future_giflib_6_and_up.patch + patches/pr2226-support_future_giflib_6_and_up.patch \ + patches/openjdk/4890063-hprof_truncation.patch \ + patches/openjdk/6562615-compiler_warnings.patch \ + patches/openjdk/6956398-ephemeraldhkeysize.patch \ + patches/openjdk/6989466-compiler_warnings.patch \ + patches/openjdk/6991580-ipv6_nameservers.patch \ + patches/openjdk/7007905-javazic_line_numbers.patch \ + patches/openjdk/7058708-javazic_warnings.patch \ + patches/openjdk/7069870-generic_array_initializers.patch \ + patches/openjdk/7090844-support_multi_offset_change_timezones.patch \ + patches/openjdk/7133138-timezone_io_improvement.patch \ + patches/openjdk/8011709-canonshaping_memory_leak.patch \ + patches/openjdk/8023052-jvm_crash_in_native_layout.patch \ + patches/openjdk/8039921-sha1_1024plus.patch \ + patches/openjdk/8041451-ldap_read_timeout_abandon.patch \ + patches/openjdk/8042855-indiclayoutengine_null_dereference.patch \ + patches/openjdk/7094377-ldaps_timeout.patch \ + patches/openjdk/6997561-better_jndi_error_handling.patch \ + patches/openjdk/7017176-missing_gpl_headers.patch \ + patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch \ + patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch \ + patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch \ + patches/openjdk/8074761-ldap_empty_optional_params.patch \ + patches/openjdk/8078654-closettfontfilefunc.patch \ + patches/openjdk/8081315-giflib_interlacing.patch \ + patches/openjdk/8087120-zero_gcc5.patch \ + patches/pr2319-policy_jar_checksum.patch \ + patches/pr2460-policy_jar_timestamp.patch \ + patches/pr2481_sysconfig_clock_spaces.patch \ + patches/pr2486-768_dh.patch \ + patches/pr2488-1024_dh.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -646,29 +676,24 @@ endif if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/hotspot/hs23/systemtap.patch \ +ICEDTEA_PATCHES += patches/openjdk/7170638-systemtap.patch \ patches/hotspot/hs23/systemtap_gc.patch \ - patches/hotspot/hs23/systemtap-alloc-size-workaround.patch + patches/hotspot/hs23/systemtap-alloc-size-workaround.patch \ + patches/openjdk/8081475-systemtap-gcc5.patch endif if BUILD_JAMVM ICEDTEA_PATCHES += \ - patches/jamvm/pr2190-find_class_from_caller.patch + patches/jamvm/pr2190-find_class_from_caller.patch \ + patches/jamvm/noexecstack.patch endif if ENABLE_NSS -ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch else NSS_PATCHES = patches/nss-not-enabled-config.patch endif -if WITH_PAX -ICEDTEA_PATCHES += \ - patches/no-test_gamma.patch \ - patches/pax-mark-rmic-java.patch -endif - if USE_SYSTEM_ZLIB ICEDTEA_PATCHES += \ patches/libraries-zlib.patch \ @@ -693,6 +718,10 @@ patches/libraries-gif.patch endif +if !USE_NON_NSS_CURVES +ICEDTEA_PATCHES += patches/rh1022017.patch +endif + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches @@ -711,7 +740,8 @@ patches/ecj/jaxws-jdk-dependency.patch \ patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch \ patches/ecj/fphexconstants.patch \ - patches/ecj/no-sun-classes.patch + patches/ecj/no-sun-classes.patch \ + patches/ecj/no-test_gamma.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ @@ -735,10 +765,6 @@ patches/ecj/xbootclasspath.patch endif -if !WITH_PAX -ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch -endif - # If date parsing bug is present, drop Lithuania and Latvia EUR transition # dates as they are already in the past anyway. if CP64174 @@ -938,7 +964,7 @@ # FIXME (distclean): Add jtreg sources # FIXME (distclean): Add pulseaudio sources -EXTRA_DIST = generated \ +EXTRA_DIST = $(top_srcdir)/generated \ $(top_srcdir)/patches/* \ contrib arm_port \ overlays \ @@ -1353,6 +1379,7 @@ cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.10.properties cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.11.properties cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties + cp linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH) mkdir -p stamps touch $@ @@ -2415,7 +2442,6 @@ stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp if BUILD_JAMVM cd jamvm/jamvm && \ - LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ ./autogen.sh --with-java-runtime-library=openjdk6 \ --prefix=$(abs_top_builddir)/jamvm/install ; \ $(MAKE) ; \ @@ -2875,6 +2901,42 @@ add-archive-ecj: stamps/add-archive-ecj.stamp +add-cacao: stamps/add-cacao.stamp + +add-cacao-debug: stamps/add-cacao-debug.stamp + +add-jamvm: stamps/add-jamvm.stamp + +add-jamvm-debug: stamps/add-jamvm-debug.stamp + +add-nss: stamps/add-nss.stamp + From andrew at icedtea.classpath.org Tue Aug 18 22:08:32 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Aug 2015 22:08:32 +0000 Subject: /hg/icedtea6-hg: Bump to next release, b37. Message-ID: changeset 049a4a9b1524 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=049a4a9b1524 author: Andrew John Hughes date: Tue Aug 18 23:08:20 2015 +0100 Bump to next release, b37. 2015-08-18 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b37. diffstat: ChangeLog | 5 +++++ Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r acc83d51b013 -r 049a4a9b1524 ChangeLog --- a/ChangeLog Tue Aug 18 20:53:28 2015 +0100 +++ b/ChangeLog Tue Aug 18 23:08:20 2015 +0100 @@ -1,3 +1,8 @@ +2015-08-18 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b37. + 2015-08-18 Andrew John Hughes * NEWS: Add 1.13.8 release notes. diff -r acc83d51b013 -r 049a4a9b1524 Makefile.am --- a/Makefile.am Tue Aug 18 20:53:28 2015 +0100 +++ b/Makefile.am Tue Aug 18 23:08:20 2015 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 22_jul_2015 OPENJDK_SHA256SUM = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 -OPENJDK_VERSION = b36 +OPENJDK_VERSION = b37 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec From jvanek at redhat.com Wed Aug 19 12:26:09 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 19 Aug 2015 14:26:09 +0200 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55D22801.6020805@redhat.com> References: <55BAA2E8.6010203@redhat.com> <55D19E3E.4070806@redhat.com> <55D22801.6020805@redhat.com> Message-ID: <55D475E1.1060109@redhat.com> snip >> This does not seems right.p >> ITs deffined as: >> PRINCIPALS("-principals", "class_name principal_name", "PBOPrincipals", >> NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); >> >> So even should be already thrown. > > Yes, the OptionParser does actually throw an UnevenParameterException in this case (which > PolicyEditorTest.testGetPrincipalsArgumentWhenUnevenArgumentsProvided actually expects), but I added > the check there as well just as a defensive measure. > Please dont do this. the exception is thrown, so do not add code which never will be used. And if will be then its hiding missbehaving somewhere else. Please rmowe redundant check and rthrow. >> Also the test for case like >> String[] args = new String[] { "-principals", "aa", "bb" }; >> is missing. >> > Ah good catch, thank you. Added. > >> Thanx! >> J. >>> >> > > From jvanek at redhat.com Wed Aug 19 12:27:31 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 19 Aug 2015 14:27:31 +0200 Subject: [rfc][icedtea-web] PolicyEditor sorted entries list In-Reply-To: <55D23CBB.1030202@redhat.com> References: <55BA8C38.9090101@redhat.com> <55D1751C.2050308@redhat.com> <55D23CBB.1030202@redhat.com> Message-ID: <55D47633.9030108@redhat.com> snip >> Well ths one looks scary :D >> I would change changelog a bit, as this method do not implement compare. >> Also I woudl rename it - like comapreComaprable() ?-) > > What do you mean... ? This patch makes it so that PolicyIdentifier implements > Comparable and this 'int compareTo(PolicyIdentifier policyIdentifier)' is there to > fulfill that contract. The static helper method 'compare(T a, T b)' is just there to simplify > null-checking and comparison of two Comparables, like codebases and signedBys. > > The first part of it is just guaranteeing that ALL_APPLETS_IDENTIFIER is always less than any other > PolicyIdentifier, other than itself. The following parts just sort the identifiers normally with > codebase being the primary sort attribute, then signedBy, and finally principals. Yes I got that. Please rename the static method. Ok to push then. Thanx! J. From aazores at icedtea.classpath.org Wed Aug 19 14:48:47 2015 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Wed, 19 Aug 2015 14:48:47 +0000 Subject: /hg/icedtea-web: Sort identifiers list in PolicyEditor Message-ID: changeset bbd5fd366c96 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bbd5fd366c96 author: Andrew Azores date: Wed Aug 19 10:48:35 2015 -0400 Sort identifiers list in PolicyEditor * NEWS: add note about sorting * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java (addNewEntry): clear listModel before adding new identifiers from policyEditorController. Controller handles sorting results for us, so we just clear and repopulate the UI. * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java (getIdentifiers): return SortedSet rather than Set * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java (getIdentifiers): likewise * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java (compareTo, compareComparable): new methods for implementing Comparable (getPrincipals): return Set, not List * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifierTest.java: new tests for PolicyIdentifier diffstat: ChangeLog | 18 + NEWS | 1 + netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 5 +- netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java | 6 +- netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java | 6 +- netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java | 43 ++- tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifierTest.java | 148 ++++++++++ 7 files changed, 217 insertions(+), 10 deletions(-) diffs (325 lines): diff -r 09792ebffb27 -r bbd5fd366c96 ChangeLog --- a/ChangeLog Thu Jul 30 13:49:33 2015 -0400 +++ b/ChangeLog Wed Aug 19 10:48:35 2015 -0400 @@ -1,3 +1,21 @@ +2015-08-19 Andrew Azores + + Sort identifiers list in PolicyEditor + * NEWS: add note about sorting + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java + (addNewEntry): clear listModel before adding new identifiers from + policyEditorController. Controller handles sorting results for us, so we + just clear and repopulate the UI. + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java + (getIdentifiers): return SortedSet rather than Set + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java + (getIdentifiers): likewise + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java + (compareTo, compareComparable): new methods for implementing Comparable + (getPrincipals): return Set, not List + * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifierTest.java: + new tests for PolicyIdentifier + 2015-07-30 Andrew Azores Add tests for PolicyEditor.getFilePathArgument diff -r 09792ebffb27 -r bbd5fd366c96 NEWS --- a/NEWS Thu Jul 30 13:49:33 2015 -0400 +++ b/NEWS Wed Aug 19 10:48:35 2015 -0400 @@ -29,6 +29,7 @@ - fixed issues with -html shortcuts - fixed issue with -html receiving garbage in width and height * PolicyEditor + - Entry list is sorted, entries will appear with consistent ordering - file flag made to work when used standalone - file flag cannot be used in combination with main argument - defaultfile flag added diff -r 09792ebffb27 -r bbd5fd366c96 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Thu Jul 30 13:49:33 2015 -0400 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Wed Aug 19 10:48:35 2015 -0400 @@ -840,10 +840,9 @@ invokeRunnableOrEnqueueLater(new Runnable() { @Override public void run() { + listModel.clear(); for (final PolicyIdentifier identifier : policyEditorController.getIdentifiers()) { - if (!listModel.contains(identifier)) { - listModel.addElement(identifier); - } + listModel.addElement(identifier); } list.setSelectedValue(identifier, true); updateCheckboxes(identifier); diff -r 09792ebffb27 -r bbd5fd366c96 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java Thu Jul 30 13:49:33 2015 -0400 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorController.java Wed Aug 19 10:48:35 2015 -0400 @@ -48,6 +48,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import net.sourceforge.jnlp.util.logging.OutputController; import sun.security.provider.PolicyParser; @@ -102,8 +104,8 @@ policyFile.removeIdentifier(identifier); } - public Set getIdentifiers() { - return new HashSet<>(policyFile.getIdentifiers()); + public SortedSet getIdentifiers() { + return new TreeSet<>(policyFile.getIdentifiers()); } public Map> getCopyOfPermissions() { diff -r 09792ebffb27 -r bbd5fd366c96 netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java Thu Jul 30 13:49:33 2015 -0400 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyFileModel.java Wed Aug 19 10:48:35 2015 -0400 @@ -48,6 +48,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import net.sourceforge.jnlp.util.FileUtils; import net.sourceforge.jnlp.util.MD5SumWatcher; @@ -201,8 +203,8 @@ return fileWatcher != null && fileWatcher.update(); } - synchronized Set getIdentifiers() { - return new HashSet<>(permissionsMap.keySet()); + synchronized SortedSet getIdentifiers() { + return new TreeSet<>(permissionsMap.keySet()); } synchronized KeystoreInfo getKeystoreInfo() { diff -r 09792ebffb27 -r bbd5fd366c96 netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java Thu Jul 30 13:49:33 2015 -0400 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifier.java Wed Aug 19 10:48:35 2015 -0400 @@ -43,10 +43,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; // http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html -public class PolicyIdentifier implements Serializable { +public class PolicyIdentifier implements Comparable, Serializable { public static final PolicyIdentifier ALL_APPLETS_IDENTIFIER = new PolicyIdentifier(null, Collections.emptySet(), null) { @Override @@ -56,7 +58,7 @@ }; private final String signedBy; - private final List principals = new ArrayList<>(); + private final LinkedHashSet principals = new LinkedHashSet<>(); private final String codebase; public PolicyIdentifier(final String signedBy, final Collection principals, final String codebase) { @@ -77,7 +79,7 @@ return signedBy; } - public List getPrincipals() { + public Set getPrincipals() { return principals; } @@ -144,4 +146,39 @@ result = 31 * result + (codebase.hashCode()); return result; } + + @Override + public int compareTo(PolicyIdentifier policyIdentifier) { + if (this.equals(ALL_APPLETS_IDENTIFIER) && policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { + return 0; + } else if (this.equals(ALL_APPLETS_IDENTIFIER) && !policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { + return -1; + } else if (!this.equals(ALL_APPLETS_IDENTIFIER) && policyIdentifier.equals(ALL_APPLETS_IDENTIFIER)) { + return 1; + } + + final int codebaseComparison = compareComparable(this.getCodebase(), policyIdentifier.getCodebase()); + if (codebaseComparison != 0) { + return codebaseComparison; + } + + final int signedByComparison = compareComparable(this.getSignedBy(), policyIdentifier.getSignedBy()); + if (signedByComparison != 0) { + return signedByComparison; + } + + return Integer.compare(this.getPrincipals().hashCode(), policyIdentifier.getPrincipals().hashCode()); + } + + private static > int compareComparable(T a, T b) { + if (a == null && b != null) { + return 1; + } else if (a != null && b == null) { + return -1; + } else if (a == b) { + return 0; + } else { + return a.compareTo(b); + } + } } diff -r 09792ebffb27 -r bbd5fd366c96 tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifierTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyIdentifierTest.java Wed Aug 19 10:48:35 2015 -0400 @@ -0,0 +1,148 @@ +/*Copyright (C) 2015 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.security.policyeditor; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import sun.security.provider.PolicyParser; +import org.junit.Before; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +public class PolicyIdentifierTest { + + private static final Set principals = new HashSet<>(Arrays.asList( + new PolicyParser.PrincipalEntry("aa", "bb"), + new PolicyParser.PrincipalEntry("cc", "dd") + )); + public static final Set EMPTY_SET = Collections.emptySet(); + + @Test + public void testEquals() { + PolicyIdentifier exampleIdentifier = new PolicyIdentifier(null, EMPTY_SET, "http://example.com"); + PolicyIdentifier exampleIdentifier2 = new PolicyIdentifier(null, EMPTY_SET, "http://example.com"); + assertTrue(exampleIdentifier.equals(exampleIdentifier2)); + assertTrue(exampleIdentifier2.equals(exampleIdentifier)); + assertFalse(exampleIdentifier.equals(null)); + assertFalse(exampleIdentifier.equals(new Object())); + assertFalse(exampleIdentifier.equals(PolicyIdentifier.ALL_APPLETS_IDENTIFIER)); + } + + @Test + public void testHashCode() { + PolicyIdentifier exampleIdentifier = new PolicyIdentifier(null, EMPTY_SET, "http://example.com"); + PolicyIdentifier exampleIdentifier2 = new PolicyIdentifier(null, EMPTY_SET, "http://example.com"); + assertTrue(exampleIdentifier.hashCode() == exampleIdentifier2.hashCode()); + assertTrue(exampleIdentifier2.hashCode() == exampleIdentifier.hashCode()); + assertFalse(exampleIdentifier.hashCode() == PolicyIdentifier.ALL_APPLETS_IDENTIFIER.hashCode()); + } + + @Test + public void testCompareTo() { + PolicyIdentifier exampleIdentifier1 = createIdentifier("exampleIdentifier1", null, EMPTY_SET, "http://example.com"); + PolicyIdentifier exampleIdentifier2 = createIdentifier("exampleIdentifier2", null, EMPTY_SET, "http://example.com2"); + PolicyIdentifier exampleIdentifier3 = createIdentifier("exampleIdentifier3", "signedBy1", EMPTY_SET, "http://example.com"); + PolicyIdentifier exampleIdentifier4 = createIdentifier("exampleIdentifier4", "signedBy2", EMPTY_SET, "http://example.com"); + PolicyIdentifier exampleIdentifier5 = createIdentifier("exampleIdentifier5", "signedBy2", principals, "http://example.com"); + assertLesser(PolicyIdentifier.ALL_APPLETS_IDENTIFIER, exampleIdentifier1); + assertLesser(PolicyIdentifier.ALL_APPLETS_IDENTIFIER, exampleIdentifier2); + assertLesser(PolicyIdentifier.ALL_APPLETS_IDENTIFIER, exampleIdentifier3); + assertLesser(PolicyIdentifier.ALL_APPLETS_IDENTIFIER, exampleIdentifier4); + assertTrue("ALL_APPLETS_IDENTIFIER should be equal to itself", + PolicyIdentifier.ALL_APPLETS_IDENTIFIER.compareTo(PolicyIdentifier.ALL_APPLETS_IDENTIFIER) == 0); + + assertLesser(exampleIdentifier1, exampleIdentifier2); + assertLesser(exampleIdentifier3, exampleIdentifier2); + assertLesser(exampleIdentifier3, exampleIdentifier1); + assertLesser(exampleIdentifier3, exampleIdentifier4); + assertLesser(exampleIdentifier4, exampleIdentifier5); + } + + @Test + public void testCompareToCodebases() { + PolicyIdentifier a = createIdentifier("a", null, EMPTY_SET, "a"); + PolicyIdentifier aa = createIdentifier("aa", null, EMPTY_SET, "aa"); + PolicyIdentifier aaa = createIdentifier("aaa", null, EMPTY_SET, "aaa"); + PolicyIdentifier b = createIdentifier("b", null, EMPTY_SET, "b"); + assertLesser(a, aa); + assertLesser(a, aaa); + assertLesser(aa, aaa); + assertLesser(a, b); + assertLesser(aa, b); + assertLesser(aaa, b); + } + + @Test + public void testCompareToSignedBys() { + PolicyIdentifier a = createIdentifier("a", "a", EMPTY_SET, null); + PolicyIdentifier aa = createIdentifier("aa", "aa", EMPTY_SET, null); + PolicyIdentifier aaa = createIdentifier("aaa", "aaa", EMPTY_SET, null); + PolicyIdentifier b = createIdentifier("b", "b", EMPTY_SET, null); + assertLesser(a, aa); + assertLesser(a, aaa); + assertLesser(aa, aaa); + assertLesser(a, b); + assertLesser(aa, b); + assertLesser(aaa, b); + } + + //@Test + public void testCompareToPrincipals() { + // compareTo on principals set depends on implementation of Set.hashCode(), there is no real meaningful ordering on this field + } + + static void assertLesser(PolicyIdentifier lesser, PolicyIdentifier greater) { + String message = lesser.toString() + " should be less than " + greater.toString(); + assertTrue(message, lesser.compareTo(greater) < 0); + } + + static PolicyIdentifier createIdentifier(final String name, String signedBy, Set principals, String codebase) { + return new PolicyIdentifier(signedBy, principals, codebase) { + @Override + public String toString() { + return name; + } + }; + } + +} From aazores at redhat.com Wed Aug 19 15:08:32 2015 From: aazores at redhat.com (Andrew Azores) Date: Wed, 19 Aug 2015 11:08:32 -0400 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55D475E1.1060109@redhat.com> References: <55BAA2E8.6010203@redhat.com> <55D19E3E.4070806@redhat.com> <55D22801.6020805@redhat.com> <55D475E1.1060109@redhat.com> Message-ID: <55D49BF0.8050304@redhat.com> On 19/08/15 08:26 AM, Jiri Vanek wrote: > snip >>> This does not seems right.p >>> ITs deffined as: >>> PRINCIPALS("-principals", "class_name principal_name", "PBOPrincipals", >>> NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); >>> >>> So even should be already thrown. >> >> Yes, the OptionParser does actually throw an UnevenParameterException >> in this case (which >> PolicyEditorTest.testGetPrincipalsArgumentWhenUnevenArgumentsProvided >> actually expects), but I added >> the check there as well just as a defensive measure. >> > > Please dont do this. the exception is thrown, so do not add code which > never will be used. And if will be then its hiding missbehaving > somewhere else. > > Please rmowe redundant check and rthrow. >>> Also the test for case like >>> String[] args = new String[] { "-principals", "aa", "bb" }; >>> is missing. >>> >> Ah good catch, thank you. Added. >> >>> Thanx! >>> J. >>>> >>> >> >> > Okay, updated patch attached. I also extracted some hardcoded exception strings into messages.properties. -- Thanks, Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: exception-on-invalid-selector-3.patch Type: text/x-patch Size: 11799 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 20 14:40:25 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 20 Aug 2015 14:40:25 +0000 Subject: [Bug 2591] New: IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 Bug ID: 2591 Summary: IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet Product: IcedTea-Web Version: 1.5 Hardware: x86_64 OS: FreeBSD Status: NEW Severity: minor Priority: P5 Component: NetX (javaws) Assignee: jvanek at redhat.com Reporter: lhersch at dssgmbh.de CC: unassigned at icedtea.classpath.org In the method initializeResource(Resource resource) in net/sourceforge/jnlp/cache/ResourceTracker.java (net/sourceforge/jnlp/cache/ResourceDownloader.java in head) the method findBestUrl(resource) will be called. This caused the first request for a resource, normally a HEAD request. After that, back in initializeResource connection.getContentLength() will be called. This caused a second request for the same resource, but in this time a GET request. This GET-request caused a ClientAbortException in the JnlpDownloadServlet, because the response body is ignored. The simplest solution to prevent the ClientAbortException, is to use a HEAD-request for the second request. A better solution is to save content-length and last-modified in findBestUrl, so that the second request isn't necessary. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Thu Aug 20 15:27:16 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 20 Aug 2015 11:27:16 -0400 (EDT) Subject: Test failures in jdk7u85-b01 In-Reply-To: References: Message-ID: <321723769.13336310.1440084436909.JavaMail.zimbra@redhat.com> ----- Original Message ----- > Hi folks working on "jdk7u85", > Sorry for the delay. I was travelling back from Toronto when your mail came in and have been in catch-up mode with the 7 webrevs and general admin since :( > I'm doing a bit of QA on jdk7u85-b01 > (hg tclone icedtea7-forest-2.6; hg tupdate -r jdk7u85-b01) > and observed these failures, which seem due to backports of jtreg tests > that either don't apply to jdk7 or need more backporting work: > > sun/security/jgss/spnego/MSOID.java > javax/xml/ws/8046817/GenerateEnumSchema.java > javax/crypto/Cipher/CipherInputStreamExceptions.java > > java.security.NoSuchAlgorithmException: No such algorithm: > AES/GCM/PKCS5Padding > > /usr/local/google/home/martinrb/ws/jdk7u85-b01/jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java:37: > error: package java.util.stream does not exist > import java.util.stream.Collectors; > > import java.util.Base64; > ^ > symbol: class Base64 > location: package java.util > /usr/local/google/home/martinrb/ws/jdk7u85-b01/jdk/test/sun/security/jgss/spnego/MSOID.java:48: > error: cannot find symbol > The CipherInputStreamExceptions one I caught during OpenJDK 6 backporting and is fixed in the webrev I posted [0] as 8133993. The rest I look into now and submit once the other webrev goes through. We can then tag the result as jdk7u85-b02 and use that for the final tarball. We have very limited time to do the security changes for 6, 7 and 8, so we only really get to make sure the main code builds. With 72 changesets in the OpenJDK 7 webrevs alone, there's a lot of stuff to test in a short space of time. Thanks, -- Andrew :) Senior Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From martinrb at google.com Thu Aug 20 15:43:24 2015 From: martinrb at google.com (Martin Buchholz) Date: Thu, 20 Aug 2015 08:43:24 -0700 Subject: Test failures in jdk7u85-b01 In-Reply-To: <321723769.13336310.1440084436909.JavaMail.zimbra@redhat.com> References: <321723769.13336310.1440084436909.JavaMail.zimbra@redhat.com> Message-ID: On Thu, Aug 20, 2015 at 8:27 AM, Andrew Hughes wrote: > > The CipherInputStreamExceptions one I caught during OpenJDK 6 backporting > and is fixed in the webrev I posted [0] as 8133993. The rest I look into > now and submit once the other webrev goes through. We can then tag the > result as jdk7u85-b02 and use that for the final tarball. > Sounds like a plan! > We have very limited time to do the security changes for 6, 7 and 8, so > we only really get to make sure the main code builds. With 72 changesets > in the OpenJDK 7 webrevs alone, there's a lot of stuff to test in a short > space of time. > Thanks very much for your hard work on this - you invested more effort than we did. Our contribution is a wee bit of testing - showing that 7u85-b01 introduced 3 (and only 3) test failures, none of which indicate problems in the "real code". -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Fri Aug 21 10:17:16 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 21 Aug 2015 12:17:16 +0200 Subject: [rfc][icedtea-web] PolicyEditor dies on invalid CLI arguments In-Reply-To: <55D49BF0.8050304@redhat.com> References: <55BAA2E8.6010203@redhat.com> <55D19E3E.4070806@redhat.com> <55D22801.6020805@redhat.com> <55D475E1.1060109@redhat.com> <55D49BF0.8050304@redhat.com> Message-ID: <55D6FAAC.4060900@redhat.com> On 08/19/2015 05:08 PM, Andrew Azores wrote: > On 19/08/15 08:26 AM, Jiri Vanek wrote: >> snip >>>> This does not seems right.p >>>> ITs deffined as: >>>> PRINCIPALS("-principals", "class_name principal_name", "PBOPrincipals", >>>> NumberOfArguments.EVEN_NUMBER_SUPPORTS_EQUALS_CHAR); >>>> >>>> So even should be already thrown. >>> >>> Yes, the OptionParser does actually throw an UnevenParameterException in this case (which >>> PolicyEditorTest.testGetPrincipalsArgumentWhenUnevenArgumentsProvided actually expects), but I added >>> the check there as well just as a defensive measure. >>> >> >> Please dont do this. the exception is thrown, so do not add code which never will be used. And if will be then its hiding missbehaving somewhere else. >> >> Please rmowe redundant check and rthrow. >>>> Also the test for case like >>>> String[] args = new String[] { "-principals", "aa", "bb" }; >>>> is missing. >>>> >>> Ah good catch, thank you. Added. >>> >>>> Thanx! >>>> J. >>>>> >>>> >>> >>> >> > > Okay, updated patch attached. I also extracted some hardcoded exception strings into messages.properties. ThankYou! Iced-Tea-Web is not consitstent with localized/hardcoded exceptions. I'm in favour to abandon localized exceptions at all as I consider them as very evil. Lookig to InvalidArgumentException usage - one, not localised UnevenParameterException - one localised usage. :(so even new patches are mingled): I would like to encourage you to go back to hardcoded messages. Feel free to persuade me oposite, feel free to find another vote, feel free to push it as it is, feel free to push it with hardcoded messages. Again, thanx for contribution! J. From andrew at icedtea.classpath.org Fri Aug 21 17:36:22 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 21 Aug 2015 17:36:22 +0000 Subject: /hg/icedtea7: Replace temporary OpenJDK 7 bug IDs with allocated... Message-ID: changeset 1b288e2ae365 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1b288e2ae365 author: Andrew John Hughes date: Fri Aug 21 18:36:10 2015 +0100 Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. 2015-08-21 Andrew John Hughes * NEWS: Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. diffstat: ChangeLog | 6 ++++++ NEWS | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diffs (46 lines): diff -r 58824316f50a -r 1b288e2ae365 ChangeLog --- a/ChangeLog Thu Jul 23 04:46:24 2015 +0100 +++ b/ChangeLog Fri Aug 21 18:36:10 2015 +0100 @@ -1,3 +1,9 @@ +2015-08-21 Andrew John Hughes + + * NEWS: Replace temporary OpenJDK 7 + bug IDs with allocated ones from the + OpenJDK bug database. + 2015-07-23 Andrew John Hughes * NEWS: Add 2.5.6 and 2.6.1 diff -r 58824316f50a -r 1b288e2ae365 NEWS --- a/NEWS Thu Jul 23 04:46:24 2015 +0100 +++ b/NEWS Fri Aug 21 18:36:10 2015 +0100 @@ -94,9 +94,9 @@ - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5 - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12 - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. - - OJ03: Only apply PaX-marking when needed by a running PaX kernel - - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit - - OJ05: Fix mistake in 8075374 backport + - S8133970: Only apply PaX-marking when needed by a running PaX kernel + - S8133990: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit + - S8133991: Fix mistake in 8075374 backport * Bug fixes - PR2328: GCJ uses ppc64el named libarch directory on ppc64le - PR2341: Update README & INSTALL files @@ -204,11 +204,11 @@ - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies - S8081622: Increment the build value to b03 for hs24.85 in 7u85 - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12 - - OJ01: Allow OpenJDK to build on PaX-enabled kernels - - OJ02: Fix build where PAX_COMMAND is not specified - - OJ03: Only apply PaX-marking when needed by a running PaX kernel - - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit - - OJ05: Fix mistake in 8075374 backport + - S8133966: Allow OpenJDK to build on PaX-enabled kernels + - S8133967: Fix build where PAX_COMMAND is not specified + - S8133970: Only apply PaX-marking when needed by a running PaX kernel + - S8133990: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit + - S8133991: Fix mistake in 8075374 backport * Backports - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. * Bug fixes From andrew at icedtea.classpath.org Fri Aug 21 17:39:33 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 21 Aug 2015 17:39:33 +0000 Subject: /hg/release/icedtea7-2.5: Replace temporary OpenJDK 7 bug IDs wi... Message-ID: changeset f85e5a8108d2 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=f85e5a8108d2 author: Andrew John Hughes date: Fri Aug 21 18:39:22 2015 +0100 Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. 2015-08-21 Andrew John Hughes * NEWS: Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. diffstat: ChangeLog | 6 ++++++ NEWS | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diffs (37 lines): diff -r a89b51ad6225 -r f85e5a8108d2 ChangeLog --- a/ChangeLog Thu Jul 23 04:42:22 2015 +0100 +++ b/ChangeLog Fri Aug 21 18:39:22 2015 +0100 @@ -1,3 +1,9 @@ +2015-08-21 Andrew John Hughes + + * NEWS: Replace temporary OpenJDK 7 + bug IDs with allocated ones from the + OpenJDK bug database. + 2015-07-23 Andrew John Hughes * NEWS: Add 2.5.7 section. diff -r a89b51ad6225 -r f85e5a8108d2 NEWS --- a/NEWS Thu Jul 23 04:42:22 2015 +0100 +++ b/NEWS Fri Aug 21 18:39:22 2015 +0100 @@ -9,7 +9,6 @@ LPX - https://bugs.launchpad.net/bugs/X JSRX - http://jcp.org/en/jsr/detail?id=X JEPX - http://openjdk.java.net/jeps/X -OJX - http://java.net/jira/browse/OPENJDK7-X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY @@ -95,9 +94,9 @@ - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5 - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12 - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. - - OJ03: Only apply PaX-marking when needed by a running PaX kernel - - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit - - OJ05: Fix mistake in 8075374 backport + - S8133970: Only apply PaX-marking when needed by a running PaX kernel + - S8133990: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit + - S8133991: Fix mistake in 8075374 backport * Bug fixes - PR2328: GCJ uses ppc64el named libarch directory on ppc64le - PR2341: Update README & INSTALL files From andrew at icedtea.classpath.org Fri Aug 21 20:22:31 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 21 Aug 2015 20:22:31 +0000 Subject: /hg/release/icedtea7-2.6: Replace temporary OpenJDK 7 bug IDs wi... Message-ID: changeset b64e1444311c in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b64e1444311c author: Andrew John Hughes date: Fri Aug 21 21:22:06 2015 +0100 Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. 2015-08-21 Andrew John Hughes * NEWS: Replace temporary OpenJDK 7 bug IDs with allocated ones from the OpenJDK bug database. diffstat: ChangeLog | 6 ++++++ NEWS | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diffs (41 lines): diff -r 39ac4cad6f06 -r b64e1444311c ChangeLog --- a/ChangeLog Thu Jul 23 04:43:59 2015 +0100 +++ b/ChangeLog Fri Aug 21 21:22:06 2015 +0100 @@ -1,3 +1,9 @@ +2015-08-21 Andrew John Hughes + + * NEWS: Replace temporary OpenJDK 7 + bug IDs with allocated ones from the + OpenJDK bug database. + 2015-07-23 Andrew John Hughes * NEWS: Add 2.6.2 section. diff -r 39ac4cad6f06 -r b64e1444311c NEWS --- a/NEWS Thu Jul 23 04:43:59 2015 +0100 +++ b/NEWS Fri Aug 21 21:22:06 2015 +0100 @@ -9,7 +9,6 @@ LPX - https://bugs.launchpad.net/bugs/X JSRX - http://jcp.org/en/jsr/detail?id=X JEPX - http://openjdk.java.net/jeps/X -OJX - http://java.net/jira/browse/OPENJDK7-X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY @@ -80,11 +79,11 @@ - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies - S8081622: Increment the build value to b03 for hs24.85 in 7u85 - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12 - - OJ01: Allow OpenJDK to build on PaX-enabled kernels - - OJ02: Fix build where PAX_COMMAND is not specified - - OJ03: Only apply PaX-marking when needed by a running PaX kernel - - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit - - OJ05: Fix mistake in 8075374 backport + - S8133966: Allow OpenJDK to build on PaX-enabled kernels + - S8133967: Fix build where PAX_COMMAND is not specified + - S8133970: Only apply PaX-marking when needed by a running PaX kernel + - S8133990: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit + - S8133991: Fix mistake in 8075374 backport * Backports - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. * Bug fixes From bugzilla-daemon at icedtea.classpath.org Fri Aug 21 20:27:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 21 Aug 2015 20:27:31 +0000 Subject: [Bug 2483] [IcedTea6] [METABUG] TLS Updates In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2483 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=880223 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Fri Aug 21 21:55:42 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 21 Aug 2015 17:55:42 -0400 (EDT) Subject: Test failures in jdk7u85-b01 In-Reply-To: References: <321723769.13336310.1440084436909.JavaMail.zimbra@redhat.com> Message-ID: <1677126415.13965861.1440194142198.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On Thu, Aug 20, 2015 at 8:27 AM, Andrew Hughes > wrote: > > > > > The CipherInputStreamExceptions one I caught during OpenJDK 6 backporting > > and is fixed in the webrev I posted [0] as 8133993. The rest I look into > > now and submit once the other webrev goes through. We can then tag the > > result as jdk7u85-b02 and use that for the final tarball. > > > > Sounds like a plan! > > > > We have very limited time to do the security changes for 6, 7 and 8, so > > we only really get to make sure the main code builds. With 72 changesets > > in the OpenJDK 7 webrevs alone, there's a lot of stuff to test in a short > > space of time. > > > > Thanks very much for your hard work on this - you invested more effort than > we did. Our contribution is a wee bit of testing - showing that 7u85-b01 > introduced 3 (and only 3) test failures, none of which indicate problems in > the "real code". It all helps. It's a shame you're not able to look over it before the embargo :( I notice you're a jdk7u reviewer so maybe you could help in reviewing the fix I just posted? http://mail.openjdk.java.net/pipermail/jdk7u-dev/2015-August/010392.html Thanks, -- Andrew :) Senior Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From aazores at icedtea.classpath.org Mon Aug 24 16:38:12 2015 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Mon, 24 Aug 2015 16:38:12 +0000 Subject: /hg/icedtea-web: PolicyEditor dies given invalid -codebase -sign... Message-ID: changeset 18e401faa1b9 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=18e401faa1b9 author: Andrew Azores date: Mon Aug 24 12:28:23 2015 -0400 PolicyEditor dies given invalid -codebase -signedby or -principals arguments * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java (main): extracted helper methods for getting codebase, signedBy, principals arguments. (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new methods (cleanFilePathArgument): make parameter final for consistent style * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java (testGetCodebaseArgument, testGetCodebaseArgument2, testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, testGetPrincipalsArgument, testGetPrincipalsArgument2, testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): new tests diffstat: ChangeLog | 16 ++ netx/net/sourceforge/jnlp/resources/Messages.properties | 2 + netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 57 ++++++- tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java | 78 ++++++++++ 4 files changed, 143 insertions(+), 10 deletions(-) diffs (219 lines): diff -r bbd5fd366c96 -r 18e401faa1b9 ChangeLog --- a/ChangeLog Wed Aug 19 10:48:35 2015 -0400 +++ b/ChangeLog Mon Aug 24 12:28:23 2015 -0400 @@ -1,3 +1,19 @@ +2015-08-19 Andrew Azores + + PolicyEditor dies given invalid -codebase -signedby or -principals arguments + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java + (main): extracted helper methods for getting codebase, signedBy, principals + arguments. + (getCodebaseArgument, getSignedByArgument, getPrincipalsArgument): new + methods + (cleanFilePathArgument): make parameter final for consistent style + * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java + (testGetCodebaseArgument, testGetCodebaseArgument2, + testGetCodebaseArgument3, testGetCodebaseArgumentWhenNotProvided, + testGetPrincipalsArgument, testGetPrincipalsArgument2, + testGetPrincipalsArgument3, testGetPrincipalsArgumentWhenNotProvided, + testGetSignedByArgument, testGetSignedByArgumentWhenNotProvided): new tests + 2015-08-19 Andrew Azores Sort identifiers list in PolicyEditor diff -r bbd5fd366c96 -r 18e401faa1b9 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Aug 19 10:48:35 2015 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Aug 24 12:28:23 2015 -0400 @@ -780,6 +780,8 @@ PEClipboardAccessError=Could not read from clipboard PEDefaultFileFilePathSpecifiedError=Either -file (or simply a main argument) or -defaultfile may be specified, but not both PEMainArgAndFileSwitchSpecifiedError=Either -file may be specified or a main argument may be specified, but not both +PESignedByEmpty=SignedBy cannot be empty +PEInvalidUrl=Invalid URL: {0} PEHelpMenu=Help PEAboutPolicyEditorItem=About PolicyEditor diff -r bbd5fd366c96 -r 18e401faa1b9 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Wed Aug 19 10:48:35 2015 -0400 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Mon Aug 24 12:28:23 2015 -0400 @@ -1758,18 +1758,15 @@ // not really important, so just ignore } + final String filepath = getFilePathArgument(optionParser); + final String codebase = getCodebaseArgument(optionParser); + final String signedBy = getSignedByArgument(optionParser); + final Set principals = getPrincipalsArgument(optionParser); + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - final String filepath = getFilePathArgument(optionParser); final PolicyEditorWindow frame = getPolicyEditorFrame(filepath); - final String codebase = optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); - final String signedBy = optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); - final List rawPrincipals = optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); - final Set principals = new HashSet<>(); - for (int i = 0; i < rawPrincipals.size(); i+= 2) { - principals.add(new PolicyParser.PrincipalEntry(rawPrincipals.get(i), rawPrincipals.get(i + 1))); - } frame.getPolicyEditor().openPolicyFileSynchronously(); frame.getPolicyEditor().addNewEntry(new PolicyIdentifier(signedBy, principals, codebase)); frame.asWindow().setVisible(true); @@ -1777,7 +1774,47 @@ }); } - static String getFilePathArgument(OptionParser optionParser) { + static String getCodebaseArgument(final OptionParser optionParser) { + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.CODEBASE)) { + final String codebase = optionParser.getParam(OptionsDefinitions.OPTIONS.CODEBASE); + try { + new URL(codebase); + } catch (final MalformedURLException e) { + throw new IllegalArgumentException(R("PEInvalidUrl", codebase), e); + } + return codebase; + } else { + return null; + } + } + + static String getSignedByArgument(final OptionParser optionParser) { + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.SIGNEDBY)) { + final String signedBy = optionParser.getParam(OptionsDefinitions.OPTIONS.SIGNEDBY); + if (signedBy.isEmpty()) { + throw new IllegalArgumentException(R("PESignedByEmpty")); + } else { + return signedBy; + } + } else { + return null; + } + } + + static Set getPrincipalsArgument(final OptionParser optionParser) { + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.PRINCIPALS)) { + final List rawPrincipals = optionParser.getParams(OptionsDefinitions.OPTIONS.PRINCIPALS); + final Set principals = new HashSet<>(); + for (int i = 0; i < rawPrincipals.size(); i+= 2) { + principals.add(new PolicyParser.PrincipalEntry(rawPrincipals.get(i), rawPrincipals.get(i + 1))); + } + return principals; + } else { + return Collections.emptySet(); + } + } + + static String getFilePathArgument(final OptionParser optionParser) { final boolean openDefaultFile = optionParser.hasOption(OptionsDefinitions.OPTIONS.DEFAULTFILE); final boolean hasFileArgument = optionParser.hasOption(OptionsDefinitions.OPTIONS.FILE); final boolean hasMainArgument = optionParser.mainArgExists(); @@ -1803,7 +1840,7 @@ return filepath; } - private static String cleanFilePathArgument(String filepath) { + private static String cleanFilePathArgument(final String filepath) { if (filepath == null) { return null; } else if (filepath.isEmpty() || filepath.trim().isEmpty()) { diff -r bbd5fd366c96 -r 18e401faa1b9 tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java Wed Aug 19 10:48:35 2015 -0400 +++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java Mon Aug 24 12:28:23 2015 -0400 @@ -46,12 +46,14 @@ import java.net.URISyntaxException; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import net.sourceforge.jnlp.OptionsDefinitions; import net.sourceforge.jnlp.config.PathsAndFiles; import net.sourceforge.jnlp.util.optionparser.OptionParser; +import net.sourceforge.jnlp.util.optionparser.UnevenParameterException; import org.junit.Before; import org.junit.Test; import sun.security.provider.PolicyParser; @@ -375,4 +377,80 @@ PolicyEditor.getFilePathArgument(optionParser); } + @Test + public void testGetCodebaseArgument() { + String[] args = new String[] { "-codebase", "http://example.com" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + String result = PolicyEditor.getCodebaseArgument(optionParser); + assertTrue(result.equals("http://example.com")); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetCodebaseArgument2() { + String[] args = new String[] { "-codebase", "" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + PolicyEditor.getCodebaseArgument(optionParser); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetCodebaseArgument3() { + String[] args = new String[] { "-codebase", "example.com" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + PolicyEditor.getCodebaseArgument(optionParser); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetCodebaseArgumentWhenNotProvided() { + String[] args = new String[] { "-codebase" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + String result = PolicyEditor.getCodebaseArgument(optionParser); + } + + @Test + public void testGetPrincipalsArgument() { + String[] args = new String[] { "-principals", "aa=bb" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + Set result = PolicyEditor.getPrincipalsArgument(optionParser); + assertTrue(result.size() == 1); + assertTrue(result.contains(new PolicyParser.PrincipalEntry("aa", "bb"))); + } + + @Test + public void testGetPrincipalsArgument2() { + String[] args = new String[] { "-principals", "aa", "bb" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + Set result = PolicyEditor.getPrincipalsArgument(optionParser); + assertTrue(result.size() == 1); + assertTrue(result.contains(new PolicyParser.PrincipalEntry("aa", "bb"))); + } + + @Test(expected = UnevenParameterException.class) + public void testGetPrincipalsArgumentWhenUnevenArgumentsProvided() { + String[] args = new String[] { "-principals", "aa=bb", "cc" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + PolicyEditor.getPrincipalsArgument(optionParser); + } + + @Test + public void testGetPrincipalsArgumentWhenNotProvided() { + String[] args = new String[] { "-principals" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + Set result = PolicyEditor.getPrincipalsArgument(optionParser); + assertTrue(result.isEmpty()); + } + + @Test + public void testGetSignedByArgument() { + String[] args = new String[] { "-signedby", "foo" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + String result = PolicyEditor.getSignedByArgument(optionParser); + assertTrue(result.equals("foo")); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetSignedByArgumentWhenNotProvided() { + String[] args = new String[] { "-signedby" }; + OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); + PolicyEditor.getSignedByArgument(optionParser); + } } From jvanek at icedtea.classpath.org Wed Aug 26 05:52:42 2015 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 26 Aug 2015 05:52:42 +0000 Subject: /hg/icedtea-web: Added more tests MixedSigningAndTrustedOnly Message-ID: changeset c87f010b8cf7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c87f010b8cf7 author: Jiri Vanek date: Tue Aug 25 18:52:07 2015 +0200 Added more tests MixedSigningAndTrustedOnly diffstat: ChangeLog | 16 + tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java | 67 +- tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java | 62 +- tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java | 116 +++- tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java | 62 +- tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java | 17 +- tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyFSSU.java | 267 ++++++++++ 7 files changed, 521 insertions(+), 86 deletions(-) diffs (truncated from 927 to 500 lines): diff -r 18e401faa1b9 -r c87f010b8cf7 ChangeLog --- a/ChangeLog Mon Aug 24 12:28:23 2015 -0400 +++ b/ChangeLog Tue Aug 25 18:52:07 2015 +0200 @@ -1,3 +1,19 @@ +2015-08-25 Jiri Vanek + + Added more tests MixedSigningAndTrustedOnly + * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java + modified to suite more compelx tests + * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java + same + * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java + same + * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java + adapted to MixedSigningAndTrustedOnly + * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java + same + * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyFSSU.java: + new file to test signed_>unsigned and unsigned->signed calls behaviors. First on classpath is signed + 2015-08-19 Andrew Azores PolicyEditor dies given invalid -codebase -signedby or -principals arguments diff -r 18e401faa1b9 -r c87f010b8cf7 tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java --- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java Mon Aug 24 12:28:23 2015 -0400 +++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java Tue Aug 25 18:52:07 2015 +0200 @@ -40,8 +40,8 @@ public class MixedSigningAndTrustedOnlyClass1 extends Applet { - private static final String ID1 = "MixedSigningAndTrustedOnlyClass1"; - private static final String ID2 = "MixedSigningAndTrustedOnlyClass2"; + private static final String ID_THIS = "MixedSigningAndTrustedOnlyClass1"; + private static final String ID_REMOTE = "MixedSigningAndTrustedOnlyClass2"; public static void main(String[] args) { runBody(args); @@ -56,7 +56,7 @@ private static void runBody(String... commands) { try { - System.out.println(ID1 + " running"); + System.out.println(ID_THIS + " running"); System.out.println("params: " + Arrays.toString(commands)); boolean canDie = true; for (String command : commands) { @@ -68,17 +68,17 @@ case "cantDie": canDie = false; break; - case ID1 + "_Normal": - doNormal(); + case ID_THIS + "_Normal": + doNormalLocal(); break; - case ID1 + "_Restricted": - doRestrictedAction(); + case ID_THIS + "_Restricted": + doRestrictedActionLocal(); break; - case ID2 + "_Normal": - MixedSigningAndTrustedOnlyClass2.doNormal(); + case ID_REMOTE + "_Normal": + MixedSigningAndTrustedOnlyClass2.doNormalRemote(); break; - case ID2 + "_Restricted": - MixedSigningAndTrustedOnlyClass2.doRestrictedAction(); + case ID_REMOTE + "_Restricted": + MixedSigningAndTrustedOnlyClass2.doRestrictedActionlRemote(); break; } @@ -91,20 +91,55 @@ } } } finally { + System.err.flush(); + System.out.flush(); System.out.println("*** APPLET FINISHED ***"); System.out.flush(); System.out.println("some garbage forcing to flush"); System.out.flush(); + System.err.println("some garbage forcing to flush"); + System.err.flush(); } } - public static void doRestrictedAction() { - System.out.println(System.getProperty("user.home")); - System.out.println(ID1 + " Property read"); + private static void doRestrictedAction() { + String a = System.getProperty("user.home"); + System.out.println(ID_THIS + " Property read"); + System.out.println(a); + System.out.flush(); } - public static void doNormal() { - System.out.println(ID1 + " confirmed"); + private static void doNormal() { + System.out.println(ID_THIS + " confirmed"); + System.out.flush(); + } + + private static final String REMOTE_CALL = "RemoteCall - "; + private static final String LOCAL_CALL = "LocalCall - "; + + public static void doNormalRemote() { + System.out.print(REMOTE_CALL); + doNormal(); + System.out.flush(); + } + + private static void doNormalLocal() { + System.out.print(LOCAL_CALL); + doNormal(); + System.out.flush(); + } + + + public static void doRestrictedActionlRemote() { + System.out.print(REMOTE_CALL); + doRestrictedAction(); + System.out.flush(); + } + + private static void doRestrictedActionLocal() { + System.out.print(LOCAL_CALL); + doRestrictedAction(); + System.out.flush(); } } diff -r 18e401faa1b9 -r c87f010b8cf7 tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java --- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java Mon Aug 24 12:28:23 2015 -0400 +++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java Tue Aug 25 18:52:07 2015 +0200 @@ -40,8 +40,8 @@ */ public class MixedSigningAndTrustedOnlyClass2 extends Applet { - private static final String ID1 = "MixedSigningAndTrustedOnlyClass2"; - private static final String ID2 = "MixedSigningAndTrustedOnlyClass1"; + private static final String ID_THIS = "MixedSigningAndTrustedOnlyClass2"; + private static final String ID_REMOTE = "MixedSigningAndTrustedOnlyClass1"; public static void main(String[] args) { runBody(args); @@ -56,7 +56,7 @@ private static void runBody(String... commands) { try { - System.out.println(ID1 + " running"); + System.out.println(ID_THIS + " running"); System.out.println("params: " + Arrays.toString(commands)); boolean canDie = true; for (String command : commands) { @@ -68,17 +68,17 @@ case "cantDie": canDie = false; break; - case ID1 + "_Normal": - doNormal(); + case ID_THIS + "_Normal": + doNormalLocal(); break; - case ID1 + "_Restricted": - doRestrictedAction(); + case ID_THIS + "_Restricted": + doRestrictedActionLocal(); break; - case ID2 + "_Normal": - MixedSigningAndTrustedOnlyClass1.doNormal(); + case ID_REMOTE + "_Normal": + MixedSigningAndTrustedOnlyClass1.doNormalRemote(); break; - case ID2 + "_Restricted": - MixedSigningAndTrustedOnlyClass1.doRestrictedAction(); + case ID_REMOTE + "_Restricted": + MixedSigningAndTrustedOnlyClass1.doRestrictedActionlRemote(); break; } @@ -98,13 +98,43 @@ } } - public static void doRestrictedAction() { - System.out.println(System.getProperty("user.home")); - System.out.println(ID1 + " Property read"); + private static void doRestrictedAction() { + String a = System.getProperty("user.home"); + System.out.println(ID_THIS + " Property read"); + System.out.println(a); + System.out.flush(); } - public static void doNormal() { - System.out.println(ID1 + " confirmed"); + private static void doNormal() { + System.out.println(ID_THIS + " confirmed"); + System.out.flush(); + } + + private static final String REMOTE_CALL = "RemoteCall - "; + private static final String LOCAL_CALL = "LocalCall - "; + + public static void doNormalRemote() { + System.out.print(REMOTE_CALL); + doNormal(); + System.out.flush(); + } + + private static void doNormalLocal() { + System.out.print(LOCAL_CALL); + doNormal(); + System.out.flush(); + } + + public static void doRestrictedActionlRemote() { + System.out.print(REMOTE_CALL); + doRestrictedAction(); + System.out.flush(); + } + + private static void doRestrictedActionLocal() { + System.out.print(LOCAL_CALL); + doRestrictedAction(); + System.out.flush(); } } diff -r 18e401faa1b9 -r c87f010b8cf7 tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java --- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java Mon Aug 24 12:28:23 2015 -0400 +++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java Tue Aug 25 18:52:07 2015 +0200 @@ -34,8 +34,10 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ +//package MixedSigningAndTrustedOnlyPackage; package MixedSigningAndTrustedOnlyPackage; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -57,6 +59,7 @@ static List HEADLESS = Arrays.asList(new String[]{OptionsDefinitions.OPTIONS.HEADLESS.option}); static List HTML = Arrays.asList(new String[]{OptionsDefinitions.OPTIONS.HTML.option}); + static List verbose = Arrays.asList(new String[]{OptionsDefinitions.OPTIONS.VERBOSE.option}); public static final String PREFIX = "MixedSigningAndTrustedOnly"; public static final String C1 = "Class1"; @@ -64,10 +67,17 @@ static final String ID11 = PREFIX + C1; static final String ID12 = PREFIX + C2; - static final String ID21 = PREFIX + C2; - static final String ID22 = PREFIX + C1; + static final String ID21 = PREFIX + C1; + static final String ID22 = PREFIX + C2; + + static final String RUNNING = " running"; //note the space + static final String RUNNING1 = ID11 + RUNNING; + static final String RUNNING2 = ID22 + RUNNING; + static final String RESTRICTED_CONFIRM_SUFFIX = " Property read"; //note the space static final String NORMAL_CONFIRM_SUFFIX = " confirmed"; //same + static final String REMOTE_PREFIX = "RemoteCall - "; //note the space + static final String LOCAL_PREFIX = "LocalCall - "; //note the space static final String RESTRICTED11 = ID11 + RESTRICTED_CONFIRM_SUFFIX; static final String NORMAL11 = ID11 + NORMAL_CONFIRM_SUFFIX; @@ -299,17 +309,58 @@ Assert.assertEquals("\n\n", c4.toString()); } - static void assertAllOk(ProcessResult pr) { - Assert.assertTrue(pr.stdout.contains(NORMAL11)); - Assert.assertTrue(pr.stdout.contains(NORMAL12)); - Assert.assertTrue(pr.stdout.contains(NORMAL21)); - Assert.assertTrue(pr.stdout.contains(NORMAL22)); - Assert.assertTrue(pr.stdout.contains(RESTRICTED11)); - Assert.assertTrue(pr.stdout.contains(RESTRICTED12)); - Assert.assertTrue(pr.stdout.contains(RESTRICTED21)); - Assert.assertTrue(pr.stdout.contains(RESTRICTED22)); + static void assertAllOkC1(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING1)); + Assert.assertFalse(pr.stdout.contains(RUNNING2)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL12)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + RESTRICTED12)); } + static void assertAllOkC2(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING2)); + Assert.assertFalse(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL21)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + RESTRICTED21)); + } + + static void assertC1C1okTransNotOk(ProcessResult pr) { + Assert.assertFalse(pr.stdout.contains(RUNNING2)); + Assert.assertTrue(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11)); + Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX)); + } + + static void assertC2C2okTransNotOk(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING2)); + Assert.assertFalse(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22)); + Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX)); + } + + + static void assertC1C1OnlyUnrestrictedokTransNotOk(ProcessResult pr) { + Assert.assertFalse(pr.stdout.contains(RUNNING2)); + Assert.assertTrue(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11)); + Assert.assertFalse(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11)); + Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX)); + } + + static void assertC2C2OnlyUnrestrictedokTransNotOk(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING2)); + Assert.assertFalse(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22)); + Assert.assertFalse(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22)); + Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX)); + } + + //mostly useless, all tests are killed static void assertProcessOk(ProcessResult pr) { Assert.assertEquals(0, pr.returnValue.intValue()); @@ -320,22 +371,49 @@ Assert.assertNotEquals(0, pr.returnValue.intValue()); } - static void assertAllButRestricted(ProcessResult pr) { - Assert.assertTrue(pr.stdout.contains(NORMAL11)); - Assert.assertTrue(pr.stdout.contains(NORMAL12)); - Assert.assertTrue(pr.stdout.contains(NORMAL21)); - Assert.assertTrue(pr.stdout.contains(NORMAL22)); + static void assertAllButRestrictedC1(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING1)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL12)); + assertNotRestricted(pr); + } + + static void assertAllButRestrictedC2(ProcessResult pr) { + Assert.assertTrue(pr.stdout.contains(RUNNING2)); + Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL21)); + Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22)); + assertNotRestricted(pr); + } + + static void assertNotRestricted(ProcessResult pr) { Assert.assertFalse(pr.stdout.contains(RESTRICTED11)); Assert.assertFalse(pr.stdout.contains(RESTRICTED12)); Assert.assertFalse(pr.stdout.contains(RESTRICTED21)); Assert.assertFalse(pr.stdout.contains(RESTRICTED22)); } - + static void assertLaunchException(ProcessResult pr) { Assert.assertTrue(pr.stderr.contains("net.sourceforge.jnlp.LaunchException")); } - - static void assertNone(ProcessResult pr) { + static void assertInitError(ProcessResult pr) { + Assert.assertTrue(pr.stderr.contains("Fatal: Initialization Error")); + } + + static void assertSecurityException(ProcessResult pr) { + Assert.assertTrue(pr.stderr.contains("java.lang.SecurityException")); + } + + static void assertAccessControlException(ProcessResult pr) { + Assert.assertTrue(pr.stderr.contains("java.security.AccessControlException")); + } + + static void assertAccessDenied(ProcessResult pr) { + Assert.assertTrue(pr.stderr.contains("access denied")); + } + + static void assertNone(ProcessResult pr) { + Assert.assertFalse(pr.stdout.contains(RUNNING1)); + Assert.assertFalse(pr.stdout.contains(RUNNING2)); Assert.assertFalse(pr.stdout.contains(NORMAL11)); Assert.assertFalse(pr.stdout.contains(NORMAL12)); Assert.assertFalse(pr.stdout.contains(NORMAL21)); diff -r 18e401faa1b9 -r c87f010b8cf7 tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java --- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java Mon Aug 24 12:28:23 2015 -0400 +++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java Tue Aug 25 18:52:07 2015 +0200 @@ -34,6 +34,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ +//package MixedSigningAndTrustedOnlyPackage; package MixedSigningAndTrustedOnlyPackage; import net.sourceforge.jnlp.ProcessResult; @@ -53,27 +54,27 @@ import org.junit.AfterClass; import org.junit.BeforeClass; - /** - * - * Very simple tests. Basic behavior. jnlp and html with single signed jar, no trusted-only manifest - * note - this file is declared to be in package, but directory is wrong. Itw reproducers engine needs it like it, but your ide may complain. Try to live with. Sorry + * + * Very simple tests. Basic behavior. jnlp and html with single signed jar, no + * trusted-only manifest note - this file is declared to be in package, but + * directory is wrong. Itw reproducers engine needs it like it, but your ide may + * complain. Try to live with. Sorry */ public class MixedSigningAndTrustedOnlyBS1 extends BrowserTest { + private static DeploymentPropertiesModifier q; - private static DeploymentPropertiesModifier q; - @BeforeClass - public static void setDeploymentProperties() throws IOException{ + public static void setDeploymentProperties() throws IOException { q = setDeploymentPropertiesImpl(); } - + @AfterClass - public static void resetDeploymentProperties() throws IOException{ + public static void resetDeploymentProperties() throws IOException { q.restoreProperties(); } - + @NeedsDisplay @Test @TestInBrowsers(testIn = {Browsers.one}) @@ -81,16 +82,16 @@ String file = prepareFile(FileType.HTML, C1, new Archives[]{BS}, new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false); ProcessResult pr = server.executeBrowser(file, AutoClose.CLOSE_ON_BOTH); - assertAllOk(pr); + assertAllOkC1(pr); } - + @NeedsDisplay @Test public void jnlpHtmlC1AllCommandsBS() throws Exception { String file = prepareFile(FileType.HTML, C1, new Archives[]{BS}, new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false); ProcessResult pr = server.executeJavaws(HTML, file, new AutoOkClosingListener(), new AutoErrorClosingListener()); - assertAllOk(pr); + assertAllOkC1(pr); } @Test @@ -98,7 +99,9 @@ String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BS}, new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false); ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener()); - assertAllButRestricted(pr); + assertAllButRestrictedC1(pr); + assertLaunchException(pr); + assertAccessDenied(pr); } @Test @@ -106,8 +109,10 @@ public void jnlpAppletC1AllCommandsBSnosec() throws Exception { String file = prepareFile(FileType.JNLP_APPLET, C1, new Archives[]{BS}, new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false); - ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), new AutoErrorClosingListener()); - assertAllButRestricted(pr); + ProcessResult pr = server.executeJavaws(verbose, file, new AutoOkClosingListener(), new AutoErrorClosingListener()); + assertAllButRestrictedC1(pr); + assertAccessControlException(pr); + assertAccessDenied(pr); } @Test @@ -115,7 +120,7 @@ String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BS}, new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true); ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener()); - assertAllOk(pr); + assertAllOkC1(pr); } From jvanek at redhat.com Wed Aug 26 08:14:04 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 26 Aug 2015 10:14:04 +0200 Subject: [rfc][icedtea-web] Generate Bash Completion file In-Reply-To: <5583F700.1040102@redhat.com> References: <557DC292.2090008@redhat.com> <823982677.16649818.1434643912153.JavaMail.zimbra@redhat.com> <5583F700.1040102@redhat.com> Message-ID: <55DD754C.8050206@redhat.com> Hi Lukasz! Tahnk you for your email. Here is, according to yours input, finished version which I'm going to push. tahnk you again! J. On 06/19/2015 01:03 PM, Jiri Vanek wrote: > On 06/18/2015 06:11 PM, Lukasz Dracz wrote:> Hello, >> >> I have included an updated patch, that is not finished and doesn't work at the moment. >> I have a few questions. >> >> I think the main question is what generates all the install-am and install-*Something*-am 's that >> then reference something >> like install-*SOMETHING*-local from the makefile.am. I can't seem to figure this part. I can see >> that the automake that generates the .in file from the .am >> adds these in but what tells automake to do this ? Is there a convention to follow that once >> followed means automake will do this ? > > Isn't the way of generated files obvious in our Makefile.am? >> >> ----- Original Message ----- >>> From: "Jiri Vanek" >>> To: "IcedTea Distro List" , "Lukasz Dracz" , >>> aazores at icedtea.classpath.org >>> Sent: Sunday, June 14, 2015 2:06:10 PM >>> Subject: re: [rfc][icedtea-web] Generate Bash Completion file >>> >>> >>> >>> >>> hi! >>> >>> A lot of nits just from quick web based reading. >>> >>> >>> diff --git a/Makefile.am b/Makefile.am >>> --- a/Makefile.am >>> +++ b/Makefile.am >>> @@ -259,13 +259,13 @@ >>> check-local: $(RHINO_TESTS) $(JUNIT_TESTS) >>> >>> clean-local: clean-netx clean-plugin clean-liveconnect \ >>> - clean-native-ecj clean-launchers clean-desktop-files clean-docs >>> clean-generated-docs clean-tests clean-bootstrap-directory >>> + clean-native-ecj clean-launchers clean-desktop-files clean-docs >>> clean-generated-docs clean-generated-bash-completion clean-tests >>> clean-bootstrap-directory >>> if [ -e stamps ] ; then \ >>> rmdir stamps ; \ >>> fi >>> >>> .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug >>> clean-add-plugin clean-add-plugin-debug \ >>> - clean-bootstrap-directory clean-native-ecj clean-desktop-files >>> clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs \ >>> + clean-bootstrap-directory clean-native-ecj clean-desktop-files >>> clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs >>> clean-generated-bash-completion \ >>> clean-tests check-local clean-launchers stamps/check-pac-functions.stamp >>> stamps/run-netx-unit-tests.stamp clean-netx-tests \ >>> clean-junit-runner clean-netx-unit-tests >>> >>> @@ -504,6 +504,12 @@ >>> sed -i '/RhinoBasedPacEvaluator/ d' $@ >>> endif >>> >>> +stamps/generate-bash-completion.stamp: stamps/netx.stamp > Agaiun - why stamp??? teh generated file IS the "stamp" and THE target >>> + BC_COMMAND="$(SYSTEM_JRE_DIR)/bin/java -cp $(NETX_DIR) >>> net.sourceforge.jnlp.OptionsDefinitions" ; \ >>> + $$BC_COMMAND; \ >>> + sudo mv icedteaweb-completion /etc/bash_completion.d/ ; \ >>> >>> This is absolyutely no go. You must split this to two targets >>> - first during make. during make you generate this file o BUILD_DIR >>> - second, during install, you install the genrated file to >>> PREFIX/etc/bash_completion.d/icedteaweb-completion >> >> >> >>> You do not need to handle permissions - user decide in configure time what is >>> PREFIX, and then in install time he use root or not, acording to his prefix. >>> By default prefix is "/" so by default you hav eto be root to call make >>> install. >>> But only make install. not make. >> >> What is the point of PREFIX ? is it for if the user has /etc/bash_comletion.d/ located under a folder >> something like /randomDir/etc/bash_completion.d/ or does it have something to do with permissions ? > > oh dear ;((( > > yes, prefix is exacrtly fo this. > > It msut be clear from "/" being default prefix, or not? > > If you during configure set your own porefix, you expect application ends in in prefix. Nowehre else. > If you then see IN_YOUR_PREFIX/etc/somefile you can gues that somefile belongs to /etc/ - check it > and palce it here or link on your own. > > How are you testingitw??? You are not using custom prefix???? So you are actually runnint the make > install as root? Oh dear :( >> >>> + touch $@ ; >>> + >>> stamps/generate-docs.stamp: stamps/netx.stamp >>> mkdir -p "$(DOCS_DIR)" ; \ >>> HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ >>> @@ -571,7 +577,7 @@ >>> mkdir -p stamps >>> touch $@ >>> >>> >>> acordingly the clean phases have to be splited. >>> >>> By the way - make install is generated target. Yo just add generated >>> icedteaweb-completion to list of cared files. >> >> Where do I add to this list ? >> >>> Also, please dont use stamps fo simple generation. The target is file itself. >>> ( see lower) >> >> Okay >> >>> -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest >>> stamps/generate-docs.stamp >>> +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest >>> stamps/generate-docs.stamp stamps/generate-bash-completion.stamp stamps/ >>> (cd $(NETX_DIR) ; \ >>> mkdir -p lib ; \ >>> $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ >>> @@ -686,6 +692,8 @@ >>> rm -rf "$(DOCS_DIR)" >>> rm -f stamps/generate-docs.stamp >>> >>> +clean-generated-bash-completion: >>> + rm -rf stamps/generate-bash-completion.stamp >>> >>> Ok. Here is the bug. What the target is cleaning? It is removing stamp! not >>> generated file! >> >> Okay use of stamps removed. >> >>> # check >>> # ========================== >>> diff --git a/icedteaweb-completion b/icedteaweb-completion >>> deleted file mode 100644 >>> --- a/icedteaweb-completion >>> +++ /dev/null >>> >>> Hmm... Why to remove. The file in javacode is absolutely unreadable. I would >>> rater move this file to >>> icedteaweb-completion.in and durng generation just replaced the stings ifn >>> "opts" >> >> Okay moved to icedteaweb-completion.in and added one "-verbose" flag to policyeditor that I >> noticed was added. > > So other then -verbose, the file is same? hmm >> >>> >@@ -1,44 +0,0 @@ >>> >-#/bin/bash >>> >-#place this file over to/etc/bash_completion.d/ to make this file useful >>> >-#Note: If you do not have bash-completion you will need to install it >>> >-_itweb-settings() >>> >-{ >>> >- local cur prev opts base >>> >- cur="${COMP_WORDS[COMP_CWORD]}" >>> >- prev="${COMP_WORDS[COMP_CWORD-1]}" >>> >- >>> >- # Icedtea-web settings Options >>> >- opts="-check -get -headless -help -info -list -reset -set -verbose" >>> >- >>> >- COMPREPLY=($(compgen -W "${opts}" -- ${cur})) >>> >- return 0 >>> >-} >>> >-complete -F _itweb-settings itweb-settings >>> >- >>> >-_policyeditor() >>> >-{ >>> >- local cur prev opts base >>> >- cur="${COMP_WORDS[COMP_CWORD]}" >>> >- prev="${COMP_WORDS[COMP_CWORD-1]}" >>> >- >>> >- # PolicyEditor Options >>> >- opts="-codebase -file -help" >>> >- >>> >- COMPREPLY=($(compgen -W "${opts}" -- ${cur})) >>> >- return 0 >>> >-} >>> >-complete -F _policyeditor policyeditor >>> >- >>> >-_javaws() >>> >-{ >>> >- local cur prev opts base >>> >- cur="${COMP_WORDS[COMP_CWORD]}" >>> >- prev="${COMP_WORDS[COMP_CWORD-1]}" >>> >- >>> >- # JavaWs Options >>> >- opts="-about -help -license -viewer -Xclearcache -allowredirect -arg >>> >-headless -html -jnlp -nosecurity -noupdate -param -property -strict -update >>> >-verbose -version -Xignoreheaders -xml -Xnofork -Xoffline -Xtrustnone" >>> >- >>> >- COMPREPLY=($(compgen -W "${opts}" -- ${cur})) >>> >- return 0 >>> >-} >>> >-complete -F _javaws javaws >>> >diff --git a/netx/net/sourceforge/jnlp/OptionsDefinitions.java >>> >b/netx/net/sourceforge/jnlp/OptionsDefinitions.java >>> >--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java >>> >+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java >>> >@@ -36,6 +36,9 @@ >>> > */ >>> > package net.sourceforge.jnlp; >>> > >>> >+import java.io.File; >>> >+import java.io.IOException; >>> >+import java.nio.file.Files; >>> > import java.util.ArrayList; >>> > import java.util.Arrays; >>> > import java.util.List; >>> >@@ -223,5 +226,65 @@ >>> > return l; >>> > } >>> > >>> >- >>> >+ public static void main(String [ ] args) throws IOException { >>> >+ makeTabCompletionFile(); >>> >+ } >>> >+ >>> >+ public static String transformToLine (List options) { >>> >+ String line = ""; >>> >+ for (OPTIONS option : options) { >>> >+ line = line + option.option + " "; >>> >+ } >>> >+ return line; >>> >+ } >>> >+ public static void makeTabCompletionFile() throws IOException { >>> > >>> >Is there any difference against orignal file? if no,please use .in format. >>> > >>> >If yes, then please split this patch to two parts. Firt, replace already >>> >pushed file by this new powerful (and it will be valid also for 1.6!) and as >>> >second patch, chnage it to .in form, and proceed with generation. >> No difference other than the -verbose flag I noticed was missing. >> >> Thanks for the review ! >> >> Regards, >> Lukasz Dracz >> >> >> generate-bash-completion-4.patch >> >> >> diff --git a/Makefile.am b/Makefile.am >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -302,6 +302,9 @@ >> endif >> endif >> >> +install-bash-local: >> + mv icedteaweb-completion /etc/bash_completion.d/ >> + > > uh.... > mv icedteaweb-completion $(DESTDIR)/etc/bash_completion.d/ > and don't forget to ensure existence of that dir. > > also - what is usage of this target? It never will be called. This line belongs to install target. > >> # all generated manpages must be removed one by one >> uninstall-local: >> rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) >> @@ -504,6 +507,13 @@ >> sed -i '/RhinoBasedPacEvaluator/ d' $@ >> endif > > Here is missng uninstall of your file... >> >> +generate-bash-completion: >> + BC_COMMAND="$(SYSTEM_JRE_DIR)/bin/java -cp $(NETX_DIR) >> net.sourceforge.jnlp.OptionsDefinitions" ; \ > We have standartized macro to construct classapth. >> + $$BC_COMMAND; > > For the usage see the bottom. I really have strong agasnt against this approach:( >> + >> +install-bash-completion: >> + mv icedteaweb-completion/etc/bash_completion.d/ > Never duplicate code. Call. And anyway, both those targets are wrong. > >> + > > It sa second time here?? > > the > uh.... > mv icedteaweb-completion $(DESTDIR)/etc/bash_completion.d/ > and don't forget to ensure existence of that dir. > will eb avlid anyway >> stamps/generate-docs.stamp: stamps/netx.stamp >> mkdir -p "$(DOCS_DIR)" ; \ >> HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ >> @@ -571,7 +581,7 @@ >> mkdir -p stamps >> touch $@ >> >> -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest >> stamps/generate-docs.stamp >> +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest >> stamps/generate-docs.stamp generate-bash-completion > > The generation is 100% not part of netx.jar. Pelase find better target. > > The docs are here, because half of them is included direltly in netx.jar >> (cd $(NETX_DIR) ; \ >> mkdir -p lib ; \ >> $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ >> @@ -686,7 +696,6 @@ >> rm -rf "$(DOCS_DIR)" >> rm -f stamps/generate-docs.stamp >> >> - >> # check >> # ========================== >> >> diff --git a/icedteaweb-completion b/icedteaweb-completion.in >> rename from icedteaweb-completion >> rename to icedteaweb-completion.in >> --- a/icedteaweb-completion >> +++ b/icedteaweb-completion.in >> @@ -22,7 +22,7 @@ >> prev="${COMP_WORDS[COMP_CWORD-1]}" >> >> # PolicyEditor Options >> - opts="-codebase -file -help" >> + opts="-codebase -file -help -verbose" >> >> COMPREPLY=($(compgen -W "${opts}" -- ${cur})) >> return 0 >> @@ -37,7 +37,6 @@ >> >> # JavaWs Options >> opts="-about -help -license -viewer -Xclearcache -allowredirect -arg -headless -html -jnlp >> -nosecurity -noupdate -param -property -strict -update -verbose -version -Xignoreheaders -xml >> -Xnofork -Xoffline -Xtrustnone" >> - >> COMPREPLY=($(compgen -W "${opts}" -- ${cur})) >> return 0 >> } >> diff --git a/netx/net/sourceforge/jnlp/OptionsDefinitions.java >> b/netx/net/sourceforge/jnlp/OptionsDefinitions.java >> --- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java >> +++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java >> @@ -1,4 +1,4 @@ >> -/* >> +/* >> Copyright (C) 2008 Red Hat, Inc. >> >> This file is part of IcedTea. >> @@ -36,12 +36,20 @@ >> */ >> package net.sourceforge.jnlp; >> >> +import java.io.BufferedReader; >> +import java.io.File; >> +import java.io.FileReader; >> +import java.io.IOException; >> +import java.nio.file.Files; >> import java.util.ArrayList; >> import java.util.Arrays; >> import java.util.List; >> >> import static net.sourceforge.jnlp.runtime.Translator.R; >> >> +import net.sourceforge.jnlp.config.InfrastructureFileDescriptor; >> +import net.sourceforge.jnlp.config.PathsAndFiles; >> + >> public class OptionsDefinitions { >> >> public static enum OPTIONS { >> @@ -223,5 +231,46 @@ >> return l; >> } >> >> - >> + public static void main(String [ ] args) throws IOException { >> + replaceOptionsInTabCompletionFile(); >> + } >> + >> + public static String transformToLine (List options) { >> + String line = ""; >> + for (OPTIONS option : options) { >> + line = line + option.option + " "; >> + } > nit - use stringbuilder rather. Also please keep the String without trailing space. > Also please, add unit test fo this method. It is crucialmethod of the approach. Also made it > protected or package private. > >> + return line; >> + } >> + >> + public static void replaceOptionsInTabCompletionFile() throws IOException { > Also this methdo protected or package rpivate + test.. But I would liek to encourage you to go > different way ( se bellow) > > Also - if you proeprly test this method, it will force you to decompose it, and so you will figure > out why I'm forcing you to do some things. > >> + String opts = " opts=\""; >> + File inputCompletionFile = new File("../icedteaweb-completion.in"); > If you will continue with this approach, dont hardcode file, pass it as argument. Still I wiould > like to discourage you. See bottom. > >> + File completionFile = new File("icedteaweb-completion"); >> + FileReader fileReader = new FileReader(inputCompletionFile); >> + BufferedReader bufferedReader = new BufferedReader(fileReader); >> + >> + String body = ""; >> + String line = bufferedReader.readLine(); >> + String options = ""; >> + while(line != null) { >> + if (line.contains("itweb-settings")) { >> + options = transformToLine(getItwsettingsCommands()); >> + } else if (line.contains("policyeditor")) { >> + options = transformToLine(getPolicyEditorOptions()); >> + } else if (line.contains("javaws")) { >> + options = transformToLine(getJavaWsOptions()); >> + } >> + >> + if (line.contains(opts)) { >> + body = body + opts + options + "\"\n"; >> + } else { >> + body = body + line + "\n"; >> + } >> + line = bufferedReader.readLine(); >> + } >> + bufferedReader.close(); >> + >> + Files.write(completionFile.toPath(), body.getBytes()); >> + } >> } >> > > > Althoug this approach is much more better then the one before, its quite unreadable. > On one side I appreciate fresh mind, on second... I really think the standard steps are much more > versatile and stable and understandable. > > > s: > > 1) the main method of OptionsDefinitions will take exactly one parameter javaws itweb-settings or > policyeditor > > 2) according to it, it will print to *stdout* options for selcted program > 3) the in file will be readable - so it will have correct opts="@PROGRAM@" syntaxe > 4) code in makefile will get this output, and substitue @PROGRAM@ (eg @JAVAWS@ in .in file by given > value. > > You will see that your code will be much shorter (main method about lines and one line in makefile > for generation, one for install definiton, and 5 lines of options to string method. > > Tests may be longer. *but* tests to "my" approach are much shorter then for "yours" approach. > > > Sorry for so much feedback :( > > J. > -------------- next part -------------- A non-text attachment was scrubbed... Name: generation-Of-Bash-Completion4.patch Type: text/x-patch Size: 8452 bytes Desc: not available URL: From jvanek at redhat.com Wed Aug 26 08:16:38 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 26 Aug 2015 10:16:38 +0200 Subject: [rfc][icedtea-web] Update de localized messages to 1.6 In-Reply-To: References: <55AFCAD1.1030609@gmx.de> <55B0A150.5010102@redhat.com> <55B0D9F6.3090508@gmx.de> <55B0E667.40900@redhat.com> <55B0EF56.4080900@redhat.com> <55B11842.3000605@gmx.de> Message-ID: <55DD75E6.3080307@redhat.com> Hello Jacob! Tehre was silence for pretty long time... Will there be some update? If no,I will push changes to Messages_de.properties based on your patch, with fixes from Stefan. ok? Thank you both for translations! J. On 08/03/2015 09:52 PM, Stefan Ring wrote: > 2015-07-31 18:40 GMT+02:00 Stefan Ring : >> On top of your patch (both as attachment and inline, so I can quote >> myself later): >> >> diff --git a/netx/net/sourceforge/jnlp/resources/Messages_de.properties >> b/netx/net/sourceforge/jnlp/resources/Messages_de.properties >> --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties >> +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties >> @@ -69,7 +69,7 @@ >> >> # version check minidialogue >> #JREversionDontMatch=Warning - your JRE - {0} - does not match >> requested JRE - {1} >> -JREversionDontMatch=Warnung: Die angeforderte JRE \u201e{1}\u201c >> stimmt nicht mit der JRE \u201e{1}\u201c \u00fcberein >> +JREversionDontMatch=Warnung: Die angeforderte JRE \u201e{1}\u201c >> stimmt nicht mit der vorhandenen JRE \u201e{0}\u201c \u00fcberein >> #JREContinueDialogSentence2=Do you wont to continue in running? >> JREContinueDialogSentence2=Soll Ausf\u00fchrung fortgesetzt werden? >> #JREContinueDialogSentenceTitle=Incompatible JRE >> @@ -158,7 +158,7 @@ >> LNotLaunchableInfo=Datei muss ein JNLP Anwendungs-, Applet- oder >> Installertyp sein. >> LCantDetermineMainClass=Unbekannte Hauptklasse. >> LCantDetermineMainClassInfo=Konnte die Hauptklasse f\u00fcr diese >> Anwendung nicht bestimmen. >> -LUnsignedJarWithSecurity=Kann keine Berechtigungen nicht signierten >> JARs gew\u00e4hren. >> +LUnsignedJarWithSecurity=Kann nicht signierten JARs keine >> Berechtigungen gew\u00e4hren. >> 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. >> @@ -168,7 +168,7 @@ >> LPartiallySignedApplet=Das Applet wurde teilweise signiert. >> LPartiallySignedAppletUserDenied=Das Applet wurde teilweise signiert >> und ihm wurde nicht vertraut. >> LSignedAppJarUsingUnsignedJar=Signierte Anwendung nutzt nicht signierte JARs. >> -LSignedAppJarUsingUnsignedJarInfo=Das Haupt-JAR der Anwendung ist >> signiert, aber manche JARs, die sie nutzt sind nicht. >> +LSignedAppJarUsingUnsignedJarInfo=Das Haupt-JAR der Anwendung ist >> signiert, aber manche JARs, die sie nutzt, nicht. >> LRunInSandboxError=Ausf\u00fchren im Sandkasten-Aufruf wurde zu >> sp\u00e4t ausgef\u00fchrt. >> LRunInSandboxErrorInfo=Der Klassenlader wurde benachrichtigt das >> Applet im Sandkasten auszuf\u00fchren, aber die >> Sicherheitseinstellungen waren bereits initialisiert. >> LSignedJNLPFileDidNotMatch=Die signierte JNLP-Datei stimmt nicht mit >> der startenden JNLP-Datei \u00fcberein. >> @@ -184,7 +184,7 @@ >> >> LNotVerified=JARs nicht verifiziert. >> LCancelOnUserRequest=Abgebrochen auf Anfrage des Benutzers. >> -LFatalVerification=W\u00e4hrend des Versuchs JARs zu verifizieren, >> ist ein fataler Fehler aufgetreten. >> +LFatalVerification=W\u00e4hrend des Versuchs, JARs zu verifizieren, >> ist ein fataler Fehler aufgetreten. >> LFatalVerificationInfo=Eine Ausnahme in der Klasse JarCertVerifier >> wurde abgefangen. Die Unlesbarkeit der Dateien cacerts oder >> trusted.certs k\u00f6nnte eine Ursache dieser Ausnahmen sein. >> >> >> @@ -272,9 +272,9 @@ >> >> # icedtea-web man (note, spaces are important due to man pages markup >> #ITWintroL1={0} provides a free software web browser plugin running >> applets written in the Java programming language and an implementation >> of Java Web Start, originally based on the NetX project. >> -ITWintroL1=Mit {0} wird ein Browser Plug-in als freie Software >> angeboten, mit dem in Java geschriebene Applets ausgef\u00fchrt werden >> k\u00f6nnen sowie eine Implementierung von \u201eJava Web Start\u201c, >> urspr\u00fcnglich basiert auf dem NetX Projekt. >> +ITWintroL1=Mit {0} wird ein Browser Plug-in als freie Software >> angeboten, mit dem in Java geschriebene Applets ausgef\u00fchrt werden >> k\u00f6nnen, sowie eine Implementierung von \u201eJava Web >> Start\u201c, urspr\u00fcnglich auf dem NetX-Projekt basierend. >> #ITWintroL2=NetX enables Java applets and applications to be >> downloaded over the network, cached, and (by default) run in a secure >> sandbox environment. Subsequent executions of the applet download the >> latest version automatically. Update and security settings, among >> others, can be set using the itw-settings command. >> -ITWintroL2=NetX erm\u00f6glicht das Herunterladen, die >> Zwischenspeicherung und die Ausf\u00fchrung von Java-Applets und >> Anwendungen in einer sicheren Sandkastenumgebung >> (Standardeinstellung). Bei nachfolgenden Starts eines Applets werden >> immer die neuesten Versionen automatisch heruntergeladen. Mit dem >> Befehl \u201eitw-settings\u201c k\u00f6nnen unter anderem >> Aktualisierungs- sowie Sicherheitseinstellungen gesetzt werden. >> +ITWintroL2=NetX erm\u00f6glicht das Herunterladen, die >> Zwischenspeicherung und die Ausf\u00fchrung von Java-Applets und >> Anwendungen in einer sicheren Sandkastenumgebung >> (Standardeinstellung). Bei nachfolgenden Starts eines Applets wird die >> jeweils neueste Version automatisch heruntergeladen. Mit dem Befehl >> \u201eitw-settings\u201c k\u00f6nnen unter anderem Aktualisierungs- >> sowie Sicherheitseinstellungen gesetzt werden. >> #ITWintroL3={0} also includes a plugin to {1} within web browsers. >> ITWintroL3=\u201e{0}\u201c enth\u00e4lt ebenfalls ein Plug-in >> f\u00fcr \u201e{1}\u201c in Webbrowsern. >> #ITWintroUrlCaption = enable Java applets >> @@ -341,7 +341,7 @@ >> >> # policyeditor man (note, spaces (especially the one around markup) >> are important due to man pages markup). Only bold tag is now >> recognized by ReplacingTextFormatter. >> #PEintro=\ - view and edit security policy settings for javaws >> and the browser plugin >> -PEintro=\ \u2014 die Einstellungen der Sicherheitsrichtlinie >> f\u00fcr javaws und das Browser Plug-in anzeigen und >> bearbeiten >> +PEintro=\ \u2014 Einstellungen der Sicherheitsrichtlinie f\u00fcr >> javaws und das Browser Plug-in anzeigen und bearbeiten >> #PEsynopseP1=policy_file >> PEsynopseP1=Richtliniendatei >> #PEsynopseP2=url >> @@ -350,10 +350,10 @@ >> #of javaws and the browser plugin. It is intended as a >> simpler, easier to use, and more accessible alternative \ >> #to the standard JDK Policy Tool. Administrators and power >> users who need fine grained control over policy files should probably >> use \ >> #Policy Tool instead of PolicyEditor. >> -PEdescL1=ist eine Anwendung mit grafischer Benutzeroberfl\u00e4che >> sowie ein wenig Befehlszeilenunterst\u00fctzung. Die Anwendung >> erm\u00f6glicht die Anzeige und Bearbeitung von >> Sicherheitsrichtlinieneinstellungen f\u00fcr Applets, die durch die >> Implementierungen von javaws und des Browser Plug-ins >> in IcedTea-Web verwendet werden. Sie ist als eine vereinfachte und >> leichter zu nutzende Alternative zum JDK Policy Tool gedacht. >> Administratoren und fortgeschrittene Benutzer, die eine fein granulare >> Kontrolle \u00fcber Richtliniendateien brauchen, sollten das >> policytool statt des PolicyEditor verwenden. >> +PEdescL1=ist eine Anwendung mit grafischer Benutzeroberfl\u00e4che >> sowie ein wenig Kommandozeilenunterst\u00fctzung. Die Anwendung >> erm\u00f6glicht die Anzeige und Bearbeitung von >> Sicherheitsrichtlinieneinstellungen f\u00fcr Applets, die durch die >> Implementierungen von javaws und des Browser Plug-ins >> in IcedTea-Web verwendet werden. Sie ist als eine vereinfachte und >> leichter zu nutzende Alternative zum JDK Policy Tool gedacht. >> Administratoren und fortgeschrittene Benutzer, die eine fein granulare >> Kontrolle \u00fcber Richtliniendateien brauchen, sollten das >> policytool statt des PolicyEditor verwenden. >> #PEdescL2=If executed without any arguments, no file is opened, and >> saving the file will result in a prompt on where to save it. >> Otherwise, if a file path is given as \ >> #a command line argument, then that file path will be opened and >> parsed as policy file. >> -PEdescL2=Werden keine Parameter bei der Ausf\u00fchrung angegeben, so >> wird keine Datei ge\u00f6ffnet und eine Aufforderung zur Angabe des >> Speicherortes erscheint. Wird ansonsten ein Dateipfad als Parameter an >> der Kommandozeile angegeben, so wird der Dateipfand ge\u00f6ffnet und >> als eine Richtliniendatei verarbeitet. >> +PEdescL2=Werden keine Parameter bei der Ausf\u00fchrung angegeben, so >> wird keine Datei ge\u00f6ffnet, und eine Aufforderung zur Angabe des >> Speicherortes erscheint. Wird ansonsten ein Dateipfad als Parameter an >> der Kommandozeile angegeben, so wird der Dateipfand ge\u00f6ffnet und >> als eine Richtliniendatei verarbeitet. >> #PEexampleL1=Show GUI and opens the default policy file. >> PEexampleL1=Zeigt den GUI-Editor mit der ge\u00f6ffneten >> Standardrichtliniendatei an. >> #PEexampleL2=Show the GUI editor with no file opened. >> @@ -367,8 +367,8 @@ >> JWSdescL1=ist eine Implementierung eines JNLP-Klients. Sie verwendet >> eine JNLP-Datei (Java Network Launch Protocol) um eine Java-Anwendung >> oder ein Applet sicher auszuf\u00fchren. \ >> Diese Implementierung von {0} basiert auf dem NetX Projekt und wird >> durch das IcedTea Projekt vertrieben. >> #JWSdescL2=A JNLP file is an xml file that describes how to securely >> run a remote Java application or a Java applet. >> -JWSdescL2=Eine JNLP-Datei ist eine XML-Datei in der beschrieben ist, >> wie eine Java-Anwendung oder ein Applet sicher auszuf\u00fchren ist. >> -#JWSoptionsL1=When specifying options, the name of the jnlp file must >> be the last argument to javaws - all the options must preceede it. >> +JWSdescL2=Eine JNLP-Datei ist eine XML-Datei mit einer Beschreibung >> zur sicheren Ausf\u00fchrung einer Java-Anwendung oder eines Applets. >> +#JWSoptionsL1=When specifying options, the name of the jnlp file must >> be the last argument to javaws - all the options must precede it. >> JWSoptionsL1=Bei der Angabe von Optionen muss der Name der JNLP-Datei >> als letzter Parameter an javaws \u00fcbergeben werden. Alle Optionen >> m\u00fcssen ihm vorausgehen. >> #JWSoptionsL2=The jnlp-file can either be a url or a local path. >> JWSoptionsL2=Die JNLP-Datei kann entweder eine URL oder ein lokaler Pfad sein. >> @@ -413,7 +413,7 @@ >> BXoffline=Deaktiviert den Netzwerkzugriff von IcedTea-Web. >> Ausschlie\u00dflich der Zwischenspeicher wird verwendet. Anwendungen >> k\u00f6nnen weiterhin auf das Netzwerk zugreifen. >> #BOHelp1=Prints out information about supported command and basic usage. >> BOHelp1=Gibt Informationen \u00fcber unterst\u00fctzte Befehle und >> grundlegende Verwendung aus. >> -#BOHelp2=Prints out information about supported command and basic >> usage. Can also take an parameter, and then it prints detailed help >> for this command. >> +#BOHelp2=Prints out information about supported command and basic >> usage. Can also take a parameter, and then it prints detailed help for >> this command. >> BOHelp2=Gibt Informationen \u00fcber unterst\u00fctzte Befehle und >> grundlegende Verwendung aus. Wird ein Befehl als Parameter angegeben, >> dann wird eine detaillierte Beschreibung des Befehls ausgegeben. >> #BOTrustnone=Instead of asking user, will foretold all answers as no. >> BOTrustnone=Alle Benutzeraufforderungen werden mit \u201eNein\u201c >> beantwortet. >> @@ -424,7 +424,7 @@ >> #IBOGet=Shows the value of the specified settings. >> IBOGet=Zeigt den Wert der angegebenen Einstellungen an. >> #IBOInfo=Shows additional information about the named settings. >> Includes a description, the current value, the possible values, and >> the source of the setting. >> -IBOInfo=Zeigt zus\u00e4tzliche Informationen \u00fcber die >> angegebenen Einstellungen an, inklusive einer Beschreibung, des >> aktuellen Werts, der zul\u00e4ssige Werte sowie des Ursprungs der >> Einstellung. >> +IBOInfo=Zeigt zus\u00e4tzliche Informationen \u00fcber die >> angegebenen Einstellungen an, inklusive einer Beschreibung des >> aktuellen Werts, der zul\u00e4ssigen Werte sowie des Ursprungs der >> Einstellung. >> #IBOSet=Sets the settings to the new value specified, if it is an >> appropriate value. >> IBOSet=Setzt die Einstellungen auf den neuen angegebenen Wert, >> vorausgesetzt der Wert ist zul\u00e4ssig. >> #IBOResetAll=Resets all settings to their original values. >> @@ -507,13 +507,13 @@ >> #EXAWdesktopWants=Desktop icon shortcut (applications want to). >> EXAWdesktopWants=Symbolverkn\u00fcpfung auf dem Desktop (durch die >> Anwendung vorgesehen). >> #EXAWdesktopDontWants=Desktop icon shortcut (applications don''t >> wants to, but you still can). >> -EXAWdesktopDontWants=Symbolverkn\u00fcpfung auf dem Desktop (durch >> die Anwendung nicht vorgesehen, aber auf Benutzeranforderung). >> +EXAWdesktopDontWants=Symbolverkn\u00fcpfung auf dem Desktop (durch >> die Anwendung nicht vorgesehen, aber auf Benutzeranforderung >> m\u00f6glich). >> #EXAWsubmenu=Menu icon shortcut (applications will try to include to >> submenu - {0}). >> EXAWsubmenu=Symbolverkn\u00fcpfung im Men\u00fc (Anwendung wird >> versuchen im Untermen\u00fc \u201e{0}\u201c anzulegen). >> -#EXAWmenuWants=Menu icon shortcut (applications wont to). >> +#EXAWmenuWants=Menu icon shortcut (applications want to). >> EXAWmenuWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die >> Anwendung vorgesehen). >> -#EXAWmenuDontWants=Menu icon shortcut (applications don''t wants to, >> but you still can). >> -EXAWmenuDontWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die >> Anwendung nicht vorgesehen, aber auf Benutzeranforderung). >> +#EXAWmenuDontWants=Menu icon shortcut (applications don''t want to, >> but you still can). >> +EXAWmenuDontWants=Symbolverkn\u00fcpfung im Men\u00fc (durch die >> Anwendung nicht vorgesehen, aber auf Benutzeranforderung >> m\u00f6glich). >> #EXAWsettingsInfo=Your curernt setting is: {0}. You can change it in >> itweb-settings in {1} panel. >> EXAWsettingsInfo=\u201e{0}\u201c ist eingestellt. Es kann \u00fcber >> das Panel \u201e{1}\u201c in itweb-settings ge\u00e4ndert werden. >> #EXAWsettingsManage=You can manage existing menu entries in >> itweb-settings in {0} panel. >> @@ -527,7 +527,7 @@ >> #EXAWrememberByAppTooltip=This application will never ask for >> more permissions questions >> EXAWrememberByAppTooltip=Diese Anwendung wird nie nach weiteren >> Berechtigungen fragen >> #EXAWrememberByPageTooltip=All applications from this domain >> will stop asking, and will follow your current decision on all >> permissions >> -EXAWrememberByPageTooltip=Alle Anwendungen in dieser >> Dom\u00e4ne werden nicht nach Berechtigungen fragen und alle >> Entscheidungen \u00fcber Berechtigungen werden angewendet >> +EXAWrememberByPageTooltip=Alle Anwendungen in dieser >> Dom\u00e4ne werden nicht mehr nach Berechtigungen fragen, sondern die >> bestehenden Berechtigungen verwenden >> #EXAWdontRememberTooltip=Your decision will be used only for >> this single permission for this single run >> EXAWdontRememberTooltip=Die Entscheidung wird >> ausschlie\u00dflich f\u00fcr diese Berechtigung und die Dauer dieser >> Ausf\u00fchrung verwendet >> #EXAWbrowser=browser desktop item >> @@ -544,31 +544,31 @@ >> #
  • This option will create shortcut to open your browser with >> current page loaded
  • \ >> #
  • If your browser support offline run, this is the safest option
  • >> EXAWbrowserToolTip=Browser-Verkn\u00fcpfung
    \ >> -
    • Diese Option erstellt eine Verkn\u00fcpfung, die den Browser >> mit der aktuell geladenen Seite \u00f6ffnet
    • \ >> -
    • Falls der Browser den Offlinebetrieb unterst\u00fctzt, ist dies >> die sicherste Option
    >> -#EXAWbrowsersToolTip=browser used for lunching this applet >> (will lunch icedtea-web later)
    \ >> +
  • Diese Option erstellt eine Verkn\u00fcpfung, die den Browser mit >> der aktuell geladenen Seite \u00f6ffnet
  • \ >> +
  • Falls der Browser den Offlinebetrieb unterst\u00fctzt, ist dies >> die sicherste Option
  • >> +#EXAWbrowsersToolTip=browser used for launching this applet >> (will launch icedtea-web later)
    \ > > I've removed several
      /
    here that are not part of the original string. > >> #
  • The default browser was preset
  • \ >> #
  • Feel free to include browser of your choice
  • >> EXAWbrowsersToolTip=Ein Browser, der zum Start dieses Applets >> (im IcedTea-Web Plug-in ausgef\u00fchrt) verwendet wird
    \ >> -
    • Der Standardbrowser war voreingestellt
    • \ >> -
    • Das Einf\u00fcgen eines beliebigen bevorzugten Browsers steht >> frei
    >> +
  • Der Standardbrowser war voreingestellt
  • \ >> +
  • Das Einf\u00fcgen eines beliebigen bevorzugten Browsers steht >> frei
  • >> #EXAWgeneratedToolTip=
  • The jnlp file will be generated from >> your current html page
  • \ >> -#
  • Once you lunch jor shortcut, javaws will lunch this jnlp file
  • \ >> +#
  • Once you launch jor shortcut, javaws will launch this jnlp file
  • \ > > "lunch" -> "launch" several times > >> #
  • This applet will then run without the browser
  • \ >> #
  • However experimental, this is working surprisingly well.
  • >> -EXAWgeneratedToolTip=
    • Eine JNLP-Datei wird aus der >> aktuellen HTML-Seite erzeugt
    • \ >> +EXAWgeneratedToolTip=
    • Eine JNLP-Datei wird aus der aktuellen >> HTML-Seite erzeugt
    • \ >>
    • Die Symbolverkn\u00fcpfung startet javaws mit dieser >> JNLP-Datei
    • \ >> -
    • Das Applet wird au\u00dferhalb des Browsers >> ausgef\u00fchrt

    \ >> -Diese Funktion ist in der Erprobung. >> +
  • Das Applet wird au\u00dferhalb des Browsers >> ausgef\u00fchrt

  • \ >> +Diese Funktion ist in der Erprobung, funktioniert aber erstaunlich >> gut. >> #EXAWhrefToolTip=Some applets are just pointing to jnlp file, >> which is containing actual informations about the resources of this >> app.
    \ >> -#
  • By selecting this option, this jnlp file will be saved and used >> for later lunches.
  • \ >> -#
  • Javaws will be the luncher, and this applet will run out >> of browser
  • \ >> -#
  • However good htis sounds, this si surprisingly not working
  • >> +#
  • By selecting this option, this jnlp file will be saved and used >> for later launches.
  • \ >> +#
  • Javaws will be the launcher, and this applet will run out >> of browser
  • \ >> +#
  • However good this sounds, this is surprisingly not working
  • >> EXAWhrefToolTip=Manche Applets verweisen lediglich auf eine >> JNLP-Datei, welche die eigentlichen Informationen \u00fcber die >> Ressourcen dieser Anwendung enth\u00e4lt.
    \ >> -
    • Diese Option speichert diese JNLP-Datei f\u00fcr sp\u00e4tere >> Starts
    • \ >> -
    • Die JNLP-Datei wird mit javaws gestartet und das >> Applet au\u00dferhalb des Browsers >> ausgef\u00fchrt

    \ >> -Diese Funktion ist in der Erprobung. >> -#EXAWhtmlToolTip=BY using -html switch, javaws can try to parse >> html and try to extract applet, and to lunch it out of browser
    \ >> +
  • Diese Option speichert diese JNLP-Datei f\u00fcr sp\u00e4tere Starts
  • \ >> +
  • Die JNLP-Datei wird mit javaws gestartet und das >> Applet au\u00dferhalb des Browsers ausgef\u00fchrt

  • \ >> +Diese Funktion ist in der Erprobung und funktioniert nicht >> richtig. >> +#EXAWhtmlToolTip=BY using -html switch, javaws can try to parse >> html and try to extract applet, and to launch it out of browser
    \ >> #
  • highly experimental
  • \ >> #
  • really cool
  • >> EXAWhtmlToolTip=Unter Verwendung des Schalters >> \u201e-html\u201c kann versucht werden die HTML-Seite zu >> analysieren, das Applet zu extrahieren und es au\u00dferhalb des >> Browsers zu starten.
    \ >> @@ -576,7 +576,7 @@ >> #EXAWfixToolTip=Some jnlp files pointed from applet are not >> designed to be used as jnlp apps
    \ >> #
  • This will add the known often missing elements to this file (if >> missing)
  • >> EXAWfixToolTip=Manche von einem Applet verwiesene JNLP-Dateien >> wurden nicht als JNLP-Anwendungen erstellt oder vorgesehen
    \ >> -
    • Dies f\u00fcgt allgemein bekannt, oft fehlende Elemente >> dieser JNLP-Datei hinzu
    >> +
  • Dies f\u00fcgt dieser JNLP-Datei bekannte, oft fehlende Elemente >> hinzu (wenn sie fehlen)
  • >> >> # Security >> SFileReadAccess=Die Anwendung hat Lesezugriff auf {0} angefordert. >> Soll diese Aktion zugelassen werden? >> @@ -601,7 +601,7 @@ >> SRememberCodebase=F\u00fcr Website {0} >> SUnsignedSummary=Eine nicht signierte Java Anwendung m\u00f6chte zur >> Ausf\u00fchrung gebracht werden. >> #SUnsignedDetail=An unsigned application from the following location >> wants to run:
      {0}
    The >> page which made the request was:
      >> {1}

    It is recommended you only run applications >> from sites you trust. >> -SUnsignedDetail=Eine nicht signierte Anwendung am folgenden Ort >> m\u00f6chte zur Ausf\u00fchrung gebracht werden:
      > href="{0}">{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. >> +SUnsignedDetail=Eine nicht signierte Anwendung am folgenden Ort >> m\u00f6chte zur Ausf\u00fchrung gebracht werden:
      > href="{0}">{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=You have accepted this >> applet previously - ({0}). >> SUnsignedAllowedBefore=Dieses Applet wurde >> bereits akzeptiert ({0}). >> #SUnsignedRejectedBefore=You have rejected this >> applet previously - ({0}). >> @@ -921,9 +921,9 @@ >> #PEClipboardError=Clipboard does not appear to contain properly >> formatted policy entries >> PEClipboardError=Die Zwischenablage scheint keine g\u00fcltig >> formatierten Richtlinieneintr\u00e4ge zu enthalten >> #PEInvalidPolicy=Paste Failed: Could not read policy entry for >> codebase {0} from system clipboard >> -PEInvalidPolicy=Einf\u00fcgen gescheitert: Ein Richtlinieneintrag >> f\u00fcr die Codebasis \u201e{0}\u201c konnte aus der Zwischenablage >> nicht gelesen werden. >> +PEInvalidPolicy=Einf\u00fcgen gescheitert: Ein Richtlinieneintrag >> f\u00fcr die Codebasis \u201e{0}\u201c konnte nicht aus der >> Zwischenablage gelesen werden. >> #PEClipboardAccessError=Could not read from clipboard >> -PEClipboardAccessError=Konnte aus der Zwischenablage nicht lesen >> +PEClipboardAccessError=Konnte nicht aus der Zwischenablage lesen >> >> #PEHelpMenu=Help >> PEHelpMenu=Hilfe >> @@ -1180,7 +1180,7 @@ >> #TIFPLimitCacheSize=Limit cache size >> TIFPLimitCacheSize=Zwischenspeichergr\u00f6\u00dfe begrenzen >> #TIFPCacheSizeSpinnerValueTooLargeWarning=WARNING: Uses >> more space than {0} MB available >> -TIFPCacheSizeSpinnerValueTooLargeWarning=WARNUNG: >> Verwendet mehr Speicher als {0} MB verf\u00fcgbar >> +TIFPCacheSizeSpinnerValueTooLargeWarning=WARNUNG: >> Verwendet mehr Speicher als die verf\u00fcgbaren {0} MB >> #TIFPCacheSizeSpinnerLargeValueWarning=Available: {0} MB >> TIFPCacheSizeSpinnerLargeValueWarning={0} MB verf\u00fcgbar >> #TIFPCacheSizeSetToNoCaching=Cached files will be deleted when >> IcedTea-Web terminates. From jvanek at icedtea.classpath.org Wed Aug 26 08:19:10 2015 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 26 Aug 2015 08:19:10 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 8ab371a45c51 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8ab371a45c51 author: Jiri Vanek date: Wed Aug 26 08:31:49 2015 +0200 icedteaweb-completion renamed to icedteaweb-completion.in for future repurposing changeset b1aa74ef87a4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b1aa74ef87a4 author: Jiri Vanek date: Wed Aug 26 10:18:29 2015 +0200 Added generation of icedteaweb-completion from sources. * Makefile.am: declared BASH_CMPL_DEST_DIR as directory where to install generated icedteaweb-completion. (clean-local) (.PHONY) added clean-icedteaweb-completion (install-exec-local) now creates BASH_CMPL_DEST_DIR and copy icedteaweb-completion to it (uninstall-local) now removes also BASH_CMPL_DEST_DIR/icedteaweb-completion (icedteaweb-completion), new target, substiture real values from javacode via icedteaweb-completion.in to icedteaweb-completion (stamps/netx-dist.stamp) now depends also on icedteaweb-completion (clean-icedteaweb-completion) new target to remove generated file * icedteaweb-completion.in: hardcoded opts value replaced by fields for substitutions *netx/net/sourceforge/jnlp/OptionsDefinitions.java: added main method, which can print currently accurate switches diffstat: ChangeLog | 20 ++++++++++ Makefile.am | 27 +++++++++++-- icedteaweb-completion | 44 ----------------------- icedteaweb-completion.in | 43 ++++++++++++++++++++++ netx/net/sourceforge/jnlp/OptionsDefinitions.java | 23 ++++++++++- 5 files changed, 106 insertions(+), 51 deletions(-) diffs (264 lines): diff -r c87f010b8cf7 -r b1aa74ef87a4 ChangeLog --- a/ChangeLog Tue Aug 25 18:52:07 2015 +0200 +++ b/ChangeLog Wed Aug 26 10:18:29 2015 +0200 @@ -1,3 +1,23 @@ +2015-08-25 Jiri Vanek + Lukasz Dracz + + * Makefile.am: declared BASH_CMPL_DEST_DIR as directory where to install + generated icedteaweb-completion. (clean-local) (.PHONY) added clean-icedteaweb-completion + (install-exec-local) now creates BASH_CMPL_DEST_DIR and copy icedteaweb-completion to it + (uninstall-local) now removes also BASH_CMPL_DEST_DIR/icedteaweb-completion + (icedteaweb-completion), new target, substiture real values from javacode + via icedteaweb-completion.in to icedteaweb-completion + (stamps/netx-dist.stamp) now depends also on icedteaweb-completion + (clean-icedteaweb-completion) new target to remove generated file + * icedteaweb-completion.in: hardcoded opts value replaced by fields for substitutions + *netx/net/sourceforge/jnlp/OptionsDefinitions.java: added main method, which + can print currently accurate switches + +2015-08-25 Jiri Vanek + + * icedteaweb-completion: removed, renamed to icedteaweb-completion.in + * icedteaweb-completion.in: new file from icedteaweb-completion + 2015-08-25 Jiri Vanek Added more tests MixedSigningAndTrustedOnly diff -r c87f010b8cf7 -r b1aa74ef87a4 Makefile.am --- a/Makefile.am Tue Aug 25 18:52:07 2015 +0200 +++ b/Makefile.am Wed Aug 26 10:18:29 2015 +0200 @@ -18,6 +18,7 @@ export NETX_SRCDIR = $(abs_top_srcdir)/netx export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources export ICONS_DEST_DIR=$(DESTDIR)$(datadir)/pixmaps +export BASH_CMPL_DEST_DIR=$(DESTDIR)$(sysconfdir)/bash_completion.d export REPORT_STYLES_DIRNAME=report-styles @@ -219,7 +220,7 @@ export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) -export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion \ +export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion.in \ itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS # reproducers `D`shortcuts @@ -263,18 +264,18 @@ check-local: $(RHINO_TESTS) $(JUNIT_TESTS) clean-local: clean-netx clean-plugin clean-liveconnect \ - clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-tests clean-bootstrap-directory + clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-icedteaweb-completion clean-tests clean-bootstrap-directory if [ -e stamps ] ; then \ rmdir stamps ; \ fi .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \ - clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs \ + clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs clean-icedteaweb-completion\ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \ clean-junit-runner clean-netx-unit-tests install-exec-local: - ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) + ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) $(BASH_CMPL_DEST_DIR) if ENABLE_PLUGIN ${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir) ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar @@ -282,6 +283,7 @@ ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/ + ${INSTALL_DATA} $(abs_top_builddir)/icedteaweb-completion $(BASH_CMPL_DEST_DIR)/icedteaweb-completion ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) @@ -324,6 +326,7 @@ rm -f $(DESTDIR)$(bindir)/$(itweb_settings) rm -f $(DESTDIR)$(bindir)/$(policyeditor) rm -rf $(DESTDIR)$(htmldir) + rm -f $(BASH_CMPL_DEST_DIR)/icedteaweb-completion # Plugin @@ -508,6 +511,18 @@ sed -i '/RhinoBasedPacEvaluator/ d' $@ endif +$(abs_top_builddir)/icedteaweb-completion: $(abs_top_srcdir)/icedteaweb-completion.in + OPTIONS_COMMAND="$(SYSTEM_JRE_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.OptionsDefinitions" ; \ + JAVAWS=`$$OPTIONS_COMMAND javaws` ; \ + POLICYEDITOR=`$$OPTIONS_COMMAND policyeditor` ; \ + ITWEBSETTINGS=`$$OPTIONS_COMMAND itweb-settings`; \ + echo $$JAVAWS ; \ + echo $$POLICYEDITOR ; \ + echo $$ITWEBSETTINGS ; \ + cat $(abs_top_srcdir)/icedteaweb-completion.in | sed "s/@JAVAWS@/$${JAVAWS}/" \ + | sed "s/@POLICYEDITOR@/$${POLICYEDITOR}/" | \ + sed "s/@ITWEBSETTINGS@/$${ITWEBSETTINGS}/" > $(abs_top_builddir)/icedteaweb-completion ; + stamps/generate-docs.stamp: stamps/netx.stamp mkdir -p "$(DOCS_DIR)" ; \ HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ @@ -575,7 +590,7 @@ mkdir -p stamps touch $@ -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/icedteaweb-completion (cd $(NETX_DIR) ; \ mkdir -p lib ; \ $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ @@ -690,6 +705,8 @@ rm -rf "$(DOCS_DIR)" rm -f stamps/generate-docs.stamp +clean-icedteaweb-completion: + rm -f $(abs_top_builddir)/icedteaweb-completion # check # ========================== diff -r c87f010b8cf7 -r b1aa74ef87a4 icedteaweb-completion --- a/icedteaweb-completion Tue Aug 25 18:52:07 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -#/bin/bash -#place this file over to /etc/bash_completion.d/ to make this file useful -#Note: If you do not have bash-completion you will need to install it -_itweb-settings() -{ - local cur prev opts base - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - # Icedtea-web settings Options - opts="-check -get -headless -help -info -list -reset -set -verbose" - - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 -} -complete -F _itweb-settings itweb-settings - -_policyeditor() -{ - local cur prev opts base - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - # PolicyEditor Options - opts="-codebase -file -help" - - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 -} -complete -F _policyeditor policyeditor - -_javaws() -{ - local cur prev opts base - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - # JavaWs Options - opts="-about -help -license -viewer -Xclearcache -allowredirect -arg -headless -html -jnlp -nosecurity -noupdate -param -property -strict -update -verbose -version -Xignoreheaders -xml -Xnofork -Xoffline -Xtrustnone" - - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 -} -complete -F _javaws javaws diff -r c87f010b8cf7 -r b1aa74ef87a4 icedteaweb-completion.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icedteaweb-completion.in Wed Aug 26 10:18:29 2015 +0200 @@ -0,0 +1,43 @@ +#/bin/bash +#place this file over to /etc/bash_completion.d/ to make this file useful +#Note: If you do not have bash-completion you will need to install it +_itweb-settings() +{ + local cur prev opts base + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + # Icedtea-web settings Options + opts="@ITWEBSETTINGS@" + + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 +} +complete -F _itweb-settings itweb-settings + +_policyeditor() +{ + local cur prev opts base + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + # PolicyEditor Options + opts="@POLICYEDITOR@" + + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 +} +complete -F _policyeditor policyeditor + +_javaws() +{ + local cur prev opts base + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + # JavaWs Options + opts="@JAVAWS@" + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 +} +complete -F _javaws javaws diff -r c87f010b8cf7 -r b1aa74ef87a4 netx/net/sourceforge/jnlp/OptionsDefinitions.java --- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Tue Aug 25 18:52:07 2015 +0200 +++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Wed Aug 26 10:18:29 2015 +0200 @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2008 Red Hat, Inc. This file is part of IcedTea. @@ -36,11 +36,13 @@ */ package net.sourceforge.jnlp; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import static net.sourceforge.jnlp.runtime.Translator.R; +import net.sourceforge.jnlp.util.docprovider.TextsProvider; public class OptionsDefinitions { @@ -229,5 +231,22 @@ return l; } - + public static void main(String[] args) throws IOException { + if (args[0].equals(TextsProvider.JAVAWS)) { + printOptions(getJavaWsOptions()); + } else if (args[0].equals(TextsProvider.ITWEB_SETTINGS)) { + printOptions(getItwsettingsCommands()); + } else if (args[0].equals(TextsProvider.POLICY_EDITOR)) { + printOptions(getPolicyEditorOptions()); + } + } + + private static void printOptions(List options) { + StringBuilder sb = new StringBuilder(); + for (OPTIONS option : options) { + sb.append(option.option).append(" "); + } + System.out.println(sb.toString().trim()); + } + } From bugzilla-daemon at icedtea.classpath.org Thu Aug 27 16:18:39 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 27 Aug 2015 16:18:39 +0000 Subject: [Bug 2598] New: error: cannot convert 'volatile intptr_t*' to 'volatile int*' Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2598 Bug ID: 2598 Summary: error: cannot convert 'volatile intptr_t*' to 'volatile int*' Product: IcedTea Version: 2.6.1 Hardware: arm OS: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: johan.oudinet at green-communications.fr CC: unassigned at icedtea.classpath.org I'm cross-compiling (well, trying actually) to ARM32 target and I get the following error message (g++ 4.9.2): g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DARM -DZERO_LIBARCH=\"arm\" -DPRODUCT -I. -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/prims -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/precompiled -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/cpu/zero/vm -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os/linux/vm -I/home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"24.85-b03\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"johan\"" -DHOTSPOT_LIB_ARCH=\"arm\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea 2.6.1\"" -DDISTRIBUTION_ID="\"Built on Ubuntu 15.04 (Thu Aug 27 15:01:20 CEST 2015)\"" -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_zero -DTARGET_ARCH_MODEL_zero -DTARGET_OS_ARCH_linux_zero -DTARGET_OS_ARCH_MODEL_linux_zero -DTARGET_COMPILER_gcc -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -D_LITTLE_ENDIAN -pipe -g -O3 -fno-strict-aliasing -fno-devirtualize -DHOTSPOT_ASM -DVM_LITTLE_ENDIAN -DINCLUDE_TRACE=1 -Wpointer-arith -Wsign-compare -c -fpch-deps -MMD -MP -MF ../generated/dependencies/precompiled.hpp.gch.d -x c++-header /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/precompiled/precompiled.hpp -o precompiled.hpp.gch In file included from /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os/linux/vm/os_linux.inline.hpp:42:0, from /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/compiler/disassembler.hpp:31, from /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/asm/assembler.inline.hpp:30, from /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/share/vm/precompiled/precompiled.hpp:30: /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp: In static member function 'static intptr_t Atomic::add_ptr(intptr_t, volatile intptr_t*)': /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:197:43: error: cannot convert 'volatile intptr_t* {aka volatile long int*}' to 'volatile int*' for argument '1' to 'int arm_add_and_fetch(volatile int*, int)' return arm_add_and_fetch(dest, add_value); ^ /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp: In static member function 'static intptr_t Atomic::xchg_ptr(intptr_t, volatile intptr_t*)': /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:256:52: error: cannot convert 'volatile intptr_t* {aka volatile long int*}' to 'volatile int*' for argument '1' to 'int arm_lock_test_and_set(volatile int*, int)' return arm_lock_test_and_set(dest, exchange_value); ^ /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp: In static member function 'static intptr_t Atomic::cmpxchg_ptr(intptr_t, volatile intptr_t*, intptr_t)': /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:302:66: error: cannot convert 'volatile intptr_t* {aka volatile long int*}' to 'volatile int*' for argument '1' to 'int arm_compare_and_swap(volatile int*, int, int)' return arm_compare_and_swap(dest, compare_value, exchange_value); ^ /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/make/linux/makefiles/vm.make:329: recipe for target 'precompiled.hpp.gch' failed make[9]: *** [precompiled.hpp.gch] Error 1 /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/make/linux/makefiles/top.make:119: recipe for target 'the_vm' failed make[8]: *** [the_vm] Error 2 /home/johan/Documents/buildroot/output/build/openjdk-2.6.1/openjdk-boot/hotspot/make/linux/Makefile:394: recipe for target 'productzero' failed make[7]: *** [productzero] Error 2 Makefile:224: recipe for target 'generic_buildzero' failed make[6]: *** [generic_buildzero] Error 2 Makefile:166: recipe for target 'productzero' failed make[5]: *** [productzero] Error 2 make/hotspot-rules.gmk:126: recipe for target 'hotspot-build' failed make[4]: *** [hotspot-build] Error 2 Makefile:251: recipe for target 'build_product_image' failed make[3]: *** [build_product_image] Error 2 Makefile:2657: recipe for target 'stamps/icedtea-boot.stamp' failed make[2]: *** [stamps/icedtea-boot.stamp] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 27 16:53:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 27 Aug 2015 16:53:31 +0000 Subject: [Bug 2598] error: cannot convert 'volatile intptr_t*' to 'volatile int*' In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2598 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID Severity|critical |normal --- Comment #1 from Andrew John Hughes --- We don't support cross-compiling with IcedTea 2.x at present. Please re-open if you can replicate this issue on the native platform. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Fri Aug 28 12:25:20 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 28 Aug 2015 14:25:20 +0200 Subject: [rfc][icedtea-web] alaca for unsigned apps and few changes in behaviour Message-ID: <55E05330.7020209@redhat.com> Hello! ITW is suffering from not enough restrictions between codebase and documentbase. For that the resources loaded by applet would be nice to be shown to user. I think best to do so is reuse already existing alaca dialogue. There is one mayor change - reason of this patch - the alaca dilogue will rise up even in case of unsigned applets, and so compleating click to run scheme by information about loaded resources. However, the manifest-attribute value - if any - is ignored for unsigned app (as it can be easily faked). Then there are few changes - missing alaca is shown even in low security mode - texts on missing alaca are kept red, but on matching alac are made green - matching logic is little bit loosened. Before, the reosurces were made to match both codebase and docbase. However docbase may be eg http://some.url/resourc/file.html - so no resource could actually match it. Now I'm striping the file. And one bugfix. Somehow leaked error into code, that the list of resources was never fully checcked against codebase/docbase (only first in case of list of length 1 was checked) Now all resources are processed correctly and if all resources are going from codebase and docbase (see docbase must be same as document base to make it match) then no alaca is shown. I thing this is much more correct behaviour then before. Also I belive that place from where resources are going was really missing for unsigned apps (although they are pretty restricted). I would like to backport this to 1.6 and to 1.5 if possible. In case of backport, I will enable also remmering of user's action (http://linuxsagas.digitaleagle.net/wp-content/uploads/2014/05/053.png - remeber action does nothing IIRC now) I dont know if 1.5 backport (together with rember action) will be posible for 1.5. If no.... J. -------------- next part -------------- A non-text attachment was scrubbed... Name: alacaForUnsigned.diff Type: text/x-patch Size: 12396 bytes Desc: not available URL: From jvanek at redhat.com Fri Aug 28 13:21:11 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 28 Aug 2015 15:21:11 +0200 Subject: [rfc][icedtea-web] alaca for unsigned apps and few changes in behaviour In-Reply-To: <55E05330.7020209@redhat.com> References: <55E05330.7020209@redhat.com> Message-ID: <55E06047.8010207@redhat.com> On 08/28/2015 02:25 PM, Jiri Vanek wrote: > Hello! > > ITW is suffering from not enough restrictions between codebase and documentbase. For that the > resources loaded by applet would be nice to be shown to user. > I think best to do so is reuse already existing alaca dialogue. > > There is one mayor change - reason of this patch - the alaca dilogue will rise up even in case of > unsigned applets, and so compleating click to run scheme by information about loaded resources. > However, the manifest-attribute value - if any - is ignored for unsigned app (as it can be easily > faked). > > Then there are few changes > - missing alaca is shown even in low security mode > - texts on missing alaca are kept red, but on matching alac are made green > - matching logic is little bit loosened. Before, the reosurces were made to match both codebase > and docbase. However docbase may be eg http://some.url/resourc/file.html - so no resource could > actually match it. Now I'm striping the file. > > > And one bugfix. Somehow leaked error into code, that the list of resources was never fully checcked > against codebase/docbase (only first in case of list of length 1 was checked) > Now all resources are processed correctly and if all resources are going from codebase and docbase > (see docbase must be same as document base to make it match) then no alaca is shown. > > I thing this is much more correct behaviour then before. > > Also I belive that place from where resources are going was really missing for unsigned apps > (although they are pretty restricted). > > I would like to backport this to 1.6 and to 1.5 if possible. > In case of backport, I will enable also remmering of user's action > (http://linuxsagas.digitaleagle.net/wp-content/uploads/2014/05/053.png - remeber action does nothing > IIRC now) > I dont know if 1.5 backport (together with rember action) will be posible for 1.5. If no.... > > J. snmall update for possible backports. BAckport to 1.6 is ok, and it already have working mechanism to store matching alaca. It have also mechanism to extend saved dialogues but its quite a lot of work. Backport to 1.5 is also working, but 1.5 DONT have ANYE mechanism to store any dialogue.So the checkbox from above link should beremoved from 1.5 in addition to this patch. Long story short - I would backport to both 1.5 and 1.6 WITHOUT possibility to rember decission. People may start to hate us, but at least it is already fixed in head. From chghs at web.de Sat Aug 29 11:25:44 2015 From: chghs at web.de (Hinrich) Date: Sat, 29 Aug 2015 13:25:44 +0200 Subject: icedtea-2.6.1 successfully compiled on gentoo-sparc64-linux Message-ID: <55E196B8.5070002@web.de> Hi, I have successfully compiled icedtea-2.6.1 on gentoo-sparc64-linux (CHOST=sparc64-unknown-linux-gnu). The initial bootstrapping process of icedtea-1.11.3 has already been done earlier and is described in the last posts of this thread: https://forums.gentoo.org/viewtopic-t-547221.html For icedtea-1.11.3 it was possible to use a multilib gentoo/sparc installation (i.e. 64-bit-kernel + 32-bit userland + 64-bit glibc) and then compiling the required libraries for icedtea in 64-bit-version as add-ons. Icedtea7 however has much more library dependencies and it was not possible for me to build all those packages on a 32-bit host environment (CHOST=sparc-unknown-linux-gnu). The only way out for me was to transform a multilib-gentoo-sparc installation into a native single-lib64-installation, i.e. compile everything with -m64 option of gcc. This is a highly experimental procedure and usually discouraged by the sparc community. But I found that once you have an initial sparc64 system running, the build process for the required libraries is really easy. The gentoo ebuilds can then be used without any modification and compiling (emerging) is straightforward with very few exceptions. All you need to arrive there is a 64-bit-stage3-image for gentoo/sparc64 (which I can prepare on demand) and the usual sparc installation-guide (plus some minor modifications). This is for those who need a native 64-bit-stack on sparc for running applications with large memory requirements (e.g. application server, database). The price is some loss of performance with respect to a 32-bit environment. Now, what I had to do for building icedtea-2.6.1 with build-jdk icedtea-1.11.3 for sparc64, is not much: 1. `configure' must know that a "native HotSpot port is available for this architecture" $ diff -Naur configure.orig configure --- configure.orig 2015-08-24 20:31:27.373224829 +0200 +++ configure 2015-08-24 20:32:12.617224818 +0200 @@ -7411,6 +7411,7 @@ arm64) ;; i?86) ;; sparc) ;; + sparc64) ;; x86_64) ;; powerpc64) ;; powerpc64le) ;; 2. openjdk/hotspot/agent/src/os/linux/libproc.h needs an additional include $ diff -Naur libproc.h.orig libproc.h --- libproc.h.orig 2015-08-25 17:57:15.092968890 +0200 +++ libproc.h 2015-08-25 18:07:35.861968742 +0200 @@ -29,6 +29,7 @@ #include #include #include "proc_service.h" +#include #if defined(arm) || defined(ppc) #include "libproc_md.h" That's all. There are some remaining problems in 'make check', required classes in openjdk/hotspot/test are not compiled and make fail a lot of tests. I will report this problem in a separate post. As the host system is a 64-bit-only installation (`gcc -m32` fails) the resulting j2sdk is 64-bit-only as well, `java -d32` is not supported: $ uname -a Linux sirrah 3.18.12-gentoo #1 SMP Fri Aug 7 17:16:46 2015 sparc64 sun4u TI UltraSparc IIIi (Jalapeno) GNU/Linux $ java -version java version "1.7.0_85" OpenJDK Runtime Environment (IcedTea 2.6.1) (linux-gnu build 1.7.0_85-b01) OpenJDK 64-Bit Server VM (build 24.85-b03, mixed mode) Hinrich From chghs at web.de Sat Aug 29 17:01:50 2015 From: chghs at web.de (Hinrich) Date: Sat, 29 Aug 2015 19:01:50 +0200 Subject: icedtea-2.6.1: testlibrary classes not found on sparc64-linux Message-ID: <55E1E57E.9010708@web.de> Hi, I have built icedtea-2.6.1 successfully for gentoo-sparc64-linux. Running the testsuite `make check` fails in many steps because classes of the testlibrary package classes are not found/compiled: For example: /home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test/runtime/NMT/JcmdScale.java:32: error: package com.oracle.java.testlibrary does not exist import com.oracle.java.testlibrary.*; ^ The initial output of `make check` is shown below. Which command should compile these classes? Where should I find the .class-files? Any jar-file for this? I am running ./autogen.sh ./configure (...) make all make check Regards, Hinrich ---------------- make check /usr/bin/gmake check-local gmake[1]: Entering directory '/home/hinrich/work/java/build/icedtea-2.6.1' rm -rf test/jtreg/classes mkdir -p test/jtreg/classes /home/hinrich/work/java/build/icedtea-2.6.1/bootstrap/jdk1.6.0/bin/javac -g -encoding utf-8 -J-Xmx1024m -Xprefer:source -source 7 -tar get 7 -d test/jtreg/classes \ `find /home/hinrich/work/java/build/icedtea-2.6.1/test/jtreg/com -name '*.java'` (cd /home/hinrich/work/java/build/icedtea-2.6.1/test/jtreg; \ /home/hinrich/work/java/build/icedtea-2.6.1/bootstrap/jdk1.6.0/bin/jar cfm /home/hinrich/work/java/build/icedtea-2.6.1/test/jtreg.jar \ META-INF/MANIFEST.MF \ legal README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \ `find com -type f -a -not -name '*.java'` \ -C /home/hinrich/work/java/build/icedtea-2.6.1/test/jtreg/classes com) mkdir -p stamps touch stamps/jtreg.stamp mkdir -p test/hotspot/JTwork test/hotspot/JTreport /home/hinrich/work/java/build/icedtea-2.6.1/bootstrap/jdk1.6.0/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/hotspot/JTwork -r:test/hotspot/JTreport \ -jdk:/home/hinrich/work/java/build/icedtea-2.6.1/openjdk.build/j2sdk-image \ \ `pwd`/openjdk/hotspot/test \ | tee test/check-hotspot.log Directory "test/hotspot/JTwork/scratch" not found: creating Passed: compiler/5057225/Test5057225.java Passed: compiler/5091921/Test5091921.java Passed: compiler/5091921/Test6186134.java Passed: compiler/5091921/Test6196102.java (...) ---------------- For example: $ cat icedtea-2.6.1/test/hotspot/JTwork/runtime/NMT/JcmdScale.jtr #Test Results (version 2) #Thu Aug 27 19:13:41 CEST 2015 #checksum:22c965985aa6e1d6 #-----testdescription----- $file=/home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test/runtime/NMT/JcmdScale.java $root=/home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test keywords=nmt jcmd othervm library=/testlibrary run=USER_SPECIFIED main/othervm -XX:NativeMemoryTracking=summary JcmdScale\n source=JcmdScale.java title=Test the NMT scale parameter #-----environment----- #-----testresult----- description=file:/home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test/runtime/NMT/JcmdScale.java end=Thu Aug 27 19:13:41 CEST 2015 environment=regtest execStatus=Failed. Compilation failed javatestOS=Linux 3.18.12-gentoo (sparcv9) javatestVersion=unset script=com.sun.javatest.regtest.RegressionScript sections=script_messages build compile start=Thu Aug 27 19:13:34 CEST 2015 test=runtime/NMT/JcmdScale.java work=/home/hinrich/work/java/build/icedtea-2.6.1/test/hotspot/JTwork/runtime/NMT #section:script_messages ----------messages:(4/242)---------- JDK under test: (/home/hinrich/work/java/build/icedtea-2.6.1/openjdk.build/j2sdk-image) java version "1.7.0_85" OpenJDK Runtime Environment (IcedTea 2.6.1) (linux-gnu build 1.7.0_85-b01) OpenJDK 64-Bit Server VM (build 24.85-b03, mixed mode) #section:build ----------messages:(3/94)---------- command: build JcmdScale reason: Named class compiled on demand elapsed time (seconds): 6.598 result: Failed. Compilation failed #section:compile ----------messages:(3/189)---------- command: compile /home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test/runtime/NMT/JcmdScale.java reason: .class file out of date or does not exist elapsed time (seconds): 6.597 ----------System.out:(0/0)---------- ----------System.err:(74/4130)---------- /home/hinrich/work/java/build/icedtea-2.6.1/openjdk/hotspot/test/runtime/NMT/JcmdScale.java:32: error: package com.oracle.java.testlibrary does not exist import com.oracle.java.testlibrary.*; ^ (...) From bugzilla-daemon at icedtea.classpath.org Mon Aug 31 04:31:51 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 31 Aug 2015 04:31:51 +0000 Subject: [Bug 2600] New: A fatal error has been detected by the Java Runtime Environment: SIGSEGV (0xb) at pc=0x0000000000000290, pid=7041, tid=139934803236832 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2600 Bug ID: 2600 Summary: A fatal error has been detected by the Java Runtime Environment: SIGSEGV (0xb) at pc=0x0000000000000290, pid=7041, tid=139934803236832 Product: IcedTea Version: 6-hg Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: JamVM Assignee: xerxes at zafena.se Reporter: jari.kosonen at rayence.com CC: unassigned at icedtea.classpath.org Created attachment 1411 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1411&action=edit A fatal error has been detected by the Java Runtime Environment During saving a large file (when 1st clicked on "x" on right top of the window), it seems to crash before saving is completed. The sheet recovers, but part of the images are missing. The large file size is possibly the key factor causing the crash, since with smaller files this didn't appear or appeared very rarely. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 31 09:23:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 31 Aug 2015 09:23:26 +0000 Subject: [Bug 2600] A fatal error has been detected by the Java Runtime Environment: SIGSEGV (0xb) at pc=0x0000000000000290, pid=7041, tid=139934803236832 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2600 Stanislav Baiduzhyi changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |baiduzhyi.devel at gmail.com --- Comment #1 from Stanislav Baiduzhyi --- I think more info is needed. First of all, you specified JamVM as a component, but crash report looks like normal hotspot installation. Could you please check if you have hotspot or JamVM? Second, could you provide some concrete steps to reproduce the problem? From what I can guess, you're using LibreOffice, and crash occurs while saving file from LibreOffice? Could you provide some sample file and some step-by-step to reproduce 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: From aazores at icedtea.classpath.org Mon Aug 31 20:55:57 2015 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Mon, 31 Aug 2015 20:55:57 +0000 Subject: /hg/icedtea-web: Add SOPBypass reproducer Message-ID: changeset b8cd8b45a3d4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b8cd8b45a3d4 author: Andrew Azores date: Mon Aug 31 16:55:32 2015 -0400 Add SOPBypass reproducer Added new tests to check where applets are allow to make network connections, depending on different combinations of applet codebase, documentbase, and applet archive location. * tests/reproducers/simple/SOPBypass/resources/SOPBypass.html * tests/reproducers/simple/SOPBypass/resources/SOPBypass.jnlp * tests/reproducers/simple/SOPBypass/srcs/SOPBypass.java * tests/reproducers/simple/SOPBypass/testcases/SOPBypassHtmlAppletTest.java * tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTest.java * tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTestWithHtmlSwitch.java * tests/reproducers/simple/SOPBypass/testcases/SOPBypassUtil.java diffstat: ChangeLog | 13 + tests/reproducers/simple/SOPBypass/resources/SOPBypass.html | 49 + tests/reproducers/simple/SOPBypass/resources/SOPBypass.jnlp | 59 + tests/reproducers/simple/SOPBypass/srcs/SOPBypass.java | 138 +++ tests/reproducers/simple/SOPBypass/testcases/SOPBypassHtmlAppletTest.java | 255 ++++++ tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTest.java | 238 +++++ tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTestWithHtmlSwitch.java | 236 +++++ tests/reproducers/simple/SOPBypass/testcases/SOPBypassUtil.java | 413 ++++++++++ 8 files changed, 1401 insertions(+), 0 deletions(-) diffs (truncated from 1436 to 500 lines): diff -r b1aa74ef87a4 -r b8cd8b45a3d4 ChangeLog --- a/ChangeLog Wed Aug 26 10:18:29 2015 +0200 +++ b/ChangeLog Mon Aug 31 16:55:32 2015 -0400 @@ -1,3 +1,16 @@ +2015-08-31 Andrew Azores + + Added new tests to check where applets are allow to make network + connections, depending on different combinations of applet codebase, + documentbase, and applet archive location. + * tests/reproducers/simple/SOPBypass/resources/SOPBypass.html + * tests/reproducers/simple/SOPBypass/resources/SOPBypass.jnlp + * tests/reproducers/simple/SOPBypass/srcs/SOPBypass.java + * tests/reproducers/simple/SOPBypass/testcases/SOPBypassHtmlAppletTest.java + * tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTest.java + * tests/reproducers/simple/SOPBypass/testcases/SOPBypassJnlpAppletTestWithHtmlSwitch.java + * tests/reproducers/simple/SOPBypass/testcases/SOPBypassUtil.java + 2015-08-25 Jiri Vanek Lukasz Dracz diff -r b1aa74ef87a4 -r b8cd8b45a3d4 tests/reproducers/simple/SOPBypass/resources/SOPBypass.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/SOPBypass/resources/SOPBypass.html Mon Aug 31 16:55:32 2015 -0400 @@ -0,0 +1,49 @@ + + + + + + + + diff -r b1aa74ef87a4 -r b8cd8b45a3d4 tests/reproducers/simple/SOPBypass/resources/SOPBypass.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/SOPBypass/resources/SOPBypass.jnlp Mon Aug 31 16:55:32 2015 -0400 @@ -0,0 +1,59 @@ + + + + + SOPBypass + IcedTea + + Test applets' abilities to make URLConnections and create Sockets in various documentBase/codebase/etc. combinations + + + + + + + + + diff -r b1aa74ef87a4 -r b8cd8b45a3d4 tests/reproducers/simple/SOPBypass/srcs/SOPBypass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/SOPBypass/srcs/SOPBypass.java Mon Aug 31 16:55:32 2015 -0400 @@ -0,0 +1,138 @@ +/* SimpleTest1.java +Copyright (C) 2015 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.io.PrintWriter; +import java.net.InetSocketAddress; +import java.net.MalformedURLException; +import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; + +public class SOPBypass extends Applet { + + @Override + public void start() { + System.out.println("Applet Started"); + + System.out.println("Codebase URL: " + getCodeBase()); + System.out.println("DocumentBase URL: " + getDocumentBase()); + + attemptSocketConnectionToCodebase(); + attemptSocketConnectionToDocumentBase(); + attemptSocketConnectionToUnrelated(); + attemptUrlConnectionToCodebase(); + attemptUrlConnectionToDocumentBase(); + attemptUrlConnectionToUnrelated(); + + System.out.println("*** APPLET FINISHED ***"); + } + + void attemptSocketConnectionToCodebase() { + String host = getCodeBase().getHost(); + int port = getCodeBase().getPort();; + attemptSocketConnection(host, port, "codeBase", true); + } + + void attemptSocketConnectionToDocumentBase() { + String host = getDocumentBase().getHost(); + int port = getDocumentBase().getPort(); + attemptSocketConnection(host, port, "documentBase", true); + } + + void attemptSocketConnectionToUnrelated() { + String host = "http://example.com"; + int port = 80; + attemptSocketConnection(host, port, "unrelated", false); + } + + void attemptSocketConnection(String host, int port, String s, boolean sendData) { + boolean connected = true; + try { + Socket local = new Socket(); + local.bind(null); + local.connect(new InetSocketAddress(host, port)); + if (sendData) { + try (PrintWriter writer = new PrintWriter(local.getOutputStream(), true)) { + writer.println("test"); + } + } + } catch (Exception e) { + connected = false; + e.printStackTrace(); + } + System.out.println("SocketConnection:" + s + " " + connected); + } + + void attemptUrlConnectionToCodebase() { + attemptUrlConnection(getCodeBase(), "codeBase"); + } + + void attemptUrlConnectionToDocumentBase() { + attemptUrlConnection(getDocumentBase(), "documentBase"); + } + + void attemptUrlConnectionToUnrelated() { + try { + attemptUrlConnection(new URL("http://example.com:80"), "unrelated"); + } catch (MalformedURLException e) { + e.printStackTrace(); + System.out.println("Unrelated URL test failed due to MalformedURLException"); + System.out.println("URLConnection:unrelated false"); + } + } + + void attemptUrlConnection(URL url, String s) { + boolean connected = true; + try { + URLConnection conn = url.openConnection(); + conn.connect(); + conn.getContentEncoding(); + conn.getContentLength(); + conn.getContentType(); + } catch (Exception e) { + connected = false; + e.printStackTrace(); + } + System.out.println("URLConnection:" + s + " " + connected); + } + + public static void main(String[] args) { + new SOPBypass().start(); + } + +} diff -r b1aa74ef87a4 -r b8cd8b45a3d4 tests/reproducers/simple/SOPBypass/testcases/SOPBypassHtmlAppletTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/SOPBypass/testcases/SOPBypassHtmlAppletTest.java Mon Aug 31 16:55:32 2015 -0400 @@ -0,0 +1,255 @@ +/* SOPBypassHtmlAppletTest.java + Copyright (C) 2015 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 sopbypasstests; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +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.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerLauncher; +import net.sourceforge.jnlp.config.DeploymentConfiguration; +import net.sourceforge.jnlp.runtime.ManifestAttributesChecker; +import net.sourceforge.jnlp.tools.DeploymentPropertiesModifier; +import net.sourceforge.jnlp.security.appletextendedsecurity.AppletSecurityLevel; +import java.io.File; + +import static sopbypasstests.SOPBypassUtil.*; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class SOPBypassHtmlAppletTest extends BrowserTest { + + private static ServerLauncher serverA; + private static ServerLauncher serverB; + private static ServerLauncher serverC; + private static DeploymentPropertiesModifier mod1 = new DeploymentPropertiesModifier(); + private static DeploymentPropertiesModifier mod2 = new DeploymentPropertiesModifier(); + + @BeforeClass + public static void setup() throws Exception { + serverA = ServerAccess.getIndependentInstance(); + serverB = ServerAccess.getIndependentInstance(); + serverC = ServerAccess.getIndependentInstance(); + + File file = mod1.src.getFile(); + if (!file.exists()) { + file.getParentFile().mkdirs(); + file.createNewFile(); + } + mod1.setProperties(DeploymentConfiguration.KEY_ENABLE_MANIFEST_ATTRIBUTES_CHECK, ManifestAttributesChecker.MANIFEST_ATTRIBUTES_CHECK.NONE.name()); + mod2.setProperties(DeploymentConfiguration.KEY_SECURITY_LEVEL, AppletSecurityLevel.ALLOW_UNSIGNED.name()); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalAbsoluteArchiveLocalPathCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", server.getUrl("SOPBypass.jar"), server.getUrl("codebase")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalAbsoluteArchiveUnrelatedRemoteCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", server.getUrl("SOPBypass.jar"), serverC.getUrl("codebase")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testRemoteAbsoluteArchiveSameRemoteCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", serverC.getUrl("SOPBypass.jar"), serverC.getUrl("codebase")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testRemoteAbsoluteArchiveUnrelatedRemoteCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", serverB.getUrl("SOPBypass.jar"), serverC.getUrl("codebase")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testRemoteAbsoluteArchiveLocalPathCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", serverB.getUrl("SOPBypass.jar"), server.getUrl("codebase")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testRemoteAbsoluteArchiveLocalDotCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", serverB.getUrl("SOPBypass.jar"), "."); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testRemoteAbsoluteArchiveNoCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", serverB.getUrl("SOPBypass.jar"), (String) null); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalAbsoluteArchiveNoCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", server.getUrl("SOPBypass.jar"), (String) null); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalRelativeArchiveNoCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", "SOPBypass.jar", (String) null); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalRelativeArchiveUnrelatedRemoteCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", "SOPBypass.jar", serverC.getUrl()); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalAbsoluteArchiveLocalDotCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", server.getUrl("SOPBypass.jar"), "."); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + public void testLocalRelativeArchiveLocalPathCodebase() throws Exception { + TemplatedHtmlDoc templatedDoc = filterHtml("SOPBypass", "SOPBypass.jar", server.getUrl("/")); + ProcessResult pr = performTest(templatedDoc); + assertCodebaseConnection(pr); + assertDocumentBaseConnection(pr); + assertNoUnrelatedConnection(pr); + } + + @Test + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) From bugzilla-daemon at icedtea.classpath.org Mon Aug 31 21:38:42 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 31 Aug 2015 21:38:42 +0000 Subject: [Bug 2058] [IcedTea7] Build crashes at start of second stage (building with itself) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chewi at gentoo.org Version|7-hg |2.6.1 --- Comment #5 from James Le Cuirot --- I'm getting this for CACAO builds on amd64 and ppc32. I suspect it would happen for any CACAO build. It was fine on 2.5.5 and I've just started seeing it on 2.6.1, which uses the newer CACAO revision c182f119eaad. Unfortunately trying to build against the older CACAO revision e215e36be9fc fails for some other reason. This is the line in Ant that it fails on. Class mainClass = null; -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 31 22:06:23 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 31 Aug 2015 22:06:23 +0000 Subject: [Bug 2058] [IcedTea7] Build crashes at start of second stage (building with itself) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058 --- Comment #6 from James Le Cuirot --- I just hit this while trying JamVM on ppc32 as well. Suddenly this doesn't look like CACAO's fault. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: